From ccecbd7f429c7f49e8ae78ae36a958e26ce3744e Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 8 May 2024 17:18:21 -0700 Subject: [PATCH 1/3] Bump to .NET 9 preview 3 --- global.json | 2 +- ...soft.PowerShell.Commands.Diagnostics.csproj | 2 +- ...osoft.PowerShell.Commands.Management.csproj | 2 +- ...icrosoft.PowerShell.Commands.Utility.csproj | 10 +++++----- ...icrosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 10 +++++----- .../Microsoft.WSMan.Management.csproj | 2 +- .../System.Management.Automation.csproj | 18 +++++++++--------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/global.json b/global.json index c3fd40f9e55..a28e9c5823d 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "9.0.100-preview.1.24101.2" + "version": "9.0.100-preview.3.24204.13" } } 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 121d3acd183..2054b9c1ddf 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 5d1368810bb..cd7ee4594d6 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 70badeb59e0..2e59deee7ab 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -8,7 +8,7 @@ - + @@ -32,10 +32,10 @@ - - - - + + + + diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index b5553ebb9a3..4b9ec289f5c 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index a68cf6e1a4f..b97d6859b4b 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -17,13 +17,13 @@ - + - - - + + + - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index ab1a408623d..781e2c66c4b 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 54a3f84835e..459bf2be921 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -34,16 +34,16 @@ - - - - + + + + - - - - - + + + + + From 8c891adcc704e7025401b3ce2a870cad67e7135d Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 8 May 2024 17:49:32 -0700 Subject: [PATCH 2/3] Update windows.json --- tools/packaging/boms/windows.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index e491911f1ad..0b8b512316f 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -19,6 +19,10 @@ "Pattern": "clrgc.dll", "FileType": "NonProduct" }, + { + "Pattern": "clrgcexp.dll", + "FileType": "NonProduct" + }, { "Pattern": "clrjit.dll", "FileType": "NonProduct" From 348e27d0a78379127abb7adc05964a0b115da384 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 9 May 2024 14:55:08 -0700 Subject: [PATCH 3/3] Update tests to address some changes in the new .NET runtime 1. System.Numerics.Vectors.dll gets loaded at startup due to dependency changes in .NET runtime. 2. Name of a non-public type changed that is used in our test. --- test/powershell/Host/Startup.Tests.ps1 | 1 + test/powershell/Language/Parser/MethodInvocation.Tests.ps1 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/powershell/Host/Startup.Tests.ps1 b/test/powershell/Host/Startup.Tests.ps1 index c8df4fe8017..2845e79cccd 100644 --- a/test/powershell/Host/Startup.Tests.ps1 +++ b/test/powershell/Host/Startup.Tests.ps1 @@ -33,6 +33,7 @@ Describe "Validate start of console host" -Tag CI { 'System.Net.Mail.dll' 'System.Net.NetworkInformation.dll' 'System.Net.Primitives.dll' + 'System.Numerics.Vectors.dll' 'System.ObjectModel.dll' 'System.Private.CoreLib.dll' 'System.Private.Uri.dll' diff --git a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 index ca4db39bd66..a9641951473 100644 --- a/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 +++ b/test/powershell/Language/Parser/MethodInvocation.Tests.ps1 @@ -238,7 +238,7 @@ Describe 'Generic Method invocation' -Tags 'CI' { } ) - $result.GetType().Name | Should -BeExactly 'SelectListIterator`2' + $result.GetType().Name | Should -BeExactly 'ListSelectIterator`2' $typeArgs = $result.GetType().GenericTypeArguments $typeArgs[0] | Should -Be ([int]) $typeArgs[1] | Should -Be ([float])