From 2639f2a8ae6aabe87831c1175ce35679ffd78718 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 10 Jun 2016 13:00:33 -0700
Subject: [PATCH] Use `include` key in `copyToOutput` and `publishOptions`

While the schema says that a `string[]` will be picked up as if `{
"include" : [ ... ] }` was used, it does not. This is a .NET CLI bug.
---
 .../project.json                              | 20 ++++++++++-------
 src/powershell/project.json                   | 22 +++++++++++--------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json
index c09ff9b9d2..22a12273ed 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/project.json
+++ b/src/Microsoft.PowerShell.ConsoleHost/project.json
@@ -8,7 +8,18 @@
         "warningsAsErrors": true,
         "allowUnsafe": true,
         "compile": [ "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs" ],
-        "copyToOutput": [
+        "copyToOutput": {
+            "include": [
+                "Modules",
+                "../Modules",
+                "powershell.exe",
+                "../../powershell.version"
+            ]
+        }
+    },
+
+    "publishOptions": {
+        "include": [
             "Modules",
             "../Modules",
             "powershell.exe",
@@ -16,13 +27,6 @@
         ]
     },
 
-    "publishOptions": [
-        "Modules",
-        "../Modules",
-        "powershell.exe",
-        "../../powershell.version"
-    ],
-
     "dependencies": {
         "Microsoft.PowerShell.PSReadLine": "1.0.0-*",
         "Microsoft.PowerShell.Commands.Management": "1.0.0-*",
diff --git a/src/powershell/project.json b/src/powershell/project.json
index 8ea2ea4e01..c14dba9757 100644
--- a/src/powershell/project.json
+++ b/src/powershell/project.json
@@ -8,7 +8,19 @@
         "warningsAsErrors": true,
         "allowUnsafe": true,
         "emitEntryPoint": true,
-        "copyToOutput": [
+        "copyToOutput": {
+            "include": [
+                "Modules",
+                "../Modules",
+                "*.so",
+                "*.dylib",
+                "../../powershell.version"
+            ]
+        }
+    },
+
+    "publishOptions": {
+        "include": [
             "Modules",
             "../Modules",
             "*.so",
@@ -17,14 +29,6 @@
         ]
     },
 
-    "publishOptions": [
-        "Modules",
-        "../Modules",
-        "*.so",
-        "*.dylib",
-        "../../powershell.version"
-    ],
-
     "dependencies": {
         "Microsoft.PowerShell.ConsoleHost": "1.0.0-*"
     },