From 5a1666c9844c872bc830f73488bd30f5a3a2ffeb Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Fri, 1 Apr 2016 19:15:41 -0700
Subject: [PATCH] Fix programatic references to Linux.Host

---
 PowerShellGitHubDev.psm1                   | 2 +-
 appveyor.yml                               | 2 +-
 build.sh                                   | 2 +-
 src/Microsoft.PowerShell.Host/host.cs      | 2 +-
 src/Microsoft.PowerShell.Host/main.cs      | 2 +-
 src/Microsoft.PowerShell.Host/rawui.cs     | 2 +-
 src/Microsoft.PowerShell.Host/readline.cs  | 2 +-
 src/Microsoft.PowerShell.Host/ui.cs        | 2 +-
 src/TypeCatalogParser/Main.cs              | 2 +-
 src/libpsl-native/CMakeLists.txt           | 2 +-
 test/csharp/fixture_AssemblyLoadContext.cs | 2 +-
 test/csharp/project.json                   | 2 +-
 test/csharp/test_FileSystemProvider.cs     | 2 +-
 test/csharp/test_Runspace.cs               | 2 +-
 test/csharp/test_SessionState.cs           | 2 +-
 xunit.sh                                   | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/PowerShellGitHubDev.psm1 b/PowerShellGitHubDev.psm1
index e2dfc192d1..c80c50e24f 100644
--- a/PowerShellGitHubDev.psm1
+++ b/PowerShellGitHubDev.psm1
@@ -116,7 +116,7 @@ function Start-PSBuild {
         $Top = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost"
         $Framework = 'net451'
     } else {
-        $Top = "$PSScriptRoot/src/Microsoft.PowerShell.Linux.Host"
+        $Top = "$PSScriptRoot/src/Microsoft.PowerShell.Host"
         $Framework = 'netstandardapp1.5'
     }
 
diff --git a/appveyor.yml b/appveyor.yml
index 64a1438a3c..c2ac6a59d8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ install:
   - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
   - ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
   - git config --global url.git@github.com:.insteadOf https://github.com/
-  - git submodule update --init -- src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
+  - git submodule update --init -- src/windows-build src/Modules/Pester
   - ps: Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1 -OutFile install.ps1
   - ps: ./install.ps1 -version 1.0.0-beta-002198
 
diff --git a/build.sh b/build.sh
index 5287ae1bb4..149910f03f 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@ hash cmake 2>/dev/null || { echo >&2 "No cmake, please run 'sudo apt-get install
 hash g++ 2>/dev/null || { echo >&2 "No g++, please run 'sudo apt-get install g++'"; exit 1; }
 hash dotnet 2>/dev/null || { echo >&2 "No dotnet, please visit https://dotnet.github.io/getting-started/"; exit 1; }
 
-TOP="$(pwd)/src/Microsoft.PowerShell.Linux.Host"
+TOP="$(pwd)/src/Microsoft.PowerShell.Host"
 
 # Test for lock file
 test -r "$TOP/project.lock.json" || { echo >&2 "Please run 'dotnet restore' to download .NET Core packages"; exit 2; }
diff --git a/src/Microsoft.PowerShell.Host/host.cs b/src/Microsoft.PowerShell.Host/host.cs
index f4fa3e2538..5849c99c2f 100644
--- a/src/Microsoft.PowerShell.Host/host.cs
+++ b/src/Microsoft.PowerShell.Host/host.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Linux.Host
+namespace Microsoft.PowerShell.Host
 {
     using System;
     using System.Globalization;
diff --git a/src/Microsoft.PowerShell.Host/main.cs b/src/Microsoft.PowerShell.Host/main.cs
index cef1bb1a28..133b0c4280 100644
--- a/src/Microsoft.PowerShell.Host/main.cs
+++ b/src/Microsoft.PowerShell.Host/main.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Linux.Host
+namespace Microsoft.PowerShell.Host
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Microsoft.PowerShell.Host/rawui.cs b/src/Microsoft.PowerShell.Host/rawui.cs
index 9b359a2daa..e4b2214205 100644
--- a/src/Microsoft.PowerShell.Host/rawui.cs
+++ b/src/Microsoft.PowerShell.Host/rawui.cs
@@ -10,7 +10,7 @@ using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.PowerShell.Linux.Host
+namespace Microsoft.PowerShell.Host
 {
     // this is all from https://msdn.microsoft.com/en-us/library/ee706570%28v=vs.85%29.aspx
 
diff --git a/src/Microsoft.PowerShell.Host/readline.cs b/src/Microsoft.PowerShell.Host/readline.cs
index f44bdbb764..8d6c4bda8d 100644
--- a/src/Microsoft.PowerShell.Host/readline.cs
+++ b/src/Microsoft.PowerShell.Host/readline.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Linux.Host
+namespace Microsoft.PowerShell.Host
 {
     using System;
     using System.Collections.ObjectModel;
diff --git a/src/Microsoft.PowerShell.Host/ui.cs b/src/Microsoft.PowerShell.Host/ui.cs
index 04aed71c5c..ad325690a8 100644
--- a/src/Microsoft.PowerShell.Host/ui.cs
+++ b/src/Microsoft.PowerShell.Host/ui.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.PowerShell.Linux.Host
+namespace Microsoft.PowerShell.Host
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/TypeCatalogParser/Main.cs b/src/TypeCatalogParser/Main.cs
index 2bca648ef3..4a8fa2f0ae 100644
--- a/src/TypeCatalogParser/Main.cs
+++ b/src/TypeCatalogParser/Main.cs
@@ -17,7 +17,7 @@ namespace ConsoleApplication
             var outputPath = "../TypeCatalogGen/powershell.inc";
 
             // Get a context for our top level project
-            var context = ProjectContext.Create("../Microsoft.PowerShell.Linux.Host", NuGetFramework.Parse("netstandardapp1.5"));
+            var context = ProjectContext.Create("../Microsoft.PowerShell.Host", 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
index d0e83e6bba..8aa0988875 100644
--- 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.Linux.Host")
+set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../Microsoft.PowerShell.Host")
 
 # test in BUILD_DIR
 enable_testing()
diff --git a/test/csharp/fixture_AssemblyLoadContext.cs b/test/csharp/fixture_AssemblyLoadContext.cs
index 71362729e3..7afc152636 100644
--- 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.Linux.Host;
+using Microsoft.PowerShell.Host;
 
 // 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
index cf66793456..1ba03831e5 100644
--- a/test/csharp/project.json
+++ b/test/csharp/project.json
@@ -5,7 +5,7 @@
     "authors": [ "andschwa" ],
 
     "dependencies": {
-	"Microsoft.PowerShell.Linux.Host": "1.0.0-*"
+	"Microsoft.PowerShell.Host": "1.0.0-*"
     },
 
     "frameworks": {
diff --git a/test/csharp/test_FileSystemProvider.cs b/test/csharp/test_FileSystemProvider.cs
index 3c720f28a8..c1e7a42f8c 100644
--- a/test/csharp/test_FileSystemProvider.cs
+++ b/test/csharp/test_FileSystemProvider.cs
@@ -13,7 +13,7 @@ using System.Management.Automation.Provider;
 using System.Management.Automation.Runspaces;
 using Microsoft.PowerShell;
 using Microsoft.PowerShell.Commands;
-using Microsoft.PowerShell.Linux.Host;
+using Microsoft.PowerShell.Host;
 
 namespace PSTests
 {
diff --git a/test/csharp/test_Runspace.cs b/test/csharp/test_Runspace.cs
index 0a7b00eb98..3115077d94 100644
--- a/test/csharp/test_Runspace.cs
+++ b/test/csharp/test_Runspace.cs
@@ -2,7 +2,7 @@ using Xunit;
 using System;
 using System.Management.Automation;
 using System.Management.Automation.Runspaces;
-using Microsoft.PowerShell.Linux.Host;
+using Microsoft.PowerShell.Host;
 
 namespace PSTests
 {
diff --git a/test/csharp/test_SessionState.cs b/test/csharp/test_SessionState.cs
index adfc9e7a38..bdc4f01beb 100644
--- a/test/csharp/test_SessionState.cs
+++ b/test/csharp/test_SessionState.cs
@@ -9,7 +9,7 @@ using System.Management.Automation.Internal;
 using System.Management.Automation.Internal.Host;
 using System.Management.Automation.Runspaces;
 using Microsoft.PowerShell;
-using Microsoft.PowerShell.Linux.Host;
+using Microsoft.PowerShell.Host;
 
 namespace PSTests
 {
diff --git a/xunit.sh b/xunit.sh
index 2813b4274f..1997373309 100755
--- a/xunit.sh
+++ b/xunit.sh
@@ -13,7 +13,7 @@ pushd test/csharp
 ## Build
 dotnet build -c Linux
 ## Work-around dotnet/cli#753
-cp -r -f ../../src/Microsoft.PowerShell.Linux.Host/{Modules,*.so,*.dylib} bin/Linux/netstandardapp1.5/ubuntu.14.04-x64 2>/dev/null
+cp -r -f ../../src/Microsoft.PowerShell.Host/{Modules,*.so,*.dylib} bin/Linux/netstandardapp1.5/ubuntu.14.04-x64 2>/dev/null
 ## Test
 dotnet test -c Linux
 result=$?