admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[release/v7.6] Update the WCF packages to the latest version that is compatible with v4.10.3 (#26503)

Browse Source
This commit is contained in:
Travis Plunk
2025-12-05 10:52:30 -08:00
committed by GitHub
parent 4109551362
commit 932aea6967
4 changed files with 299 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+4 -13
View File
@@ -23,19 +23,10 @@
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-rc.2.25502.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Text.Encodings.Web" Version="9.0.2" /-->
<!--
the following package(s) are from https://github.com/dotnet/wcf
they are pinned to the version 4.10.x due to a breaking change in newer versions.
see https://github.com/PowerShell/PowerShell/issues/19238 for details.
-->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" NoWarn="NU1605" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" NoWarn="NU1605" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Http" Version="10.0.0-rc.2.final" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="10.0.0-rc.2.final" />
<PackageReference Include="System.ServiceModel.Primitives" Version="10.0.0-rc.2.final" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-rc.2.25502.107" />
</ItemGroup>
src/System.Management.Automation/System.Management.Automation.csproj
-7
View File
@@ -34,17 +34,10 @@
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25502.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" /-->
<PackageReference Include="System.DirectoryServices" Version="10.0.0-rc.2.25502.107" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="10.0.0-rc.2.25502.107" />
<!-- Removing System.Security.AccessControl as per NU1510 -->
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.1" /-->
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.0-rc.2.25502.107" />
<PackageReference Include="System.Security.Permissions" Version="10.0.0-rc.2.25502.107" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" /-->
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="700.0.0-preview.1" />
tools/packaging/boms/windows.json
+265 -85
View File
@@ -89,11 +89,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "cs/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "cs/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -159,6 +154,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "cs\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "cs\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "cs\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "cs\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "D3DCompiler_47_cor3.dll",
"FileType": "NonProduct",
@@ -201,11 +216,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "de/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "de/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -271,6 +281,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "de\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "de\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "de\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "de\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "DirectWriteForwarder.dll",
"FileType": "NonProduct",
@@ -316,11 +346,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "es/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "es/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -386,6 +411,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "es\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "es\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "es\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "es\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr/Microsoft.CodeAnalysis.CSharp.resources.dll",
"FileType": "NonProduct",
@@ -421,11 +466,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -491,6 +531,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "fr\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "getfilesiginforedist.dll",
"FileType": "NonProduct",
@@ -551,11 +611,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "it/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "it/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -621,6 +676,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "it\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "it\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "it\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "it\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja/Microsoft.CodeAnalysis.CSharp.resources.dll",
"FileType": "NonProduct",
@@ -656,11 +731,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -726,6 +796,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ja\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Json.More.dll",
"FileType": "NonProduct",
@@ -776,11 +866,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ko/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ko/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -846,6 +931,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ko\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ko\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ko\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ko\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Markdig.Signed.dll",
"FileType": "NonProduct",
@@ -1111,11 +1216,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Modules/ThreadJob/*.psd1",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Modules\\Microsoft.PowerShell.PSResourceGet\\Microsoft.PowerShell.PSResourceGet.pdb",
"FileType": "NonProduct",
@@ -1156,16 +1256,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Modules\\ThreadJob\\.signature.p7s",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Modules\\ThreadJob\\ThreadJob.psm1",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "mscordaccore_*.dll",
"FileType": "NonProduct",
@@ -1246,11 +1336,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pl/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pl/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -1316,6 +1401,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pl\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pl\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pl\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pl\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "powershell.config.json",
"FileType": "NonProduct",
@@ -1466,11 +1571,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pt-BR/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pt-BR/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -1536,6 +1636,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pt-BR\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pt-BR\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pt-BR\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pt-BR\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "pwrshplugin.dll",
"FileType": "NonProduct",
@@ -2431,11 +2551,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ru/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ru/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -2501,6 +2616,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ru\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ru\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ru\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "ru\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "Schemas/PSMaml/base.xsd",
"FileType": "NonProduct",
@@ -3316,11 +3451,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "System.Private.ServiceModel.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "System.Private.Uri.dll",
"FileType": "NonProduct",
@@ -3606,6 +3736,11 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "System.ServiceModel.NetFramingBase.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "System.ServiceModel.NetTcp.dll",
"FileType": "NonProduct",
@@ -3901,11 +4036,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "tr/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "tr/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -3971,6 +4101,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "tr\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "tr\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "tr\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "tr\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "UIAutomationClient.dll",
"FileType": "NonProduct",
@@ -4046,11 +4196,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hans/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hans/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -4116,6 +4261,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hans\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hans\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hans\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hans\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll",
"FileType": "NonProduct",
@@ -4151,11 +4316,6 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant/System.Private.ServiceModel.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant/System.Web.Services.Description.resources.dll",
"FileType": "NonProduct",
@@ -4221,6 +4381,26 @@
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant\\System.ServiceModel.Http.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant\\System.ServiceModel.NetFramingBase.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant\\System.ServiceModel.NetTcp.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "zh-Hant\\System.ServiceModel.Primitives.resources.dll",
"FileType": "NonProduct",
"Architecture": null
},
{
"Pattern": "_manifest/spdx_2.2/manifest.spdx.json",
"FileType": "Product",
tools/packaging/packaging.psm1
+30 -2
View File
@@ -284,6 +284,18 @@ function Start-PSPackage {
$createdSpdxPathSha = New-Item -Path $manifestSpdxPathSha -Force
Write-Verbose -Verbose "Created manifest.spdx.json.sha256 file: $createdSpdxPathSha"
}
$bsiJsonPath = (Join-Path -Path $Source "_manifest\spdx_2.2\bsi.json")
if (-not (Test-Path -Path $bsiJsonPath)) {
$createdBsiJsonPath = New-Item -Path $bsiJsonPath -Force
Write-Verbose -Verbose "Created bsi.json file: $createdBsiJsonPath"
}
$manifestCatPath = (Join-Path -Path $Source "_manifest\spdx_2.2\manifest.cat")
if (-not (Test-Path -Path $manifestCatPath)) {
$createdCatPath = New-Item -Path $manifestCatPath -Force
Write-Verbose -Verbose "Created manifest.cat file: $createdCatPath"
}
}
# If building a symbols package, we add a zip of the parent to publish
@@ -5533,8 +5545,24 @@ function Send-AzdoFile {
Copy-Item -Path $Path -Destination $logFile
}
Write-Host "##vso[artifact.upload containerfolder=$newName;artifactname=$newName]$logFile"
Write-Verbose "Log file captured as $newName" -Verbose
Write-Verbose "Capture the log file as '$newName'" -Verbose
if($env:TF_BUILD) {
## In Azure DevOps
Write-Host "##vso[artifact.upload containerfolder=$newName;artifactname=$newName]$logFile"
} elseif ($env:GITHUB_WORKFLOW -and $env:SYSTEM_ARTIFACTSDIRECTORY) {
## In GitHub Actions
$destinationPath = $env:SYSTEM_ARTIFACTSDIRECTORY
Write-Verbose "Upload '$logFile' to '$destinationPath' in GitHub Action" -Verbose
# Create the folder if it does not exist
if (!(Test-Path -Path $destinationPath)) {
$null = New-Item -ItemType Directory -Path $destinationPath -Force
}
Copy-Item -Path $logFile -Destination $destinationPath -Force -Verbose
} else {
Write-Warning "This environment is neither Azure Devops nor GitHub Actions. Cannot capture the log file in this environment."
}
}
# Class used for serializing and deserialing a BOM into Json