Added .NET 9 to test matrix (#848)

Romfos · web-flow · commit d5decbfd74f6 · 2024-12-01T00:00:48.000+11:00
* Added .NET 9 to test matrix

* Update changelog
diff --git a/.github/workflows/release_documentation.yml b/.github/workflows/release_documentation.yml
@@ -12,8 +12,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: |
-            8.0.x
+          dotnet-version: 9.0.x
 
       - name: Setup Ruby for documentation build
         uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/release_packages.yml b/.github/workflows/release_packages.yml
@@ -12,8 +12,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: |
-            8.0.x
+          dotnet-version: 9.0.x
 
       - name: Build package
         run: dotnet pack src/NSubstitute/NSubstitute.csproj -p:CI=true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macOS-latest]
-        framework: [net8.0]
+        framework: [net9.0, net8.0]
         include:
           - os: windows-latest
             framework: net462
@@ -24,6 +24,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            9.0.x
             8.0.x
 
       - name: Build
@@ -42,6 +43,7 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            9.0.x
             8.0.x
 
       # used for documentation
@@ -63,7 +65,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Format
         run: dotnet format --verify-no-changes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
 * [UPDATE] Update github actions steps versions
 * [UPDATE] Remove legacy obsolete API
 * [UPDATE] Mark as obsolete api CompatArg with pre c# 7.0 support
-
+* [NEW] Added .NET 9 to test matrix
 
 ### 5.3.0 (October 2024)
 
diff --git a/build/build.fs b/build/build.fs
@@ -1,7 +1,6 @@
 open System
 open System.Diagnostics
 open System.IO
-open System.Text.RegularExpressions
 
 open Fake.Core
 open Fake.Core.TargetOperators
@@ -17,7 +16,7 @@ let description = Target.description
 
 module FileReaderWriter =
     let Read file = File.ReadAllText(file)
-    let Write file text = File.WriteAllText(file, text)
+    let Write file (text: string) = File.WriteAllText(file, text)
     let TransformFile file target (f : string -> string) =
         Read file
         |> f
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <OutputPath>buildOutput</OutputPath>
   </PropertyGroup>
@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="17.9.5" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.9.5" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.374" />
+    <PackageReference Include="Microsoft.Build" Version="17.12.6" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.386" />
     <PackageReference Include="Fake.DotNet.Cli" Version="6.1.3" />
     <PackageReference Include="Fake.Core.Target" Version="6.1.3" />
   </ItemGroup>
diff --git a/src/NSubstitute/Core/ThreadLocalContext.cs b/src/NSubstitute/Core/ThreadLocalContext.cs
@@ -19,7 +19,7 @@ public class ThreadLocalContext : IThreadLocalContext
     public ThreadLocalContext()
     {
         _lastCallRouter = new RobustThreadLocal<ICallRouter?>();
-        _argumentSpecifications = new RobustThreadLocal<IList<IArgumentSpecification>>(() => new List<IArgumentSpecification>());
+        _argumentSpecifications = new RobustThreadLocal<IList<IArgumentSpecification>>(() => []);
         _getArgumentsForRaisingEvent = new RobustThreadLocal<Func<ICall, object?[]>?>();
         _currentQuery = new RobustThreadLocal<IQuery?>();
         _pendingSpecificationInfo = new RobustThreadLocal<PendingSpecInfoData>();
@@ -102,7 +102,7 @@ public IList<IArgumentSpecification> DequeueAllArgumentSpecifications()
         }
         else
         {
-            _argumentSpecifications.Value = new List<IArgumentSpecification>();
+            _argumentSpecifications.Value = [];
         }
 
         return queue;
diff --git a/tests/NSubstitute.Acceptance.Specs/FormattingCallsWhenThrowingReceivedCallsExceptions.cs b/tests/NSubstitute.Acceptance.Specs/FormattingCallsWhenThrowingReceivedCallsExceptions.cs
@@ -21,8 +21,8 @@ public class When_no_calls_are_made_to_the_expected_member : Context
     {
         protected override void ConfigureContext()
         {
-            Sample.AnotherMethod(new List<string>());
-            Sample.AnotherMethod(new List<string>());
+            Sample.AnotherMethod([]);
+            Sample.AnotherMethod([]);
         }
 
         protected override void ExpectedCall()
@@ -67,12 +67,12 @@ public void Should_report_non_matching_calls()
 
     public class When_calls_have_been_made_to_expected_member_but_with_some_different_args : Context
     {
-        readonly IList<string> _strings = new List<string> { "a", "b" };
+        readonly IList<string> _strings = ["a", "b"];
 
         protected override void ConfigureContext()
         {
-            Sample.SampleMethod("different", 1, new List<string>());
-            Sample.SampleMethod("string", 7, new List<string>());
+            Sample.SampleMethod("different", 1, []);
+            Sample.SampleMethod("string", 7, []);
         }
 
         protected override void ExpectedCall()
diff --git a/tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj b/tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net462</TargetFrameworks>
+    <TargetFrameworks>net9.0;net8.0;net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class ThreadLocalContext : IThreadLocalContext`
`19`	`19`	`public ThreadLocalContext()`
`20`	`20`	`{`
`21`	`21`	`_lastCallRouter = new RobustThreadLocal<ICallRouter?>();`
`22`		`- _argumentSpecifications = new RobustThreadLocal<IList<IArgumentSpecification>>(() => new List<IArgumentSpecification>());`
	`22`	`+ _argumentSpecifications = new RobustThreadLocal<IList<IArgumentSpecification>>(() => []);`
`23`	`23`	`_getArgumentsForRaisingEvent = new RobustThreadLocal<Func<ICall, object?[]>?>();`
`24`	`24`	`_currentQuery = new RobustThreadLocal<IQuery?>();`
`25`	`25`	`_pendingSpecificationInfo = new RobustThreadLocal<PendingSpecInfoData>();`
`@@ -102,7 +102,7 @@ public IList<IArgumentSpecification> DequeueAllArgumentSpecifications()`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
`105`		`- _argumentSpecifications.Value = new List<IArgumentSpecification>();`
	`105`	`+ _argumentSpecifications.Value = [];`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`return queue;`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public class When_no_calls_are_made_to_the_expected_member : Context`
`21`	`21`	`{`
`22`	`22`	`protected override void ConfigureContext()`
`23`	`23`	`{`
`24`		`- Sample.AnotherMethod(new List<string>());`
`25`		`- Sample.AnotherMethod(new List<string>());`
	`24`	`+ Sample.AnotherMethod([]);`
	`25`	`+ Sample.AnotherMethod([]);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`protected override void ExpectedCall()`
`@@ -67,12 +67,12 @@ public void Should_report_non_matching_calls()`
`67`	`67`
`68`	`68`	`public class When_calls_have_been_made_to_expected_member_but_with_some_different_args : Context`
`69`	`69`	`{`
`70`		`- readonly IList<string> _strings = new List<string> { "a", "b" };`
	`70`	`+ readonly IList<string> _strings = ["a", "b"];`
`71`	`71`
`72`	`72`	`protected override void ConfigureContext()`
`73`	`73`	`{`
`74`		`- Sample.SampleMethod("different", 1, new List<string>());`
`75`		`- Sample.SampleMethod("string", 7, new List<string>());`
	`74`	`+ Sample.SampleMethod("different", 1, []);`
	`75`	`+ Sample.SampleMethod("string", 7, []);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`protected override void ExpectedCall()`