From eef334de1b0f648512859bd032356f9c8df7cb91 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 19 Mar 2025 15:48:08 -0700 Subject: [PATCH] Bump .NET to 10 preview.1 (#25154) --- PowerShell.Common.props | 2 +- build.psm1 | 6 ++--- global.json | 2 +- .../PowerShell.Windows.x64.csproj | 2 +- ...oft.PowerShell.Commands.Diagnostics.csproj | 2 +- ...soft.PowerShell.Commands.Management.csproj | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 6 ++--- ...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 13 ++++++----- .../Microsoft.WSMan.Management.csproj | 2 +- src/Modules/PSGalleryModules.csproj | 2 +- src/ResGen/ResGen.csproj | 2 +- .../PSVersionInfoGenerator.csproj | 4 ++-- .../System.Management.Automation.csproj | 23 +++++++++++-------- src/TypeCatalogGen/TypeCatalogGen.csproj | 2 +- test/Test.Common.props | 2 +- test/tools/NamedPipeConnection/build.ps1 | 4 ++-- ...soft.PowerShell.NamedPipeConnection.csproj | 2 +- test/tools/OpenCover/OpenCover.psm1 | 2 +- test/tools/TestService/TestService.csproj | 3 +-- test/tools/WebListener/WebListener.csproj | 1 - tools/findMissingNotices.ps1 | 4 ++-- tools/packaging/boms/windows.json | 16 +++++++++++++ tools/packaging/packaging.psm1 | 4 ++-- tools/packaging/packaging.strings.psd1 | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 5 ++-- .../Microsoft.PowerShell.ConsoleHost.csproj | 2 +- .../System.Management.Automation.csproj | 5 ++-- 28 files changed, 72 insertions(+), 52 deletions(-) diff --git a/PowerShell.Common.props b/PowerShell.Common.props index 36e100811a..5dce6eac9a 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -144,7 +144,7 @@ (c) Microsoft Corporation. PowerShell 7 - net9.0 + net10.0 13.0 true diff --git a/build.psm1 b/build.psm1 index 2d011591de..6a809d4231 100644 --- a/build.psm1 +++ b/build.psm1 @@ -984,8 +984,8 @@ function New-PSOptions { [ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')] [string]$Configuration, - [ValidateSet("net9.0")] - [string]$Framework = "net9.0", + [ValidateSet("net10.0")] + [string]$Framework = "net10.0", # These are duplicated from Start-PSBuild # We do not use ValidateScript since we want tab completion @@ -3701,7 +3701,7 @@ function Clear-NativeDependencies $filesToDeleteWinDesktop = @() $deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20 - $targetRuntime = ".NETCoreApp,Version=v9.0/$($script:Options.Runtime)" + $targetRuntime = ".NETCoreApp,Version=v10.0/$($script:Options.Runtime)" $runtimePackNetCore = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.NETCore.App.Runtime*' $runtimePackWinDesktop = $deps.targets.${targetRuntime}.PSObject.Properties.Name -like 'runtimepack.Microsoft.WindowsDesktop.App.Runtime*' diff --git a/global.json b/global.json index 58b8fbe195..8728da1e28 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "9.0.200" + "version": "10.0.100-preview.1.25120.13" } } diff --git a/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj b/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj index f18bdae611..49d607ebfe 100644 --- a/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj +++ b/src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 enable enable true 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 900f65f5d3..4c9ab5e054 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 6bb99cd03f..fe47f11e44 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 e6db0c9ba0..b0aad72be0 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -32,9 +32,9 @@ - - - + + + 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 b5360a74c8..0e85f2a0c9 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 f6ff666a7a..482d0c053a 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -16,14 +16,15 @@ - - + + - - - + + + + - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index ddba654b6a..3eed931af6 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/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj index 5f9f89a456..1eee862959 100644 --- a/src/Modules/PSGalleryModules.csproj +++ b/src/Modules/PSGalleryModules.csproj @@ -5,7 +5,7 @@ Microsoft Corporation (c) Microsoft Corporation. - net9.0 + net10.0 true diff --git a/src/ResGen/ResGen.csproj b/src/ResGen/ResGen.csproj index a6448b1dc7..7fcf1ff3f3 100644 --- a/src/ResGen/ResGen.csproj +++ b/src/ResGen/ResGen.csproj @@ -2,7 +2,7 @@ Generates C# typed bindings for .resx files - net9.0 + net10.0 resgen Exe true diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj index 33afc31b37..fc44ac0d0b 100644 --- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj +++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj @@ -14,7 +14,7 @@ - - + + diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index 28950133f4..0c393747f8 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -32,21 +32,24 @@ - - - - + + + + + - - - - - + + + + + + + - + diff --git a/src/TypeCatalogGen/TypeCatalogGen.csproj b/src/TypeCatalogGen/TypeCatalogGen.csproj index 56db232548..ffc3ff9998 100644 --- a/src/TypeCatalogGen/TypeCatalogGen.csproj +++ b/src/TypeCatalogGen/TypeCatalogGen.csproj @@ -2,7 +2,7 @@ Generates CorePsTypeCatalog.cs given powershell.inc - net9.0 + net10.0 true TypeCatalogGen Exe diff --git a/test/Test.Common.props b/test/Test.Common.props index e28b916f73..3fafbbf8f8 100644 --- a/test/Test.Common.props +++ b/test/Test.Common.props @@ -6,7 +6,7 @@ Microsoft Corporation (c) Microsoft Corporation. - net9.0 + net10.0 13.0 true diff --git a/test/tools/NamedPipeConnection/build.ps1 b/test/tools/NamedPipeConnection/build.ps1 index e9941d2b1f..a0978c4cb3 100644 --- a/test/tools/NamedPipeConnection/build.ps1 +++ b/test/tools/NamedPipeConnection/build.ps1 @@ -36,8 +36,8 @@ param ( [ValidateSet("Debug", "Release")] [string] $BuildConfiguration = "Debug", - [ValidateSet("net9.0")] - [string] $BuildFramework = "net9.0" + [ValidateSet("net10.0")] + [string] $BuildFramework = "net10.0" ) $script:ModuleName = 'Microsoft.PowerShell.NamedPipeConnection' diff --git a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj index 2320b1d90e..89147481bc 100644 --- a/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj +++ b/test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj @@ -8,7 +8,7 @@ 1.0.0.0 1.0.0 1.0.0 - net9.0 + net10.0 true 13.0 diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1 index 6f2b3bdde4..9e7adb640c 100644 --- a/test/tools/OpenCover/OpenCover.psm1 +++ b/test/tools/OpenCover/OpenCover.psm1 @@ -624,7 +624,7 @@ function Invoke-OpenCover [parameter()]$OutputLog = "$HOME/Documents/OpenCover.xml", [parameter()]$TestPath = "${script:psRepoPath}/test/powershell", [parameter()]$OpenCoverPath = "$HOME/OpenCover", - [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net9.0/win7-x64/publish", + [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net10.0/win7-x64/publish", [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml", [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml", [parameter()]$PesterLogFormat = "NUnitXml", diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj index e5e132e942..0711a39ee5 100644 --- a/test/tools/TestService/TestService.csproj +++ b/test/tools/TestService/TestService.csproj @@ -15,8 +15,7 @@ - - + diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 2f9314cee7..16bcd5d1d0 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -8,6 +8,5 @@ - diff --git a/tools/findMissingNotices.ps1 b/tools/findMissingNotices.ps1 index 3200bdeeaa..42722701d9 100644 --- a/tools/findMissingNotices.ps1 +++ b/tools/findMissingNotices.ps1 @@ -193,8 +193,8 @@ function Get-CGRegistrations { $registrationChanged = $false - $dotnetTargetName = 'net9.0' - $dotnetTargetNameWin7 = 'net9.0-windows8.0' + $dotnetTargetName = 'net10.0' + $dotnetTargetNameWin7 = 'net10.0-windows8.0' $unixProjectName = 'powershell-unix' $windowsProjectName = 'powershell-win-core' $actualRuntime = $Runtime diff --git a/tools/packaging/boms/windows.json b/tools/packaging/boms/windows.json index c9fd280930..e52ebed2b1 100644 --- a/tools/packaging/boms/windows.json +++ b/tools/packaging/boms/windows.json @@ -1875,6 +1875,10 @@ "Pattern": "ref\\System.IO.Pipelines.dll", "FileType": "NonProduct" }, + { + "Pattern": "ref\\System.Linq.AsyncEnumerable.dll", + "FileType": "NonProduct" + }, { "Pattern": "ru/Microsoft.CodeAnalysis.CSharp.resources.dll", "FileType": "NonProduct" @@ -2471,6 +2475,10 @@ "Pattern": "System.IO.UnmanagedMemoryStream.dll", "FileType": "NonProduct" }, + { + "Pattern": "System.Linq.AsyncEnumerable.dll", + "FileType": "NonProduct" + }, { "Pattern": "System.Linq.dll", "FileType": "NonProduct" @@ -2615,6 +2623,10 @@ "Pattern": "System.Private.Windows.Core.dll", "FileType": "NonProduct" }, + { + "Pattern": "System.Private.Windows.GdiPlus.dll", + "FileType": "NonProduct" + }, { "Pattern": "System.Private.Xml.dll", "FileType": "NonProduct" @@ -2991,6 +3003,10 @@ "Pattern": "System.Windows.Presentation.dll", "FileType": "NonProduct" }, + { + "Pattern": "System.Windows.Primitives.dll", + "FileType": "NonProduct" + }, { "Pattern": "System.Xaml.dll", "FileType": "NonProduct" diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 50c47062c3..f8961cc488 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -16,7 +16,7 @@ $AllDistributions = @() $AllDistributions += $DebianDistributions $AllDistributions += $RedhatDistributions $AllDistributions += 'macOs' -$script:netCoreRuntime = 'net9.0' +$script:netCoreRuntime = 'net10.0' $script:iconFileName = "Powershell_black_64.png" $script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve @@ -1621,7 +1621,7 @@ function Get-PackageDependencies ) if($Script:Options.Runtime -like 'fx*') { $Dependencies += @( - "dotnet-runtime-9.0" + "dotnet-runtime-10.0" ) } } elseif ($Distribution -eq 'macOS') { diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1 index fda97df9cd..eeb9a86ec1 100644 --- a/tools/packaging/packaging.strings.psd1 +++ b/tools/packaging/packaging.strings.psd1 @@ -166,7 +166,7 @@ open {0} - + diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index eccdcfa947..f358b454ba 100644 --- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 $(RefAsmVersion) true $(SnkFile) @@ -14,7 +14,8 @@ - + + diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj index 7f45926e29..c0794a6a70 100644 --- a/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj +++ b/tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 $(RefAsmVersion) true $(SnkFile) diff --git a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj index 3a021bb551..f4626e110f 100644 --- a/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj +++ b/tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 $(RefAsmVersion) true $(SnkFile) @@ -9,6 +9,7 @@ - + +