Merge pull request #812 from sys27/feature/upgrade-dotnet-9

Upgrade to .NET 9.
sys27 · Nov 13, 2024 · b23d942 · b23d942
2 parents a18b260 + 138b86c
commit b23d942
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 27 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -20,29 +20,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'csharp' ]
+        include:
+        - language: csharp
+          build-mode: none
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-
-    - name: Setup .NET Core SDK
-      uses: actions/[email protected]
-      with:
-        dotnet-version: "8.0.x"
-
-    - run: |
-        dotnet restore xFunc.sln
-        dotnet build -c Release xFunc.sln
+        build-mode: ${{ matrix.build-mode }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/CI/azure-pipelines.yml b/CI/azure-pipelines.yml
@@ -23,10 +23,10 @@ jobs:
 
     steps:
     - task: UseDotNet@2
-      displayName: 'Install .NET 8'
+      displayName: 'Install .NET 9'
       inputs:
         packageType: 'sdk'
-        version: '8.0.x'
+        version: '9.0.x'
 
     - task: DotNetCoreCLI@2
       displayName: 'dotnet restore'
@@ -71,7 +71,7 @@ jobs:
 
     - task: PublishPipelineArtifact@1
       inputs:
-        path: xFunc.Maths/bin/Release/net6.0
+        path: xFunc.Maths/bin/Release/net8.0
         artifact: xFunc.Maths
 
     - task: PublishPipelineArtifact@1

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
     <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />

diff --git a/xFunc.Benchmark/Program.cs b/xFunc.Benchmark/Program.cs
@@ -21,8 +21,8 @@ public static void Main(string[] args)
             .Run(args,
                 ManualConfig.Create(DefaultConfig.Instance)
                     .AddJob(Job.MediumRun
-                        .WithToolchain(CsProjCoreToolchain.NetCoreApp80))
+                        .WithToolchain(CsProjCoreToolchain.NetCoreApp90))
                     .AddDiagnoser(MemoryDiagnoser.Default)
                     .StopOnFirstError());
     }
-}
+}
diff --git a/xFunc.Benchmark/xFunc.Benchmark.csproj b/xFunc.Benchmark/xFunc.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -27,4 +27,4 @@
     <ProjectReference Include="..\xFunc.Maths\xFunc.Maths.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/xFunc.Cli/xFunc.Cli.csproj b/xFunc.Cli/xFunc.Cli.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>xfunc</ToolCommandName>    
@@ -63,4 +63,4 @@ https://sys27.github.io/xFunc/articles/breaking-changes.html</PackageReleaseNote
     <None Include="..\README.md" Pack="true" PackagePath="" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/xFunc.Maths/xFunc.Maths.csproj b/xFunc.Maths/xFunc.Maths.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <RootNamespace>xFunc.Maths</RootNamespace>
     <PackageId>xFunc.Maths</PackageId>
@@ -111,4 +111,4 @@ https://sys27.github.io/xFunc/articles/breaking-changes.html</PackageReleaseNote
       <LastGenOutput>Resource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/xFunc.Tests/xFunc.Tests.csproj b/xFunc.Tests/xFunc.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
     <RootNamespace>xFunc.Tests</RootNamespace>
@@ -67,4 +67,4 @@
   <ItemGroup>
     <ProjectReference Include="..\xFunc.Maths\xFunc.Maths.csproj" />
   </ItemGroup>
-</Project>
+</Project>