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

Bump .NET to 10 preview.1 (#25154)

Browse Source
This commit is contained in:
Aditya Patwardhan
2025-03-19 15:48:08 -07:00
committed by GitHub
parent a6005f3879
commit eef334de1b
28 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PowerShell.Common.props
+1 -1
View File
@@ -144,7 +144,7 @@
<Copyright>(c) Microsoft Corporation.</Copyright>
<AssemblyTitle>PowerShell 7</AssemblyTitle>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>13.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
build.psm1
+3 -3
View File
@@ -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*'
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.200"
"version": "10.0.100-preview.1.25120.13"
}
}
src/GlobalTools/PowerShell.Windows.x64/PowerShell.Windows.x64.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackAsTool>true</PackAsTool>
src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.2" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="10.0.0-preview.1.25080.5" />
</ItemGroup>
<PropertyGroup>
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+1 -1
View File
@@ -47,7 +47,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-preview.1.25080.5" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+3 -3
View File
@@ -32,9 +32,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.2" />
<PackageReference Include="System.Drawing.Common" Version="9.0.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
<PackageReference Include="System.Threading.AccessControl" Version="10.0.0-preview.1.25080.5" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0-preview.1.25080.3" />
<PackageReference Include="JsonSchema.Net" Version="7.3.3" />
</ItemGroup>
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.2" />
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.0-preview.1.25080.5" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+7 -6
View File
@@ -16,14 +16,15 @@
<ItemGroup>
<!-- This section is to force the version of non-direct dependencies -->
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.2" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0-preview.1.25080.5" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-preview.1.25120.3" />
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="9.0.2" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.2" />
<PackageReference Include="System.IO.Packaging" Version="10.0.0-preview.1.25080.5" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="10.0.0-preview.1.25080.5" />
<!-- 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.
@@ -36,7 +37,7 @@
<PackageReference Include="System.ServiceModel.Security" Version="4.10.3" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.2" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-preview.1.25080.4" />
</ItemGroup>
</Project>
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.2" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.0-preview.1.25080.5" />
</ItemGroup>
<PropertyGroup>
src/Modules/PSGalleryModules.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>
src/ResGen/ResGen.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates C# typed bindings for .resx files</Description>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>
src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
+2 -2
View File
@@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25076.4" PrivateAssets="all" />
</ItemGroup>
</Project>
src/System.Management.Automation/System.Management.Automation.csproj
+13 -10
View File
@@ -32,21 +32,24 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.23.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.2" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
<PackageReference Include="System.DirectoryServices" Version="9.0.2" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="10.0.0-preview.1.25080.5" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-preview.1.25080.5" />
<!-- Removing due to NU1510 -->
<!-- PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" /-->
<PackageReference Include="System.DirectoryServices" Version="10.0.0-preview.1.25080.5" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="9.0.2" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.2" />
<PackageReference Include="System.Security.Permissions" Version="9.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" />
<PackageReference Include="System.Management" Version="10.0.0-preview.1.25080.5" />
<!-- 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-preview.1.25080.5" />
<PackageReference Include="System.Security.Permissions" Version="10.0.0-preview.1.25080.5" />
<!-- 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="7.4.0" />
<!-- Signing APIs -->
<PackageReference Include="Microsoft.Security.Extensions" Version="1.4.0" />
<PackageReference Include="Microsoft.Security.Extensions" Version="1.4.0" />
</ItemGroup>
<PropertyGroup>
src/TypeCatalogGen/TypeCatalogGen.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>
test/Test.Common.props
+1 -1
View File
@@ -6,7 +6,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>13.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
test/tools/NamedPipeConnection/build.ps1
+2 -2
View File
@@ -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'
test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<InformationalVersion>1.0.0</InformationalVersion>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<LangVersion>13.0</LangVersion>
</PropertyGroup>
test/tools/OpenCover/OpenCover.psm1
+1 -1
View File
@@ -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",
test/tools/TestService/TestService.csproj
+1 -2
View File
@@ -15,8 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.2" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.2" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="10.0.0-preview.1.25080.4" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
</ItemGroup>
test/tools/WebListener/WebListener.csproj
-1
View File
@@ -8,6 +8,5 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" />
</ItemGroup>
</Project>
tools/findMissingNotices.ps1
+2 -2
View File
@@ -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
tools/packaging/boms/windows.json
+16
View File
@@ -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"
tools/packaging/packaging.psm1
+2 -2
View File
@@ -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') {
tools/packaging/packaging.strings.psd1
+1 -1
View File
@@ -166,7 +166,7 @@ open {0}
<files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
</contentFiles>
<dependencies>
<group targetFramework="net9.0"></group>
<group targetFramework="net10.0"></group>
</dependencies>
</metadata>
</package>
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+3 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -14,7 +14,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<!-- Removing System.Security.AccessControl as per NU1510 -->
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.0" /-->
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>
</Project>
tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+3 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@@ -9,6 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.0" /-->
<!-- PackageReference Include="System.Security.AccessControl" Version="6.0.0" /-->
</ItemGroup>
</Project>