From caaba5c5123f1a26220e102155b6b98caf9a33d1 Mon Sep 17 00:00:00 2001 From: "Jason Shirk (POWERSHELL)" Date: Tue, 16 Aug 2016 13:53:18 -0700 Subject: [PATCH] Stop using 'Open PowerShell' and OPS in code --- build.psm1 | 2 +- .../Sdk/Constants.cs | 4 ++-- src/powershell-native/Install-PowerShellRemoting.ps1 | 2 +- src/powershell/Program.cs | 2 +- .../PackageManagement/Install-PackageProvider.Tests.ps1 | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.psm1 b/build.psm1 index 3b69e4f7e75..4d782b2c6dd 100644 --- 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 index ee97a4fc400..733b3ba9442 100644 --- 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"; /// - /// Sample JSON file containing open powershell entry + /// Sample JSON file containing powershell entry /// public static readonly string JSONFileName = "PSL.json"; public static readonly string CatFileName = "PSL.cat"; @@ -161,4 +161,4 @@ internal static class SwidTag } } -#endif \ No newline at end of file +#endif diff --git a/src/powershell-native/Install-PowerShellRemoting.ps1 b/src/powershell-native/Install-PowerShellRemoting.ps1 index 8348f890197..8e3009a7df5 100644 --- 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 index 8b31e0fa2e2..573e1ead870 100644 --- 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 index d4d0ef2cfe1..b103ba3fb9d 100644 --- 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)