Add net9.0 support (#207)

emgarten · Dec 1, 2024 · c93cb1b · c93cb1b
1 parent df1a358
commit c93cb1b
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 16 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 6.3.0
+* Added net9.0 support
+* Updated NuGet.* packages to 6.12.1
+
 ## 6.2.0
 * S3 support for setting an ACL on upload. Feeds using scaleway object storage can now make files public during push.
 

diff --git a/build/common/common.ps1 b/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
     }
 }
 

diff --git a/build/common/common.sh b/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

diff --git a/build/common/common.targets b/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"

diff --git a/build/config.props b/build/config.props
@@ -2,7 +2,7 @@
 
   <!-- Dependency versions -->
   <PropertyGroup>
-    <NuGetPackageVersion>6.9.1</NuGetPackageVersion>
+    <NuGetPackageVersion>6.12.1</NuGetPackageVersion>
     <AzureStorageBlobsVersion>12.20.0</AzureStorageBlobsVersion>
     <JsonVersion>13.0.3</JsonVersion>
     <CommandLineUtilsVersion>2.0.0</CommandLineUtilsVersion>

diff --git a/src/Sleet/Program.cs b/src/Sleet/Program.cs
@@ -76,6 +76,7 @@ public static Task<int> MainCore(string[] args, ILogger log)
 
         private static void Configure()
         {
+#if NET6_0 || NET8_0
             // Set connection limit
             if (!RuntimeEnvironmentHelper.IsMono)
             {
@@ -92,6 +93,7 @@ private static void Configure()
                 SecurityProtocolType.Tls |
                 SecurityProtocolType.Tls11 |
                 SecurityProtocolType.Tls12;
+#endif
         }
     }
 }
diff --git a/src/Sleet/Sleet.csproj b/src/Sleet/Sleet.csproj
@@ -3,7 +3,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(PackSleetDotnetTool)' == 'true' ">
@@ -61,7 +61,7 @@
 
     <Error Condition=" '$(IsXPlat)' != 'true' AND '$(MergedExePathExists)' != 'true' " Text="Missing $(MergedExePath)" />
 
-    <!-- This project packs both the dotnet tool package: Sleet and the exe package: SleetExe. 
+    <!-- This project packs both the dotnet tool package: Sleet and the exe package: SleetExe.
          NuGet pack currently rejects dotnet tool packages with desktop framework TFMs, to get
          around this we pass PackAsTool=true only during the dotnet tool pack, and exclude the
          desktop framework at that time. -->

diff --git a/src/SleetLib/SleetLib.csproj b/src/SleetLib/SleetLib.csproj
@@ -2,7 +2,7 @@
   <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>
@@ -30,6 +30,13 @@
     <PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Vuln fixes -->
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+
   <Import Project="$(BuildCommonDirectory)\common.targets" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/test/Sleet.Integration.Tests/Sleet.Integration.Tests.csproj b/test/Sleet.Integration.Tests/Sleet.Integration.Tests.csproj
@@ -3,22 +3,22 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <TestProject>true</TestProject>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="NuGet.Protocol" Version="$(NuGetPackageVersion)" />
     <PackageReference Include="NuGet.Test.Helpers" Version="$(NuGetTestHelpersVersion)" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Sleet.Test.Common\Sleet.Test.Common.csproj" />
   </ItemGroup>
-  
+
   <Import Project="$(BuildCommonDirectory)\common.targets" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
diff --git a/test/SleetLib.Tests/SleetLib.Tests.csproj b/test/SleetLib.Tests/SleetLib.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -13,11 +13,11 @@
   <ItemGroup>
     <EmbeddedResource Include="compiler\resources\**\*" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\Sleet.Test.Common\Sleet.Test.Common.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Folder Include="compiler\resources\" />
   </ItemGroup>