Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ function Start-PSBootstrap {
[switch]$Force
)

log "Installing Open PowerShell build dependencies"
log "Installing PowerShell build dependencies"

Push-Location $PSScriptRoot/tools

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -161,4 +161,4 @@ internal static class SwidTag
}
}

#endif
#endif
2 changes: 1 addition & 1 deletion src/powershell-native/Install-PowerShellRemoting.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/powershell/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down