Update to net9.0 (#2)

searchpioneer · Nov 20, 2024 · 50ac7e3 · 50ac7e3
1 parent 0fb1791
commit 50ac7e3
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 24 deletions.
diff --git a/.github/workflows/accuracy_report.yml b/.github/workflows/accuracy_report.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Build Accuracy Report
         run: ./build.sh report ${{ inputs.lingua && '--implementation Lingua' || '' }} ${{ inputs.language_detection && '--implementation LanguageDetection' || '' }} ${{ inputs.ntextcat && '--implementation NTextCat' || '' }} ${{ inputs.compare && '--compare' || '' }}
       - name: Write Summary

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Run Benchmarks
         run: ./build.sh benchmark --filter ${{ inputs.tests }} --exporters GitHub --job Short
       - name: Write Summary

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
 
     - name: Pack
       run: ./build.sh pack

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
   <ItemGroup>
-    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 
   <!-- Test -->
   <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
-    <PackageVersion Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.12" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.14.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
     <PackageVersion Include="LanguageDetection.Ai" Version="1.1.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="NTextCat" Version="0.3.65" />
     <PackageVersion Include="StrongNamer" Version="0.2.5" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
 
   <!-- Build -->
   <ItemGroup>
     <PackageVersion Include="Bullseye" Version="5.0.0" />
-    <PackageVersion Include="Fractions" Version="8.0.3" />
+    <PackageVersion Include="Fractions" Version="8.0.4" />
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="MinVer" Version="5.0.0" />
+    <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1" />
-    <PackageVersion Include="SauceControl.InheritDoc" Version="2.0.1" />
+    <PackageVersion Include="SauceControl.InheritDoc" Version="2.0.2" />
   </ItemGroup>
 </Project>
diff --git a/build/Build/Build.csproj b/build/Build/Build.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
       <OutputType>Exe</OutputType>
       <ImplicitUsings>enable</ImplicitUsings>
       <Nullable>enable</Nullable>

diff --git a/build/Build/Program.cs b/build/Build/Program.cs
@@ -144,9 +144,9 @@
 	Target(Benchmark, () =>
 	{
 		if (targetOptions.Count != 0)
-			Run("dotnet", "run --project tests/Lingua.Benchmarks -c Release " + string.Join(' ', targetOptions));
+			Run("dotnet", "run --project tests/Lingua.Benchmarks --framework net9.0 -c Release " + string.Join(' ', targetOptions));
 		else
-			Run("dotnet", "run --project tests/Lingua.Benchmarks -c Release");
+			Run("dotnet", "run --project tests/Lingua.Benchmarks --framework net9.0 -c Release");
 	});
 
 	Target(CleanReportOutput, () =>

diff --git a/build/Lingua.IO/Lingua.IO.csproj b/build/Lingua.IO/Lingua.IO.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Generates training and test data language model files</Description>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <!-- Needs to be signed for InternalsVisibleTo -->

diff --git a/build/Lingua.UnicodeScriptGenerator/Lingua.UnicodeScriptGenerator.csproj b/build/Lingua.UnicodeScriptGenerator/Lingua.UnicodeScriptGenerator.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.100",
     "rollForward": "latestMajor"
   }
 }
diff --git a/src/Lingua/Lingua.csproj b/src/Lingua/Lingua.csproj
@@ -3,7 +3,7 @@
         <PackageId>SearchPioneer.Lingua</PackageId>
         <Title>Lingua</Title>
         <Description>Natural language detection library for .NET, suitable for long and short text alike</Description>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/tests/Lingua.AccuracyReport.Tests/Lingua.AccuracyReport.Tests.csproj b/tests/Lingua.AccuracyReport.Tests/Lingua.AccuracyReport.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <!-- Needs to be signed for InternalsVisibleTo -->
     <SignAssembly>true</SignAssembly>

diff --git a/tests/Lingua.Benchmarks/Lingua.Benchmarks.csproj b/tests/Lingua.Benchmarks/Lingua.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
     </PropertyGroup>
@@ -13,6 +13,8 @@
     <PackageReference Include="NTextCat" />
     <PackageReference Include="StrongNamer" />
     <PackageReference Include="LanguageDetection.Ai" />
+    <PackageReference Include="System.Net.Http" />
+    <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/tests/Lingua.Tests/Lingua.Tests.csproj b/tests/Lingua.Tests/Lingua.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <!-- Needs to be signed for InternalsVisibleTo -->
         <SignAssembly>true</SignAssembly>
@@ -15,7 +15,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
     </ItemGroup>
 
     <ItemGroup>