Add net9.0 support (#17)

Author: emgarten

ReleaseNotes.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.1.37
+* Update NuGet.* packages to 6.12.1
+* net9.0 support
+
 ## 2.1.36
 * Updated NuGet.* packages to 6.9.1 to address CVE-2024-0057
 

build/common/common.ps1

@@ -24,6 +24,7 @@ Function Install-DotnetCLI {
 
         & $installDotnet -Channel 6.0 -i $CLIRoot
         & $installDotnet -Channel 8.0 -i $CLIRoot
+        & $installDotnet -Channel 9.0 -i $CLIRoot
 
         if (-not (Test-Path $DotnetExe)) {
             Write-Log "Missing $DotnetExe"
@@ -72,7 +73,7 @@ Function Install-NuGetExe {
         $nugetDir = Split-Path $nugetExe
         New-Item -ItemType Directory -Force -Path $nugetDir
 
-        Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.9.1/nuget.exe -OutFile $nugetExe
+        Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v6.12.1/nuget.exe -OutFile $nugetExe
     }
 }
 

build/common/common.sh

@@ -17,6 +17,7 @@ run_standard_tests()
     chmod +x .cli/dotnet-install.sh
     .cli/dotnet-install.sh -i .cli --channel 6.0
     .cli/dotnet-install.sh -i .cli --channel 8.0
+    .cli/dotnet-install.sh -i .cli --channel 9.0
   fi
 
   # Display info

build/common/common.targets

@@ -23,7 +23,7 @@
         <IsDesktop>true</IsDesktop>
       </PropertyGroup>
     </When>
-    <When Condition="$(TargetFramework.Contains('netstandard')) OR $(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('net5')) OR $(TargetFramework.Contains('net6')) OR $(TargetFramework.Contains('net7')) OR $(TargetFramework.Contains('net8'))">
+    <When Condition="$(TargetFramework.Contains('netstandard')) OR $(TargetFramework.Contains('netcoreapp')) OR $(TargetFramework.Contains('net5')) OR $(TargetFramework.Contains('net6')) OR $(TargetFramework.Contains('net7')) OR $(TargetFramework.Contains('net8')) OR $(TargetFramework.Contains('net9'))">
       <PropertyGroup>
         <DefineConstants>$(DefineConstants);IS_CORECLR</DefineConstants>
         <IsCore>true</IsCore>
@@ -69,7 +69,7 @@
   <PropertyGroup Condition=" '$(PackProject)' == 'true' ">
     <IsPackable>true</IsPackable>
     <IncludeSymbols Condition=" '$(IncludeSymbols)' == '' AND '$(DebugType)' != 'embedded' ">true</IncludeSymbols>
-    <SymbolPackageFormat Condition=" '$(IncludeSymbols)' == '' AND '$(DebugType)' != 'embedded' ">snupkg</SymbolPackageFormat> 
+    <SymbolPackageFormat Condition=" '$(IncludeSymbols)' == '' AND '$(DebugType)' != 'embedded' ">snupkg</SymbolPackageFormat>
     <PackageOutputPath>$(NupkgOutputDirectory)</PackageOutputPath>
     <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
@@ -255,7 +255,7 @@
       <ToolEntryPoint Condition=" '$(ToolEntryPoint)' == '' ">$(AssemblyName).dll</ToolEntryPoint>
       <ToolOutputPath>$(PublishOutputDirectory)$(TargetFramework)\DotnetToolSettings.xml</ToolOutputPath>
     </PropertyGroup>
-    
+
     <!-- Run publish -->
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="WriteToolSettingsFile"

build/config.props

@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0">
   <!-- Dependency versions -->
   <PropertyGroup>
-    <NuGetPackageVersion>6.9.1</NuGetPackageVersion>
+    <NuGetPackageVersion>6.12.1</NuGetPackageVersion>
   </PropertyGroup>
 
   <!-- Config -->

src/NuGet.Test.Helpers/NuGet.Test.Helpers.csproj

@@ -1,16 +1,16 @@
 <Project ToolsVersion="15.0">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\build\common\common.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  
+
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackProject>true</PackProject>
     <Shipping>true</Shipping>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackageVersion)" />
   </ItemGroup>

test/NuGet.Test.Helpers.Tests/NuGet.Test.Helpers.Tests.csproj

@@ -3,13 +3,19 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\NuGet.Test.Helpers\NuGet.Test.Helpers.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Vuln fixes -->
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+
   <PropertyGroup>
     <TestProject>true</TestProject>
   </PropertyGroup>