From 13e60bdc227f58d48de378af84009b63adb188bc Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 8 Dec 2015 11:17:54 -0800 Subject: [PATCH] Move ps1xml files to host so content works https://github.com/dotnet/cli/pull/61 --- .../Certificate.format.ps1xml | 0 .../Diagnostics.Format.ps1xml | Bin .../DotNetTypes.format.ps1xml | 0 .../Event.format.ps1xml | Bin .../FileSystem.format.ps1xml | Bin .../Help.format.ps1xml | 0 .../HelpV3.format.ps1xml | 0 .../PowerShellCore.format.ps1xml | Bin .../PowerShellTrace.format.ps1xml | 0 .../Registry.format.ps1xml | Bin .../WSMan.format.ps1xml | Bin src/Microsoft.PowerShell.Linux.Host/project.json | 2 ++ src/System.Management.Automation/project.json | 6 ------ 13 files changed, 2 insertions(+), 6 deletions(-) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/Certificate.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/Diagnostics.Format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/DotNetTypes.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/Event.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/FileSystem.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/Help.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/HelpV3.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/PowerShellCore.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/PowerShellTrace.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/Registry.format.ps1xml (100%) rename src/{System.Management.Automation => Microsoft.PowerShell.Linux.Host}/WSMan.format.ps1xml (100%) diff --git a/src/System.Management.Automation/Certificate.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/Certificate.format.ps1xml similarity index 100% rename from src/System.Management.Automation/Certificate.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/Certificate.format.ps1xml diff --git a/src/System.Management.Automation/Diagnostics.Format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/Diagnostics.Format.ps1xml similarity index 100% rename from src/System.Management.Automation/Diagnostics.Format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/Diagnostics.Format.ps1xml diff --git a/src/System.Management.Automation/DotNetTypes.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/DotNetTypes.format.ps1xml similarity index 100% rename from src/System.Management.Automation/DotNetTypes.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/DotNetTypes.format.ps1xml diff --git a/src/System.Management.Automation/Event.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/Event.format.ps1xml similarity index 100% rename from src/System.Management.Automation/Event.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/Event.format.ps1xml diff --git a/src/System.Management.Automation/FileSystem.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/FileSystem.format.ps1xml similarity index 100% rename from src/System.Management.Automation/FileSystem.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/FileSystem.format.ps1xml diff --git a/src/System.Management.Automation/Help.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/Help.format.ps1xml similarity index 100% rename from src/System.Management.Automation/Help.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/Help.format.ps1xml diff --git a/src/System.Management.Automation/HelpV3.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/HelpV3.format.ps1xml similarity index 100% rename from src/System.Management.Automation/HelpV3.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/HelpV3.format.ps1xml diff --git a/src/System.Management.Automation/PowerShellCore.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/PowerShellCore.format.ps1xml similarity index 100% rename from src/System.Management.Automation/PowerShellCore.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/PowerShellCore.format.ps1xml diff --git a/src/System.Management.Automation/PowerShellTrace.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/PowerShellTrace.format.ps1xml similarity index 100% rename from src/System.Management.Automation/PowerShellTrace.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/PowerShellTrace.format.ps1xml diff --git a/src/System.Management.Automation/Registry.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/Registry.format.ps1xml similarity index 100% rename from src/System.Management.Automation/Registry.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/Registry.format.ps1xml diff --git a/src/System.Management.Automation/WSMan.format.ps1xml b/src/Microsoft.PowerShell.Linux.Host/WSMan.format.ps1xml similarity index 100% rename from src/System.Management.Automation/WSMan.format.ps1xml rename to src/Microsoft.PowerShell.Linux.Host/WSMan.format.ps1xml diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index ce53c3a10c..d919a19e6f 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -6,6 +6,8 @@ "projectUrl": "", "licenseUrl": "", + "content": [ "*.ps1xml" ], + "compilationOptions": { "emitEntryPoint": true }, diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index a26c84b931..83e9b3b5b6 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -588,12 +588,6 @@ "../monad-build/gen/SYS_AUTO/*.cs" ], - "packInclude" : - { - "Modules/" : "../monad/monad/miscfiles/modules/**", - "Pester/" : "../ext-src/pester/**" - }, - "compilationOptions": { "define": [ "CORECLR",