From e1b392b6ffeaaf391c8bbc0e83bf6856940267b9 Mon Sep 17 00:00:00 2001 From: PowerShell Team Bot <69177312+pwshBot@users.noreply.github.com> Date: Tue, 18 Apr 2023 15:24:51 -0700 Subject: [PATCH] Update .NET SDK version from `8.0.100-preview.2.23157.25` to `8.0.100-preview.3.23178.7` (#19381) --- global.json | 2 +- ...oft.PowerShell.Commands.Diagnostics.csproj | 2 +- ...soft.PowerShell.Commands.Management.csproj | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 2 +- ...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 20 +- .../Microsoft.WSMan.Management.csproj | 2 +- .../System.Management.Automation.csproj | 16 +- .../ResultsComparer/ResultsComparer.csproj | 2 +- ...soft.PowerShell.NamedPipeConnection.csproj | 2 +- test/tools/TestService/TestService.csproj | 2 +- test/tools/WebListener/WebListener.csproj | 4 +- tools/packaging/boms/windows.json | 272 +++--------------- 13 files changed, 61 insertions(+), 269 deletions(-) diff --git a/global.json b/global.json index 845df69857..1a6ad4fbb9 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.100-preview.2.23157.25" + "version": "8.0.100-preview.3.23178.7" } } diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj index 10d4d9de8e..46f8b45199 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index 5a254cf199..d5325a78bb 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 52ecbceede..085f7cf63b 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -33,7 +33,7 @@ - + - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 67329671c8..5767001aca 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -19,18 +19,18 @@ - - - + + + - - - - - - + + + + + + - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index c80283a453..50ad75c44a 100644 --- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj +++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index 3110a52d62..bff75e7748 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -34,16 +34,16 @@ - - - - + + + + - + - - - + + + diff --git a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj index 2e0c00506c..f63f5adde2 100644 --- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj +++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj @@ -10,6 +10,6 @@ - + diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj index 0a5ca72e31..3959c584e8 100644 --- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj +++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj @@ -15,6 +15,6 @@ - + diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj index d1d924628e..1e25fb6b58 100644 --- a/test/tools/TestService/TestService.csproj +++ b/test/tools/TestService/TestService.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 0a8bf752e9..2bc28b4284 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index c1d06bb2c6..dc4329e475 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -1,32 +1,8 @@ [ - { - "Pattern": "_manifest/spdx_2.2/manifest.spdx.json", - "FileType": "Product" - }, - { - "Pattern": "_manifest/spdx_2.2/manifest.spdx.json.sha256", - "FileType": "Product" - }, { "Pattern": "Accessibility.dll", "FileType": "NonProduct" }, - { - "Pattern": "assets/Powershell_av_colors.ico", - "FileType": "Product" - }, - { - "Pattern": "assets/Powershell_avatar.ico", - "FileType": "Product" - }, - { - "Pattern": "assets/Powershell_black.ico", - "FileType": "Product" - }, - { - "Pattern": "assets/ps_black_32x32.ico", - "FileType": "Product" - }, { "Pattern": "clretwrc.dll", "FileType": "NonProduct" @@ -79,22 +55,6 @@ "Pattern": "cs/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "cs/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "cs/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "cs/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "cs/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "cs/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -183,22 +143,6 @@ "Pattern": "de/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "de/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "de/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "de/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "de/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "de/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -291,22 +235,6 @@ "Pattern": "es/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "es/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "es/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "es/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "es/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "es/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -391,22 +319,6 @@ "Pattern": "fr/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "fr/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "fr/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "fr/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "fr/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "fr/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -507,22 +419,6 @@ "Pattern": "it/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "it/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "it/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "it/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "it/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "it/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -607,22 +503,6 @@ "Pattern": "ja/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "ja/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ja/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ja/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ja/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "ja/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -707,22 +587,6 @@ "Pattern": "ko/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "ko/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ko/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ko/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ko/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "ko/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -775,10 +639,6 @@ "Pattern": "ko/WindowsFormsIntegration.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "LICENSE.txt", - "FileType": "Product" - }, { "Pattern": "Markdig.Signed.dll", "FileType": "NonProduct" @@ -1063,22 +923,6 @@ "Pattern": "pl/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "pl/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "pl/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "pl/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "pl/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "pl/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -1251,22 +1095,6 @@ "Pattern": "pt-BR/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "pt-BR/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "pt-BR/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "pt-BR/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "pt-BR/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "pt-BR/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -2023,22 +1851,6 @@ "Pattern": "ru/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "ru/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ru/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ru/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "ru/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "ru/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -2939,6 +2751,10 @@ "Pattern": "System.Security.SecureString.dll", "FileType": "NonProduct" }, + { + "Pattern": "System.ServiceModel.dll", + "FileType": "NonProduct" + }, { "Pattern": "System.ServiceModel.Duplex.dll", "FileType": "NonProduct" @@ -2947,10 +2763,6 @@ "Pattern": "System.ServiceModel.Http.dll", "FileType": "NonProduct" }, - { - "Pattern": "System.ServiceModel.NetFramingBase.dll", - "FileType": "NonProduct" - }, { "Pattern": "System.ServiceModel.NetTcp.dll", "FileType": "NonProduct" @@ -3187,22 +2999,6 @@ "Pattern": "tr/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "tr/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "tr/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "tr/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "tr/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "tr/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -3319,22 +3115,6 @@ "Pattern": "zh-Hans/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "zh-Hans/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "zh-Hans/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "zh-Hans/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "zh-Hans/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "zh-Hans/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -3419,22 +3199,6 @@ "Pattern": "zh-Hant/System.Private.ServiceModel.resources.dll", "FileType": "NonProduct" }, - { - "Pattern": "zh-Hant/System.ServiceModel.Http.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "zh-Hant/System.ServiceModel.NetFramingBase.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "zh-Hant/System.ServiceModel.NetTcp.resources.dll", - "FileType": "NonProduct" - }, - { - "Pattern": "zh-Hant/System.ServiceModel.Primitives.resources.dll", - "FileType": "NonProduct" - }, { "Pattern": "zh-Hant/System.Web.Services.Description.resources.dll", "FileType": "NonProduct" @@ -3487,6 +3251,30 @@ "Pattern": "zh-Hant/WindowsFormsIntegration.resources.dll", "FileType": "NonProduct" }, + { + "Pattern": "_manifest/spdx_2.2/manifest.spdx.json", + "FileType": "Product" + }, + { + "Pattern": "_manifest/spdx_2.2/manifest.spdx.json.sha256", + "FileType": "Product" + }, + { + "Pattern": "assets/Powershell_av_colors.ico", + "FileType": "Product" + }, + { + "Pattern": "assets/Powershell_avatar.ico", + "FileType": "Product" + }, + { + "Pattern": "assets/Powershell_black.ico", + "FileType": "Product" + }, + { + "Pattern": "assets/ps_black_32x32.ico", + "FileType": "Product" + }, { "Pattern": "Install-PowerShellRemoting.ps1", "FileType": "Product" @@ -3495,6 +3283,10 @@ "Pattern": "InstallPSCorePolicyDefinitions.ps1", "FileType": "Product" }, + { + "Pattern": "LICENSE.txt", + "FileType": "Product" + }, { "Pattern": "Microsoft.Management.Infrastructure.CimCmdlets.dll", "FileType": "Product"