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
513 changes: 437 additions & 76 deletions .pipelines/MSIXBundle-vPack-Official.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion PowerShell.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@

<PropertyGroup>
<DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
<IsWindows Condition="'$(IsWindows)' =='true' or ( '$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
<IsWindows Condition="'$(IsWindows)' == 'true' or ('$(IsWindows)' == '' and '$(OS)' == 'Windows_NT')">true</IsWindows>
</PropertyGroup>

<!-- Define non-windows, all configuration properties -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ internal static int Start(
}

s_theConsoleHost.BindBreakHandler();
PSHost.IsStdOutputRedirected = Console.IsOutputRedirected;
IsStdOutputRedirected = Console.IsOutputRedirected;

// Send startup telemetry for ConsoleHost startup
ApplicationInsightsTelemetry.SendPSCoreStartupTelemetry("Normal", s_cpp.ParametersUsedAsDouble);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ public static int Start([MarshalAs(UnmanagedType.LPArray, ArraySubType = Unmanag
int exitCode = 0;
try
{
var banner = string.Format(
string banner = string.Format(
CultureInfo.InvariantCulture,
ManagedEntranceStrings.ShellBannerNonWindowsPowerShell,
ManagedEntranceStrings.ShellBannerPowerShell,
PSVersionInfo.GitCommitId);

ConsoleHost.DefaultInitialSessionState = InitialSessionState.CreateDefault2();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ShellBannerNonWindowsPowerShell" xml:space="preserve">
<data name="ShellBannerPowerShell" xml:space="preserve">
<value>PowerShell {0}</value>
</data>
<data name="ShellBannerCLMode" xml:space="preserve">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Note that 'Start-Job' is not supported by design in scenarios where PowerShell i
<value>The WriteEvents parameter cannot be used without the Wait parameter.</value>
</data>
<data name="PowerShellVersionNotSupported" xml:space="preserve">
<value>PowerShell remoting endpoint versioning is not supported on PowerShell Core.</value>
<value>PowerShell remoting endpoint versioning is not supported on PowerShell 7+.</value>
</data>
<data name="JobManagerRegistrationConstructorError" xml:space="preserve">
<value>The following type cannot be instantiated because its constructor is not public: {0}.</value>
Expand Down
8 changes: 4 additions & 4 deletions src/System.Management.Automation/utils/Telemetry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public static class ApplicationInsightsTelemetry
private static readonly HashSet<string> s_knownSubsystemNames;

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

/// <summary>
/// Initializes static members of the <see cref="ApplicationInsightsTelemetry"/> class.
Expand Down Expand Up @@ -834,11 +834,11 @@ internal static void SendUseTelemetry(string featureName, string detail, double

if (string.Compare(featureName, s_subsystemRegistration, true) == 0)
{
ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, GetSubsystemName(detail)), value);
SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, GetSubsystemName(detail)), value);
}
else
{
ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, detail), value);
SendTelemetryMetric(TelemetryType.FeatureUse, string.Join(":", featureName, detail), value);
}
}

Expand All @@ -854,7 +854,7 @@ internal static void SendExperimentalUseData(string featureName, string detail)
return;
}

ApplicationInsightsTelemetry.SendTelemetryMetric(TelemetryType.ExperimentalFeatureUse, string.Join(":", featureName, detail));
SendTelemetryMetric(TelemetryType.ExperimentalFeatureUse, string.Join(":", featureName, detail));
}

// Get the experimental feature name. If we can report it, we'll return the name of the feature, otherwise, we'll return "anonymous"
Expand Down
4 changes: 1 addition & 3 deletions tools/packaging/packaging.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -4301,8 +4301,7 @@ function New-MSIXPackage
Write-Verbose "Using LTS assets" -Verbose
}

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

Expand Down Expand Up @@ -4344,7 +4343,6 @@ function New-MSIXPackage
else {
Copy-Item -Path "$RepoRoot\assets\$_.png" -Destination "$ProductSourcePath\assets\"
}

}

if ($PSCmdlet.ShouldProcess("Create .msix package?")) {
Expand Down
Loading