Skip to content

Bring windows build fixes766 #27814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Justin Chung (jshigetomi) wants to merge 2 commits into
base: release/v7.6.5
Choose a base branch
from
+16 −9
Draft

Bring windows build fixes766 #27814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3f139e
Merged PR 40640: [release/v7.6.4] Backport Windows build pipeline fixes
Jul 16, 2026
9657d95
Merged PR 41087: Import LINQ for RunspaceConnectionInfo (#173)
adityapatwardhan Aug 11, 2026
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
1 change: 1 addition & 0 deletions src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
using System.Management.Automation.Remoting.Client;
using System.Management.Automation.Tracing;
using System.Net;
using System.Linq;
using System.Net.Sockets;
using System.Reflection;
using System.Runtime.InteropServices;
Expand Down
10 changes: 5 additions & 5 deletions tools/packaging/packaging.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2370,20 +2370,20 @@ function Get-MacOSPackageIdentifierInfo
param(
[Parameter(Mandatory)]
[string]$Version,

[switch]$LTS
)

$IsPreview = Test-IsPreview -Version $Version -IsLTS:$LTS

# Determine package identifier based on preview status
if ($IsPreview) {
$PackageIdentifier = 'com.microsoft.powershell-preview'
}
else {
$PackageIdentifier = 'com.microsoft.powershell'
}

return @{
IsPreview = $IsPreview
PackageIdentifier = $PackageIdentifier
Expand Down Expand Up @@ -4204,7 +4204,7 @@ function Start-MsiBuild {
# suppress ICE61, because we allow same version upgrades
# suppress ICE57, this suppresses an error caused by our shortcut not being installed per user
# suppress ICE40, REINSTALLMODE is defined in the Property table.
Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sice:ICE61 -sice:ICE40 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $objectPaths $extensionArgs }
Start-NativeExecution -VerboseOutputOnError {& $wixPaths.wixLightExePath -sval -sice:ICE61 -sice:ICE40 -sice:ICE57 -out $msiLocationPath -pdbout $msiPdbLocationPath $objectPaths $extensionArgs }

foreach($file in $objectPaths)
{
Expand Down
14 changes: 10 additions & 4 deletions tools/wix/wix.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@ function Install-Wix
}
$binPath = Join-Path -Path $targetRoot -ChildPath 'bin'

$psresourceGet = Get-Module -ListAvailable -Name 'Microsoft.PowerShell.PSResourceGet' -ErrorAction SilentlyContinue

if (-not $psresourceGet) {
Install-Module -Name 'Microsoft.PowerShell.PSResourceGet' -Force -AllowClobber -Scope CurrentUser
$psresourceGet = Get-Module -ListAvailable -Name 'Microsoft.PowerShell.PSResourceGet' -ErrorAction SilentlyContinue | Select-Object -First 1

if (-not $psresourceGet -or $psresourceGet.Version -lt [version]"1.2.0") {
try {
Register-PSRepository -Name 'powershell-cfs' -SourceLocation 'https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/PowerShell/nuget/v2' -InstallationPolicy Trusted
Install-Module -Name 'Microsoft.PowerShell.PSResourceGet' -Force -AllowClobber -Scope CurrentUser -Repository 'powershell-cfs'
}
finally {
Unregister-PSRepository -Name 'powershell-cfs'
}
}

$respository = Get-PSResourceRepository -Name 'dotnet-eng' -ErrorAction SilentlyContinue
Expand Down
Loading