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 to .NET 9 Preview 1 (#21229)

Browse Source
This commit is contained in:
Aditya Patwardhan
2024-02-16 03:15:11 +00:00
committed by GitHub
parent 71035543e7
commit a145f47787
30 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/findMissingNotices.ps1
+2 -2
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
tools/packaging/boms/windows.json
+8 -12
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"
tools/packaging/packaging.psm1
+1 -1
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
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="net8.0"></group>
<group targetFramework="net9.0"></group>
</dependencies>
</metadata>
</package>
tools/packaging/projects/nuget/package.csproj
+1 -1
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>
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+2 -2
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>
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>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Version>$(RefAsmVersion)</Version>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(SnkFile)</AssemblyOriginatorKeyFile>
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
+2 -2
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>
tools/releaseBuild/azureDevOps/templates/nuget-pkg-sbom.yml
+6 -6
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
tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+1 -1
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>
"@