Programmatic update of core console host rename

andyleejordan · andyleejordan · commit bfaad3f057fb · 2016-04-08T10:59:41.000-07:00
diff --git a/PowerShellGitHubDev.psm1 b/PowerShellGitHubDev.psm1
@@ -103,7 +103,7 @@ function Start-PSBuild {
         $Top = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost"
         $Framework = 'net451'
     } else {
-        $Top = "$PSScriptRoot/src/Microsoft.PowerShell.Host"
+        $Top = "$PSScriptRoot/src/Microsoft.PowerShell.CoreConsoleHost"
         $Framework = 'netstandardapp1.5'
     }
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -35,7 +35,7 @@ test_script:
       $ErrorActionPreference = 'Stop'
       #
       # CoreCLR
-      $env:CoreOutput = "$pwd\src\Microsoft.PowerShell.Host\bin\Debug\netstandardapp1.5\win81-x64"
+      $env:CoreOutput = "$pwd\src\Microsoft.PowerShell.CoreConsoleHost\bin\Debug\netstandardapp1.5\win81-x64"
       Write-Host -Foreground Green 'Run CoreCLR tests'
       $testResultsFile = "$pwd\TestsResults.xml"
       & ("$env:CoreOutput\powershell.exe") -c "Invoke-Pester test/powershell -OutputFormat NUnitXml -OutputFile $testResultsFile"
diff --git a/docs/building/linux.md b/docs/building/linux.md
@@ -105,7 +105,7 @@ Start-PSBuild
 
 Congratulations! If everything went right, PowerShell is now built.
 The `Start-PSBuild` script will output the location of the executable:
-`./src/Microsoft.PowerShell.Host/bin/Linux/netstandardapp1.5/ubuntu.14.04-x64/powershell`.
+`./src/Microsoft.PowerShell.CoreConsoleHost/bin/Linux/netstandardapp1.5/ubuntu.14.04-x64/powershell`.
 
 > Note that the `./build.sh` script is deprecated and will be removed
 
@@ -131,14 +131,14 @@ make test
 popd
 ```
 
-This library will be emitted in the `src/Microsoft.PowerShell.Host`
+This library will be emitted in the `src/Microsoft.PowerShell.CoreConsoleHost`
 project, where `dotnet` consumes it as "content" and thus
 automatically deploys it.
 
 Build the managed projects
 --------------------------
 
-The `Microsoft.PowerShell.Host` project is the cross-platform host for
+The `Microsoft.PowerShell.CoreConsoleHost` project is the cross-platform host for
 PowerShell targetting .NET Core. It is the top level project, so
 `dotnet build` transitively builds all its dependencies, and emits a
 `powershell` executable. The `--configuration Linux` flag is
@@ -147,7 +147,7 @@ defined (see [issue #673][]).
 
 ```sh
 dotnet restore
-cd src/Microsoft.PowerShell.Host
+cd src/Microsoft.PowerShell.CoreConsoleHost
 dotnet build --configuration Linux
 ```
 
diff --git a/docs/building/osx.md b/docs/building/osx.md
@@ -38,7 +38,7 @@ module.
 
 The output directory will be slightly different because your runtime
 identifier is different. PowerShell will be at
-`./src/Microsoft.PowerShell.Host/bin/Linux/netstandardapp1.5/osx.10.11-x64/powershell`,
+`./src/Microsoft.PowerShell.CoreConsoleHost/bin/Linux/netstandardapp1.5/osx.10.11-x64/powershell`,
 or `osx.10.10` depending on your operating system version. Note that
 configration is still `Linux` because it would be silly to make yet
 another separate configuration when it's used soley to work-around a
diff --git a/docs/building/windows-core.md b/docs/building/windows-core.md
@@ -70,19 +70,19 @@ Start-PSBuild
 ```
 
 Congratulations! If everything went right, PowerShell is now built and
-executable as `./src/Microsoft.PowerShell.Host/bin/Debug/netstandardapp1.5/win10-x64/powershell`.
+executable as `./src/Microsoft.PowerShell.CoreConsoleHost/bin/Debug/netstandardapp1.5/win10-x64/powershell`.
 
 This location is of the form
 `./[project]/bin/[configuration]/[framework]/[rid]/[binary name]`, and
-our project is `Microsoft.PowerShell.Host`, configuration is `Debug`
+our project is `Microsoft.PowerShell.CoreConsoleHost`, configuration is `Debug`
 by default, framework is `netstandardapp1.5`, runtime identifier is
 **probably** `win10-x64` (but will depend on your operating system;
 don't worry, `dotnet --info` will tell you what it was), and binary
 name is `powershell`. The function `Get-PSOutput` will return the path
 to the executable; thus you can execute the development copy via `&
 (Get-PSOutput)`.
 
-The `Microsoft.PowerShell.Host` project is the cross-platform host for
+The `Microsoft.PowerShell.CoreConsoleHost` project is the cross-platform host for
 PowerShell targetting .NET Core. It is the top level project, so
 `dotnet build` transitively builds all its dependencies, and emits a
 `powershell` executable. The cross-platform host has built-in
diff --git a/mapping.json b/mapping.json
@@ -1187,12 +1187,12 @@
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1": "src/Modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1": "src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1": "src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1",
-    "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.Host/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
+    "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.CoreConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
-    "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1": "src/Modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1",
+    "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.CoreConsoleHost/Microsoft.PowerShell.CoreConsoleHost.psd1": "src/Modules/Microsoft.PowerShell.CoreConsoleHost/Microsoft.PowerShell.CoreConsoleHost.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1": "src/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1": "src/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1",
-    "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.Host/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
+    "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.CoreConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1": "src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1",
     "src/monad/monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1": "src/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1",
     "src/monad/monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "src/Modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1",
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/host.cs b/src/Microsoft.PowerShell.CoreConsoleHost/host.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Host
+namespace Microsoft.PowerShell.CoreConsoleHost
 {
     using System;
     using System.Globalization;
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/main.cs b/src/Microsoft.PowerShell.CoreConsoleHost/main.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Host
+namespace Microsoft.PowerShell.CoreConsoleHost
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/rawui.cs b/src/Microsoft.PowerShell.CoreConsoleHost/rawui.cs
@@ -10,7 +10,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.PowerShell.Host
+namespace Microsoft.PowerShell.CoreConsoleHost
 {
     // this is all from https://msdn.microsoft.com/en-us/library/ee706570%28v=vs.85%29.aspx
 
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/readline.cs b/src/Microsoft.PowerShell.CoreConsoleHost/readline.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Host
+namespace Microsoft.PowerShell.CoreConsoleHost
 {
     using System;
     using System.Collections.ObjectModel;
diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs b/src/Microsoft.PowerShell.CoreConsoleHost/ui.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Host
+namespace Microsoft.PowerShell.CoreConsoleHost
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -2055,7 +2055,7 @@ public static InitialSessionState CreateDefault()
                 // Only load the core snapins at this point...
                 if (Environment.GetEnvironmentVariable("PowerShellMinimal") != null)
                 {
-                    if (si.Name.Equals("Microsoft.PowerShell.Host", StringComparison.OrdinalIgnoreCase))
+                    if (si.Name.Equals("Microsoft.PowerShell.CoreConsoleHost", StringComparison.OrdinalIgnoreCase))
                         break;
                 }
 #endif
@@ -5530,7 +5530,7 @@ static internal void RemoveAllDrivesForProvider(ProviderInfo pi, SessionStateInt
                                                                 "Microsoft.PowerShell.Utility",
                                                                 "Microsoft.PowerShell.Management",
                                                                 "Microsoft.PowerShell.Diagnostics",
-                                                                "Microsoft.PowerShell.Host",
+                                                                "Microsoft.PowerShell.CoreConsoleHost",
                                                                 "Microsoft.PowerShell.Security",
                                                                 "Microsoft.WSMan.Management"
                                                             };
@@ -5548,14 +5548,14 @@ static internal void RemoveAllDrivesForProvider(ProviderInfo pi, SessionStateInt
                                                                                              { "Microsoft.PowerShell.Utility", "Microsoft.PowerShell.Commands.Utility"},
                                                                                              { "Microsoft.PowerShell.Management", "Microsoft.PowerShell.Commands.Management"},
                                                                                              { "Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics"},
-                                                                                             { "Microsoft.PowerShell.Host", "Microsoft.PowerShell.ConsoleHost"},
+                                                                                             { "Microsoft.PowerShell.CoreConsoleHost", "Microsoft.PowerShell.ConsoleHost"},
                                                                                          };
         internal static Dictionary<string, string> NestedModuleEngineModuleMapping = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
                                                                                          {
                                                                                              { "Microsoft.PowerShell.Commands.Utility", "Microsoft.PowerShell.Utility"},
                                                                                              { "Microsoft.PowerShell.Commands.Management", "Microsoft.PowerShell.Management"},
                                                                                              { "Microsoft.PowerShell.Commands.Diagnostics", "Microsoft.PowerShell.Diagnostics"},
-                                                                                             { "Microsoft.PowerShell.ConsoleHost", "Microsoft.PowerShell.Host"},
+                                                                                             { "Microsoft.PowerShell.ConsoleHost", "Microsoft.PowerShell.CoreConsoleHost"},
                                                                                              { "Microsoft.PowerShell.Security", "Microsoft.PowerShell.Security"},
                                                                                              { "Microsoft.WSMan.Management", "Microsoft.WSMan.Management"},
                                                                                          };
diff --git a/src/System.Management.Automation/help/CommandHelpProvider.cs b/src/System.Management.Automation/help/CommandHelpProvider.cs
@@ -45,7 +45,7 @@ static CommandHelpProvider()
             engineModuleHelpFileCache.Add("Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics.dll-Help.xml");
             engineModuleHelpFileCache.Add("Microsoft.PowerShell.Core", "System.Management.Automation.dll-Help.xml");
             engineModuleHelpFileCache.Add("Microsoft.PowerShell.Utility", "Microsoft.PowerShell.Commands.Utility.dll-Help.xml");
-            engineModuleHelpFileCache.Add("Microsoft.PowerShell.Host", "Microsoft.PowerShell.ConsoleHost.dll-Help.xml");
+            engineModuleHelpFileCache.Add("Microsoft.PowerShell.CoreConsoleHost", "Microsoft.PowerShell.ConsoleHost.dll-Help.xml");
             engineModuleHelpFileCache.Add("Microsoft.PowerShell.Management", "Microsoft.PowerShell.Commands.Management.dll-Help.xml");
             engineModuleHelpFileCache.Add("Microsoft.PowerShell.Security", "Microsoft.PowerShell.Security.dll-Help.xml");
             engineModuleHelpFileCache.Add("Microsoft.WSMan.Management", "Microsoft.Wsman.Management.dll-Help.xml");
diff --git a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
@@ -161,7 +161,7 @@ static UpdatableHelpCommandBase()
             metadataCache.Add("Microsoft.PowerShell.Diagnostics", "http://go.microsoft.com/fwlink/?linkid=390783");
             metadataCache.Add("Microsoft.PowerShell.Core", "http://go.microsoft.com/fwlink/?linkid=390782");
             metadataCache.Add("Microsoft.PowerShell.Utility", "http://go.microsoft.com/fwlink/?linkid=390787");
-            metadataCache.Add("Microsoft.PowerShell.Host", "http://go.microsoft.com/fwlink/?linkid=390784");
+            metadataCache.Add("Microsoft.PowerShell.CoreConsoleHost", "http://go.microsoft.com/fwlink/?linkid=390784");
             metadataCache.Add("Microsoft.PowerShell.Management", " http://go.microsoft.com/fwlink/?linkid=390785");
             metadataCache.Add("Microsoft.PowerShell.Security", " http://go.microsoft.com/fwlink/?linkid=390786");
             metadataCache.Add("Microsoft.WSMan.Management", "http://go.microsoft.com/fwlink/?linkid=390788");
diff --git a/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs b/src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
@@ -64,7 +64,7 @@ internal static class RegistryStrings
 
         //Name of default mshsnapins
         internal const string CoreMshSnapinName = "Microsoft.PowerShell.Core";
-        internal const string HostMshSnapinName = "Microsoft.PowerShell.Host";
+        internal const string HostMshSnapinName = "Microsoft.PowerShell.CoreConsoleHost";
         internal const string ManagementMshSnapinName = "Microsoft.PowerShell.Management";
         internal const string SecurityMshSnapinName = "Microsoft.PowerShell.Security";
         internal const string UtilityMshSnapinName = "Microsoft.PowerShell.Utility";
@@ -1412,7 +1412,7 @@ private static IList<DefaultPSSnapInInformation> DefaultMshSnapins
                                 new DefaultPSSnapInInformation("Microsoft.PowerShell.Diagnostics", "Microsoft.PowerShell.Commands.Diagnostics", null,
                                     "GetEventResources,Description", "GetEventResources,Vendor"),
 
-                                new DefaultPSSnapInInformation("Microsoft.PowerShell.Host", "Microsoft.PowerShell.ConsoleHost", null,
+                                new DefaultPSSnapInInformation("Microsoft.PowerShell.CoreConsoleHost", "Microsoft.PowerShell.ConsoleHost", null,
                                     "HostMshSnapInResources,Description","HostMshSnapInResources,Vendor"),
 #endif
                                 CoreSnapin,
diff --git a/src/TypeCatalogParser/Main.cs b/src/TypeCatalogParser/Main.cs
@@ -17,7 +17,7 @@ public static void Main(string[] args)
             var outputPath = "../TypeCatalogGen/powershell.inc";
 
             // Get a context for our top level project
-            var context = ProjectContext.Create("../Microsoft.PowerShell.Host", NuGetFramework.Parse("netstandardapp1.5"));
+            var context = ProjectContext.Create("../Microsoft.PowerShell.CoreConsoleHost", NuGetFramework.Parse("netstandardapp1.5"));
 
             System.IO.File.WriteAllLines(outputPath,
                                          // Get the target for the current runtime
diff --git a/src/libpsl-native/CMakeLists.txt b/src/libpsl-native/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
 project(PSL-NATIVE)
 
 add_compile_options(-std=c++11 -Wall -Werror)
-set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.Host")
+set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.CoreConsoleHost")
 
 # test in BUILD_DIR
 enable_testing()
diff --git a/test/csharp/fixture_AssemblyLoadContext.cs b/test/csharp/fixture_AssemblyLoadContext.cs
@@ -1,7 +1,7 @@
 using Xunit;
 using System;
 using System.Management.Automation;
-using Microsoft.PowerShell.Host;
+using Microsoft.PowerShell.CoreConsoleHost;
 
 // This collection fixture initializes Core PowerShell's AssemblyLoadContext once and only
 // once. Attempting to initialize in a class level fixture will cause multiple
diff --git a/test/csharp/project.json b/test/csharp/project.json
@@ -5,7 +5,7 @@
     "authors": [ "andschwa" ],
 
     "dependencies": {
-	"Microsoft.PowerShell.Host": "1.0.0-*"
+	"Microsoft.PowerShell.CoreConsoleHost": "1.0.0-*"
     },
 
     "frameworks": {
diff --git a/test/csharp/test_FileSystemProvider.cs b/test/csharp/test_FileSystemProvider.cs
@@ -13,7 +13,7 @@
 using System.Management.Automation.Runspaces;
 using Microsoft.PowerShell;
 using Microsoft.PowerShell.Commands;
-using Microsoft.PowerShell.Host;
+using Microsoft.PowerShell.CoreConsoleHost;
 
 namespace PSTests
 {
diff --git a/test/csharp/test_Runspace.cs b/test/csharp/test_Runspace.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
-using Microsoft.PowerShell.Host;
+using Microsoft.PowerShell.CoreConsoleHost;
 
 namespace PSTests
 {
diff --git a/test/csharp/test_SessionState.cs b/test/csharp/test_SessionState.cs
@@ -9,7 +9,7 @@
 using System.Management.Automation.Internal.Host;
 using System.Management.Automation.Runspaces;
 using Microsoft.PowerShell;
-using Microsoft.PowerShell.Host;
+using Microsoft.PowerShell.CoreConsoleHost;
 
 namespace PSTests
 {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ function Start-PSBuild {`
`103`	`103`	`$Top = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost"`
`104`	`104`	`$Framework = 'net451'`
`105`	`105`	`} else {`
`106`		`- $Top = "$PSScriptRoot/src/Microsoft.PowerShell.Host"`
	`106`	`+ $Top = "$PSScriptRoot/src/Microsoft.PowerShell.CoreConsoleHost"`
`107`	`107`	`$Framework = 'netstandardapp1.5'`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ test_script:`
`35`	`35`	`$ErrorActionPreference = 'Stop'`
`36`	`36`	`#`
`37`	`37`	`# CoreCLR`
`38`		`- $env:CoreOutput = "$pwd\src\Microsoft.PowerShell.Host\bin\Debug\netstandardapp1.5\win81-x64"`
	`38`	`+ $env:CoreOutput = "$pwd\src\Microsoft.PowerShell.CoreConsoleHost\bin\Debug\netstandardapp1.5\win81-x64"`
`39`	`39`	`Write-Host -Foreground Green 'Run CoreCLR tests'`
`40`	`40`	`$testResultsFile = "$pwd\TestsResults.xml"`
`41`	`41`	`& ("$env:CoreOutput\powershell.exe") -c "Invoke-Pester test/powershell -OutputFormat NUnitXml -OutputFile $testResultsFile"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Microsoft.PowerShell.Host`
	`1`	`+namespace Microsoft.PowerShell.CoreConsoleHost`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Globalization;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using System.Reflection;`
`11`	`11`	`using System.Runtime.InteropServices;`
`12`	`12`
`13`		`-namespace Microsoft.PowerShell.Host`
	`13`	`+namespace Microsoft.PowerShell.CoreConsoleHost`
`14`	`14`	`{`
`15`	`15`	`// this is all from https://msdn.microsoft.com/en-us/library/ee706570%28v=vs.85%29.aspx`
`16`	`16`