Add .NET 9 support.

niklaslundberg · Nov 17, 2024 · 8114310 · 8114310
1 parent 505ce26
commit 8114310
Show file tree

Hide file tree

Showing 12 changed files with 374 additions and 858 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,11 +14,10 @@ jobs:
     - uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-            6.0.x
-            7.0.x
+            8.0.x
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
         cache: true
         cache-dependency-path: tests/Arbor.Aesculus.Tests.Integration
     - name: install-tools

diff --git a/Arbor.Aesculus.v3.ncrunchsolution b/Arbor.Aesculus.v3.ncrunchsolution
@@ -1,6 +1,7 @@
 <SolutionConfiguration>
   <Settings>
     <AllowParallelTestExecution>False</AllowParallelTestExecution>
+    <RdiConfigured>True</RdiConfigured>
     <SolutionConfigured>True</SolutionConfigured>
   </Settings>
 </SolutionConfiguration>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "9.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }

diff --git a/src/Arbor.Aesculus.Core/Arbor.Aesculus.Core.csproj b/src/Arbor.Aesculus.Core/Arbor.Aesculus.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Arbor.Aesculus.Core/Arbor.Aesculus.nuspec b/src/Arbor.Aesculus.Core/Arbor.Aesculus.nuspec
@@ -19,7 +19,7 @@
     <iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
-    <copyright>Copyright Niklas Lundberg 2013-2023</copyright>
+    <copyright>Copyright Niklas Lundberg 2013-2024</copyright>
     <dependencies>
 
     </dependencies>
@@ -28,8 +28,7 @@
   </metadata>
   <files>
     <file src="bin\$configuration$\netstandard2.0\Arbor.Aesculus.Core.dll" target="lib\netstandard2.0" />
-    <file src="bin\$configuration$\net6.0\Arbor.Aesculus.Core.dll" target="lib\net6.0" />
-    <file src="bin\$configuration$\net7.0\Arbor.Aesculus.Core.dll" target="lib\net7.0" />
     <file src="bin\$configuration$\net8.0\Arbor.Aesculus.Core.dll" target="lib\net8.0" />
+    <file src="bin\$configuration$\net9.0\Arbor.Aesculus.Core.dll" target="lib\net9.0" />
   </files>
 </package>
diff --git a/src/Arbor.Aesculus.Core/packages.lock.json b/src/Arbor.Aesculus.Core/packages.lock.json
@@ -17,8 +17,7 @@
         "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
       }
     },
-    "net6.0": {},
-    "net7.0": {},
-    "net8.0": {}
+    "net8.0": {},
+    "net9.0": {}
   }
 }
diff --git a/src/Arbor.Aesculus.NCrunch/Arbor.Aesculus.NCrunch.csproj b/src/Arbor.Aesculus.NCrunch/Arbor.Aesculus.NCrunch.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NCrunch.Framework" Version="4.17.0.5" />
+    <PackageReference Include="NCrunch.Framework" Version="5.1.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Arbor.Aesculus.NCrunch/Arbor.Aesculus.NCrunch.nuspec b/src/Arbor.Aesculus.NCrunch/Arbor.Aesculus.NCrunch.nuspec
@@ -23,28 +23,23 @@
     <dependencies>
       <group targetFramework="netstandard2.0">
         <dependency id="Arbor.Aesculus" version="$version$" />
-        <dependency id="NCrunch.Framework" version="[4.17.0,)" />
+        <dependency id="NCrunch.Framework" version="[5.10.0,)" />
       </group>
-      <group targetFramework="net6.0">
-        <dependency id="Arbor.Aesculus" version="$version$" />
-        <dependency id="NCrunch.Framework" version="[4.17.0,)" />
-      </group>
-      <group targetFramework="net7.0">
+      <group targetFramework="net8.0">
         <dependency id="Arbor.Aesculus" version="$version$" />
-        <dependency id="NCrunch.Framework" version="[4.17.0,)" />
+        <dependency id="NCrunch.Framework" version="[5.10.0,)" />
       </group>
-      <group targetFramework="net8.0">
+      <group targetFramework="net9.0">
         <dependency id="Arbor.Aesculus" version="$version$" />
-        <dependency id="NCrunch.Framework" version="[4.17.0,)" />
+        <dependency id="NCrunch.Framework" version="[5.10.0,)" />
       </group>
     </dependencies>
     <references></references>
     <tags></tags>
   </metadata>
   <files>
     <file src="bin\$configuration$\netstandard2.0\Arbor.Aesculus.NCrunch.dll" target="lib\netstandard2.0" />
-    <file src="bin\$configuration$\net6.0\Arbor.Aesculus.NCrunch.dll" target="lib\net6.0" />
-    <file src="bin\$configuration$\net7.0\Arbor.Aesculus.NCrunch.dll" target="lib\net7.0" />
     <file src="bin\$configuration$\net8.0\Arbor.Aesculus.NCrunch.dll" target="lib\net8.0" />
+    <file src="bin\$configuration$\net9.0\Arbor.Aesculus.NCrunch.dll" target="lib\net9.0" />
   </files>
 </package>