From 44f3fb121122ed2dbbba063afa100e73d072e77a Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 10 Jun 2016 12:41:26 -0700
Subject: [PATCH] Update content to `copyToOutput` and `publishOptions`

These must be duplicated as we require the same files for both `build`
and `publish`. This is the requirement of the new schema, as `content`
was split.

Note that while each key can take an object, if given just a `string[]`
as we do here, it defaults to `include`.

See the new schema: https://github.com/aspnet/Announcements/issues/175
---
 .../project.json                              | 22 ++++++++++++-------
 src/powershell/project.json                   | 20 ++++++++++++-----
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json
index b04a7ae643..c09ff9b9d2 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/project.json
+++ b/src/Microsoft.PowerShell.ConsoleHost/project.json
@@ -7,22 +7,28 @@
     "buildOptions": {
         "warningsAsErrors": true,
         "allowUnsafe": true,
-        "compile": [ "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs" ]
+        "compile": [ "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs" ],
+        "copyToOutput": [
+            "Modules",
+            "../Modules",
+            "powershell.exe",
+            "../../powershell.version"
+        ]
     },
 
+    "publishOptions": [
+        "Modules",
+        "../Modules",
+        "powershell.exe",
+        "../../powershell.version"
+    ],
+
     "dependencies": {
         "Microsoft.PowerShell.PSReadLine": "1.0.0-*",
         "Microsoft.PowerShell.Commands.Management": "1.0.0-*",
         "Microsoft.PowerShell.Commands.Utility": "1.0.0-*"
     },
 
-    "content": [
-        "Modules",
-        "../Modules",
-        "powershell.exe",
-        "../../powershell.version"
-    ],
-
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50", "portable-net45+win8" ],
diff --git a/src/powershell/project.json b/src/powershell/project.json
index 9ee25ae02a..7b69e54ed2 100644
--- a/src/powershell/project.json
+++ b/src/powershell/project.json
@@ -7,14 +7,18 @@
     "buildOptions": {
         "warningsAsErrors": true,
         "allowUnsafe": true,
-        "emitEntryPoint": true
+        "emitEntryPoint": true,
+        "copyToOutput": [
+            "Modules",
+            "../Modules",
+            "*_profile.ps1",
+            "*.so",
+            "*.dylib",
+            "../../powershell.version"
+        ]
     },
 
-    "dependencies": {
-        "Microsoft.PowerShell.ConsoleHost": "1.0.0-*"
-    },
-
-    "content": [
+    "publishOptions": [
         "Modules",
         "../Modules",
         "*_profile.ps1",
@@ -23,6 +27,10 @@
         "../../powershell.version"
     ],
 
+    "dependencies": {
+        "Microsoft.PowerShell.ConsoleHost": "1.0.0-*"
+    },
+
     "frameworks": {
         "netcoreapp1.0": {
             "imports": [ "dnxcore50", "portable-net45+win8" ],