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

This commit is contained in:
Jason Shirk authored and GitHub committed 2016-08-16 17:03:34 -07:00
1 parent 5f4dcf9a6d
commit 8b056776c0
5 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -658,7 +658,7 @@ function Start-PSBootstrap {
[switch]$Force [switch]$Force
) )
log "Installing Open PowerShell build dependencies" log "Installing PowerShell build dependencies"
Push-Location $PSScriptRoot/tools Push-Location $PSScriptRoot/tools
@@ -20,7 +20,7 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider
public static readonly string SettingsFileName = "PSL.config"; public static readonly string SettingsFileName = "PSL.config";
/// <summary> /// <summary>
/// Sample JSON file containing open powershell entry /// Sample JSON file containing powershell entry
/// </summary> /// </summary>
public static readonly string JSONFileName = "PSL.json"; public static readonly string JSONFileName = "PSL.json";
public static readonly string CatFileName = "PSL.cat"; public static readonly string CatFileName = "PSL.cat";
@@ -161,4 +161,4 @@ namespace Microsoft.PackageManagement.PackageSourceListProvider
} }
} }
#endif #endif
@@ -37,7 +37,7 @@ function Register-WinRmPlugin
$pluginAbsolutePath, $pluginAbsolutePath,
# #
# Expected Example: microsoft.ops.5.1 # Expected Example: microsoft.powershell-core.6.0
# #
[string] [string]
[parameter(Mandatory=$true)] [parameter(Mandatory=$true)]
+1 -1
View File
@@ -22,7 +22,7 @@ namespace Microsoft.PowerShell
public static int Main(string[] args) public static int Main(string[] args)
{ {
#if CORECLR #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); string appBase = System.IO.Path.GetDirectoryName(typeof(ManagedPSEntry).GetTypeInfo().Assembly.Location);
return (int)PowerShellAssemblyLoadContextInitializer. return (int)PowerShellAssemblyLoadContextInitializer.
InitializeAndCallEntryMethod( InitializeAndCallEntryMethod(
@@ -510,7 +510,7 @@ Describe "Install-Save-Package with multiple sources" -Tags "Feature" {
} }
Describe "install-packageprovider with Scope" -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 { BeforeAll {
if ($IsWindows) if ($IsWindows)