Skip to content

Commit 0b825b3

Browse files
authored
[release/v7.6.1] Build, package, and create VPack for the PowerShell-LTS store package within the same msixbundle-vpack pipeline (PowerShell#27237)
1 parent c6f8278 commit 0b825b3

9 files changed

Lines changed: 450 additions & 91 deletions

File tree

.pipelines/MSIXBundle-vPack-Official.yml

Lines changed: 437 additions & 76 deletions
Large diffs are not rendered by default.

PowerShell.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
<PropertyGroup>
165165
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
166-
<IsWindows Condition="'$(IsWindows)' =='true' or ( '$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
166+
<IsWindows Condition="'$(IsWindows)' == 'true' or ('$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
167167
</PropertyGroup>
168168

169169
<!-- Define non-windows, all configuration properties -->

src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ internal static int Start(
318318
}
319319

320320
s_theConsoleHost.BindBreakHandler();
321-
PSHost.IsStdOutputRedirected = Console.IsOutputRedirected;
321+
IsStdOutputRedirected = Console.IsOutputRedirected;
322322

323323
// Send startup telemetry for ConsoleHost startup
324324
ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("Normal", s_cpp.ParametersUsedAsDouble);

src/Microsoft.PowerShell.ConsoleHost/host/msh/ManagedEntrance.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public static int Start([MarshalAs(UnmanagedType.LPArray, ArraySubType = Unmanag
8686
int exitCode = 0;
8787
try
8888
{
89-
var banner = string.Format(
89+
string banner = string.Format(
9090
CultureInfo.InvariantCulture,
91-
ManagedEntranceStrings.ShellBannerNonWindowsPowerShell,
91+
ManagedEntranceStrings.ShellBannerPowerShell,
9292
PSVersionInfo.GitCommitId);
9393

9494
ConsoleHost.DefaultInitialSessionState = InitialSessionState.CreateDefault2();

src/Microsoft.PowerShell.ConsoleHost/resources/ManagedEntranceStrings.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
120+
<data name="ShellBannerPowerShell" xml:space="preserve">
121121
<value>PowerShell {0}</value>
122122
</data>
123123
<data name="ShellBannerCLMode" xml:space="preserve">

src/System.Management.Automation/resources/RemotingErrorIdStrings.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ Note that 'Start-Job' is not supported by design in scenarios where PowerShell i
849849
<value>The WriteEvents parameter cannot be used without the Wait parameter.</value>
850850
</data>
851851
<data name="PowerShellVersionNotSupported" xml:space="preserve">
852-
<value>PowerShell remoting endpoint versioning is not supported on PowerShell Core.</value>
852+
<value>PowerShell remoting endpoint versioning is not supported on PowerShell 7+.</value>
853853
</data>
854854
<data name="JobManagerRegistrationConstructorError" xml:space="preserve">
855855
<value>The following type cannot be instantiated because its constructor is not public: {0}.</value>

src/System.Management.Automation/resources/TabCompletionStrings.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,10 +457,10 @@ This must be the last parameter on the #requires statement line.</value>
457457
Specifies the minimum version of PowerShell that the script requires.</value>
458458
</data>
459459
<data name="RequiresPsEditionCoreDescription" xml:space="preserve">
460-
<value>Specifies that the script requires PowerShell Core to run.</value>
460+
<value>Specifies that the script requires PowerShell 7+ to run.</value>
461461
</data>
462462
<data name="RequiresPsEditionDesktopDescription" xml:space="preserve">
463-
<value>Specifies that the script requires Windows PowerShell to run.</value>
463+
<value>Specifies that the script requires Windows PowerShell 5.1 to run.</value>
464464
</data>
465465
<data name="RequiresModuleSpecModuleNameDescription" xml:space="preserve">
466466
<value>[string]

src/System.Management.Automation/utils/Telemetry.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public static class ApplicationInsightsTelemetry
164164
private static readonly HashSet<string> s_knownSubsystemNames;
165165

166166
/// <summary>Gets a value indicating whether telemetry can be sent.</summary>
167-
public static bool CanSendTelemetry { get; private set; } = false;
167+
public static bool CanSendTelemetry { get; private set; }
168168

169169
/// <summary>
170170
/// Initializes static members of the <see cref="ApplicationInsightsTelemetry"/> class.
@@ -768,11 +768,11 @@ internal static void SendUseTelemetry(string featureName, string detail, double
768768

769769
if (string.Compare(featureName, s_subsystemRegistration, true) == 0)
770770
{
771-
ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, GetSubsystemName(detail)), value);
771+
SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, GetSubsystemName(detail)), value);
772772
}
773773
else
774774
{
775-
ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, detail), value);
775+
SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, detail), value);
776776
}
777777
}
778778

@@ -788,7 +788,7 @@ internal static void SendExperimentalUseData(string featureName, string detail)
788788
return;
789789
}
790790

791-
ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ExperimentalFeatureUse, string.Join(":", featureName, detail));
791+
SendTelemetryMetric(TelemetryType.ExperimentalFeatureUse, string.Join(":", featureName, detail));
792792
}
793793

794794
// Get the experimental feature name. If we can report it, we'll return the name of the feature, otherwise, we'll return "anonymous"

tools/packaging/packaging.psm1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4318,8 +4318,7 @@ function New-MSIXPackage
43184318
Write-Verbose "Using LTS assets" -Verbose
43194319
}
43204320

4321-
# Appx manifest needs to be in root of source path, but the embedded version needs to be updated
4322-
# cp-459155 is 'CN=Microsoft Windows Store Publisher (Store EKU), O=Microsoft Corporation, L=Redmond, S=Washington, C=US'
4321+
# Appx manifest needs to be in root of source path, but the embedded version needs to be updated.
43234322
# authenticodeFormer is 'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'
43244323
$releasePublisher = 'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'
43254324

@@ -4361,7 +4360,6 @@ function New-MSIXPackage
43614360
else {
43624361
Copy-Item -Path "$RepoRoot\assets\$_.png" -Destination "$ProductSourcePath\assets\"
43634362
}
4364-
43654363
}
43664364

43674365
if ($PSCmdlet.ShouldProcess("Create .msix package?")) {

0 commit comments

Comments
 (0)