Stop using 'Open PowerShell' and OPS in code (PowerShell#1838)

lzybkr · web-flow · commit 8b056776c0ee · 2016-08-16T17:03:34.000-07:00
diff --git a/build.psm1 b/build.psm1
@@ -658,7 +658,7 @@ function Start-PSBootstrap {
         [switch]$Force
     )
 
-    log "Installing Open PowerShell build dependencies"
+    log "Installing PowerShell build dependencies"
 
     Push-Location $PSScriptRoot/tools
 
diff --git a/src/Microsoft.PackageManagement.PackageSourceListProvider/Sdk/Constants.cs b/src/Microsoft.PackageManagement.PackageSourceListProvider/Sdk/Constants.cs
@@ -20,7 +20,7 @@ public static class Constants
         public static readonly string SettingsFileName = "PSL.config";
 
         /// <summary>
-        /// Sample JSON file containing open powershell entry
+        /// Sample JSON file containing powershell entry
         /// </summary>
         public static readonly string JSONFileName = "PSL.json";
         public static readonly string CatFileName = "PSL.cat";
@@ -161,4 +161,4 @@ internal static class SwidTag
     }
 }
 
-#endif
+#endif
diff --git a/src/powershell-native/Install-PowerShellRemoting.ps1 b/src/powershell-native/Install-PowerShellRemoting.ps1
@@ -37,7 +37,7 @@ function Register-WinRmPlugin
         $pluginAbsolutePath,
 
         #
-        # Expected Example: microsoft.ops.5.1
+        # Expected Example: microsoft.powershell-core.6.0
         #
         [string]
         [parameter(Mandatory=$true)]
diff --git a/src/powershell/Program.cs b/src/powershell/Program.cs
@@ -22,7 +22,7 @@ public sealed class ManagedPSEntry
         public static int Main(string[] args)
         {
 #if CORECLR
-            // Open PowerShell has to set the ALC here, since we don't own the native host
+            // PowerShell has to set the ALC here, since we don't own the native host
             string appBase = System.IO.Path.GetDirectoryName(typeof(ManagedPSEntry).GetTypeInfo().Assembly.Location);
             return (int)PowerShellAssemblyLoadContextInitializer.
                            InitializeAndCallEntryMethod(
diff --git a/test/powershell/Modules/PackageManagement/Install-PackageProvider.Tests.ps1 b/test/powershell/Modules/PackageManagement/Install-PackageProvider.Tests.ps1
@@ -510,7 +510,7 @@ Describe "Install-Save-Package with multiple sources" -Tags "Feature" {
 }
 
 Describe "install-packageprovider with Scope" -Tags "Feature" {
-    # PENDING a lot of these tests because jobs are broken on OPS
+    # PENDING a lot of these tests because jobs are broken on PowerShell from GitHub
 
     BeforeAll {
         if ($IsWindows)

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ function Start-PSBootstrap {`
`658`	`658`	`[switch]$Force`
`659`	`659`	`)`
`660`	`660`
`661`		`- log "Installing Open PowerShell build dependencies"`
	`661`	`+ log "Installing PowerShell build dependencies"`
`662`	`662`
`663`	`663`	`Push-Location $PSScriptRoot/tools`
`664`	`664`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static class Constants`
`20`	`20`	`public static readonly string SettingsFileName = "PSL.config";`
`21`	`21`
`22`	`22`	`/// <summary>`
`23`		`- /// Sample JSON file containing open powershell entry`
	`23`	`+ /// Sample JSON file containing powershell entry`
`24`	`24`	`/// </summary>`
`25`	`25`	`public static readonly string JSONFileName = "PSL.json";`
`26`	`26`	`public static readonly string CatFileName = "PSL.cat";`
`@@ -161,4 +161,4 @@ internal static class SwidTag`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`164`		`-#endif`
	`164`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function Register-WinRmPlugin`
`37`	`37`	`$pluginAbsolutePath,`
`38`	`38`
`39`	`39`	`#`
`40`		`- # Expected Example: microsoft.ops.5.1`
	`40`	`+ # Expected Example: microsoft.powershell-core.6.0`
`41`	`41`	`#`
`42`	`42`	`[string]`
`43`	`43`	`[parameter(Mandatory=$true)]`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public sealed class ManagedPSEntry`
`22`	`22`	`public static int Main(string[] args)`
`23`	`23`	`{`
`24`	`24`	`#if CORECLR`
`25`		`- // Open PowerShell has to set the ALC here, since we don't own the native host`
	`25`	`+ // PowerShell has to set the ALC here, since we don't own the native host`
`26`	`26`	`string appBase = System.IO.Path.GetDirectoryName(typeof(ManagedPSEntry).GetTypeInfo().Assembly.Location);`
`27`	`27`	`return (int)PowerShellAssemblyLoadContextInitializer.`
`28`	`28`	`InitializeAndCallEntryMethod(`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ Describe "Install-Save-Package with multiple sources" -Tags "Feature" {`
`510`	`510`	`}`
`511`	`511`
`512`	`512`	`Describe "install-packageprovider with Scope" -Tags "Feature" {`
`513`		`- # PENDING a lot of these tests because jobs are broken on OPS`
	`513`	`+ # PENDING a lot of these tests because jobs are broken on PowerShell from GitHub`
`514`	`514`
`515`	`515`	`BeforeAll {`
`516`	`516`	`if ($IsWindows)`