mirrors/PowerShell
0
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell.git synced 2024-11-23 01:34:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump to .NET 9 Preview 1 (#21229)

Browse Source
This commit is contained in:
Aditya Patwardhan 2024-02-15 19:15:11 -08:00 committed by GitHub
parent 71035543e7
commit a145f47787
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
30 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerShell.Common.props
View File

@ -138,7 +138,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

6
build.psm1
View File

@ -893,8 +893,8 @@ function New-PSOptions {
[ValidateSet('Debug', 'Release', 'CodeCoverage', 'StaticAnalysis', '')]
[string]$Configuration,
[ValidateSet("net8.0")]
[string]$Framework = "net8.0",
[ValidateSet("net9.0")]
[string]$Framework = "net9.0",
# These are duplicated from Start-PSBuild
# We do not use ValidateScript since we want tab completion
@ -3503,7 +3503,7 @@ function Clear-NativeDependencies
$filesToDeleteWinDesktop = @()
$deps = Get-Content "$PublishFolder/pwsh.deps.json" -Raw | ConvertFrom-Json -Depth 20
$targetRuntime = ".NETCoreApp,Version=v8.0/$($script:Options.Runtime)"
$targetRuntime = ".NETCoreApp,Version=v9.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*'

2
global.json
View File

@ -1,5 +1,5 @@
{
"sdk": {
"version": "8.0.101"
"version": "9.0.100-preview.1.24101.2"
}
}

2
nuget.config
View File

@ -2,7 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v2" />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>

2
src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="9.0.0-preview.1.24080.9" />
</ItemGroup>
<PropertyGroup>

2
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View File

@ -47,7 +47,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.1.24080.9" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View File

@ -32,10 +32,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="System.Threading.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.1" />
<PackageReference Include="JsonSchema.Net" Version="5.5.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.final" />
<PackageReference Include="System.Threading.AccessControl" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Drawing.Common" Version="9.0.0-preview.1.24081.2" />
<PackageReference Include="JsonSchema.Net" Version="6.0.2" />
</ItemGroup>
</Project>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View File

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.EventLog" Version="9.0.0-preview.1.24080.9" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View File

@ -19,9 +19,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="8.0.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageReference Include="System.IO.Packaging" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0-preview.1.24080.9" />
<!--
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.
@ -34,7 +34,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="8.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0-preview.1.24081.3" />
</ItemGroup>
</Project>

2
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
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="8.0.0" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="9.0.0-preview.1.24080.9" />
</ItemGroup>
<PropertyGroup>

2
src/Modules/PSGalleryModules.csproj
View File

@ -5,7 +5,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
</PropertyGroup>

2
src/ResGen/ResGen.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates C# typed bindings for .resx files</Description>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<AssemblyName>resgen</AssemblyName>
<OutputType>Exe</OutputType>
<TieredCompilation>true</TieredCompilation>

5
src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
View File

@ -10,10 +10,11 @@
<LangVersion>11.0</LangVersion>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
<NoWarn>RS1035</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.0-3.final" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24072.1" PrivateAssets="all" />
</ItemGroup>
</Project>

16
src/System.Management.Automation/System.Management.Automation.csproj
View File

@ -34,16 +34,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageReference Include="System.DirectoryServices" Version="8.0.0" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.DirectoryServices" Version="9.0.0-preview.1.24080.9" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Management" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Security.Permissions" Version="9.0.0-preview.1.24080.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0-preview.1.24080.9" />
<!-- 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" />

2
src/TypeCatalogGen/TypeCatalogGen.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>Generates CorePsTypeCatalog.cs given powershell.inc</Description>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>TypeCatalogGen</AssemblyName>
<OutputType>Exe</OutputType>

2
test/Test.Common.props
View File

@ -6,7 +6,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>(c) Microsoft Corporation.</Copyright>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

2
test/powershell/engine/Basic/StandardLibraryTypes.Tests.ps1
View File

@ -19,7 +19,7 @@ Describe "Types referenced by PowerShell Standard should not be missing" -Tags
"IsSecurityCritical",
"IsSecuritySafeCritical",
"IsSecurityTransparent",
"IsInterface",
## "IsInterface", -- disable due to issue https://github.com/dotnet/runtime/issues/98533
"IsNested",
"IsArray",
"IsByRef",

4
test/tools/NamedPipeConnection/build.ps1
View File

@ -36,8 +36,8 @@ param (
[ValidateSet("Debug", "Release")]
[string] $BuildConfiguration = "Debug",
[ValidateSet("net8.0")]
[string] $BuildFramework = "net8.0"
[ValidateSet("net9.0")]
[string] $BuildFramework = "net9.0"
)
$script:ModuleName = 'Microsoft.PowerShell.NamedPipeConnection'

2
test/tools/NamedPipeConnection/src/code/Microsoft.PowerShell.NamedPipeConnection.csproj
View File

@ -8,7 +8,7 @@
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<InformationalVersion>1.0.0</InformationalVersion>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net9.0</TargetFrameworks>
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<LangVersion>11.0</LangVersion>
</PropertyGroup>

2
test/tools/OpenCover/OpenCover.psm1
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/net8.0/win7-x64/publish",
[parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/net9.0/win7-x64/publish",
[parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml",
[parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml",
[parameter()]$PesterLogFormat = "NUnitXml",

4
tools/findMissingNotices.ps1
View File

@ -177,8 +177,8 @@ function Get-CGRegistrations {
$registrationChanged = $false
$dotnetTargetName = 'net8.0'
$dotnetTargetNameWin7 = 'net8.0-windows8.0'
$dotnetTargetName = 'net9.0'
$dotnetTargetNameWin7 = 'net9.0-windows8.0'
$unixProjectName = 'powershell-unix'
$windowsProjectName = 'powershell-win-core'
$actualRuntime = $Runtime

20
tools/packaging/boms/windows.json
View File

@ -395,6 +395,10 @@
"Pattern": "hostpolicy.dll",
"FileType": "NonProduct"
},
{
"Pattern": "Humanizer.dll",
"FileType": "NonProduct"
},
{
"Pattern": "it/Microsoft.CodeAnalysis.CSharp.resources.dll",
"FileType": "NonProduct"
@ -563,10 +567,6 @@
"Pattern": "ja/WindowsFormsIntegration.resources.dll",
"FileType": "NonProduct"
},
{
"Pattern": "JetBrains.Annotations.dll",
"FileType": "NonProduct"
},
{
"Pattern": "Json.More.dll",
"FileType": "NonProduct"
@ -667,10 +667,6 @@
"Pattern": "Markdig.Signed.dll",
"FileType": "NonProduct"
},
{
"Pattern": "mi.dll",
"FileType": "NonProduct"
},
{
"Pattern": "Microsoft.ApplicationInsights.dll",
"FileType": "NonProduct"
@ -787,10 +783,6 @@
"Pattern": "Microsoft.WSMan.Runtime.xml",
"FileType": "NonProduct"
},
{
"Pattern": "miutils.dll",
"FileType": "NonProduct"
},
{
"Pattern": "Modules/*.json",
"FileType": "NonProduct"
@ -2599,6 +2591,10 @@
"Pattern": "System.Private.Uri.dll",
"FileType": "NonProduct"
},
{
"Pattern": "System.Private.Windows.Core.dll",
"FileType": "NonProduct"
},
{
"Pattern": "System.Private.Xml.dll",
"FileType": "NonProduct"

2
tools/packaging/packaging.psm1
View File

@ -16,7 +16,7 @@ $AllDistributions = @()
$AllDistributions += $DebianDistributions
$AllDistributions += $RedhatDistributions
$AllDistributions += 'macOs'
$script:netCoreRuntime = 'net8.0'
$script:netCoreRuntime = 'net9.0'
$script:iconFileName = "Powershell_black_64.png"
$script:iconPath = Join-Path -path $PSScriptRoot -ChildPath "../../assets/$iconFileName" -Resolve

2
tools/packaging/packaging.strings.psd1
View File

@ -166,7 +166,7 @@ open {0}
<files include="**/*" buildAction="None" copyToOutput="true" flatten="false" />
</contentFiles>
<dependencies>
<group targetFramework="net8.0"></group>
<group targetFramework="net9.0"></group>
</dependencies>
</metadata>
</package>

2
tools/packaging/projects/nuget/package.csproj
View File

@ -11,6 +11,6 @@
<NuspecProperties>runtime=$(RID);version=$(SemVer);PackageName=$(PackageName)</NuspecProperties>
<NuspecBasePath>$(StagingPath)</NuspecBasePath>
<IsTool>True</IsTool>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
</Project>

4
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@ -14,7 +14,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.1" />
</ItemGroup>
</Project>

2
tools/packaging/projects/reference/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>

4
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
@ -9,6 +9,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
</ItemGroup>
</Project>

12
tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml
View File

@ -57,13 +57,13 @@ steps:
Start-PSBuild -Clean -Runtime linux-x64 -Configuration Release
$sharedModules | Foreach-Object {
$refFile = Get-ChildItem -Path "$env:REPOROOT\src\$_\obj\Release\net8.0\refint\$_.dll"
$refFile = Get-ChildItem -Path "$env:REPOROOT\src\$_\obj\Release\net9.0\refint\$_.dll"
Write-Verbose -Verbose "RefAssembly: $refFile"
Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
$refDoc = "$env:REPOROOT\src\$_\bin\Release\net8.0\$_.xml"
$refDoc = "$env:REPOROOT\src\$_\bin\Release\net9.0\$_.xml"
if (-not (Test-Path $refDoc)) {
Write-Warning "$refDoc not found"
Get-ChildItem -Path "$env:REPOROOT\src\$_\bin\Release\net8.0\" | Out-String | Write-Verbose -Verbose
Get-ChildItem -Path "$env:REPOROOT\src\$_\bin\Release\net9.0\" | Out-String | Write-Verbose -Verbose
}
else {
Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose
@ -73,13 +73,13 @@ steps:
Start-PSBuild -Clean -Runtime win7-x64 -Configuration Release
$winOnlyModules | Foreach-Object {
$refFile = Get-ChildItem -Path "$env:REPOROOT\src\$_\obj\Release\net8.0\refint\*.dll"
$refFile = Get-ChildItem -Path "$env:REPOROOT\src\$_\obj\Release\net9.0\refint\*.dll"
Write-Verbose -Verbose 'RefAssembly: $refFile'
Copy-Item -Path $refFile -Destination "$refAssemblyFolder\$_.dll" -Verbose
$refDoc = "$env:REPOROOT\src\$_\bin\Release\net8.0\$_.xml"
$refDoc = "$env:REPOROOT\src\$_\bin\Release\net9.0\$_.xml"
if (-not (Test-Path $refDoc)) {
Write-Warning "$refDoc not found"
Get-ChildItem -Path "$env:REPOROOT\src\$_\bin\Release\net8.0" | Out-String | Write-Verbose -Verbose
Get-ChildItem -Path "$env:REPOROOT\src\$_\bin\Release\net9.0" | Out-String | Write-Verbose -Verbose
}
else {
Copy-Item -Path $refDoc -Destination "$refAssemblyFolder\$_.xml" -Verbose

2
tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
View File

@ -107,7 +107,7 @@ jobs:
$localLocation = "$(Pipeline.Workspace)/releasePipeline/finalResults"
$xmlElement = @"
<add key=`"local`" value=`"$localLocation`" />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v2" />
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v2" />
</packageSources>
"@