Merge branch 'nsubstitute:main' into 766-Argument-Matcher-For-A-Struct

Author: Notallthatevil

.github/dependabot.yml

@@ -9,44 +9,9 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 3
-  - package-ecosystem: "nuget"
-    directory: "/src/NSubstitute"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 3
-    groups:
-      nsubstitute_minor_patch_updates:
-        update-types:
-        - "minor"
-        - "patch"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
-  - package-ecosystem: "nuget"
-    directory: "/tests/NSubstitute.Acceptance.Specs"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 3
-    groups:
-      nsubstitute_acceptance_specs_minor_patch_updates:
-        update-types:
-        - "minor"
-        - "patch"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
+      interval: "weekly"
+
   - package-ecosystem: "nuget"
-    directory: "/tests/NSubstitute.Benchmarks"
+    directory: "/"
     schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 3
-    groups:
-      nsubstitute_benchmarks_minor_patch_updates:
-        update-types:
-        - "minor"
-        - "patch"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
+      interval: "weekly"

.github/workflows/release_documentation.yml

@@ -7,12 +7,13 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
+            10.0.x
             9.0.x
             8.0.x
 
@@ -24,7 +25,7 @@ jobs:
         working-directory: ./docs
 
       - name: Upload documentation
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: docs
           path: |

.github/workflows/release_packages.yml

@@ -7,18 +7,18 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Build package
         run: dotnet pack src/NSubstitute/NSubstitute.csproj -o bin -p:CI=true
 
       - name: Upload packages
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: packages
           path: |

.github/workflows/test.yml

@@ -10,39 +10,46 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macOS-latest]
-        framework: [net9.0, net8.0]
-        include:
-          - os: windows-latest
-            framework: net462
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
+            10.0.x
             9.0.x
             8.0.x
 
       - name: Build
         run: dotnet build
 
-      - name: Test
-        run: dotnet test -f ${{ matrix.framework }} --no-build --no-restore
+      - name: .NET Framework Tests
+        if: matrix.os == 'windows-latest'
+        run: dotnet test -f net462 --no-build --no-restore --no-progress
+
+      - name: .NET 8 Tests
+        run: dotnet test -f net8.0 --no-build --no-restore --no-progress
+
+      - name: .NET 9 Tests
+        run: dotnet test -f net9.0 --no-build --no-restore --no-progress
+
+      - name: .NET 10 Tests
+        run: dotnet test -f net10.0 --no-build --no-restore --no-progress
 
   format-verify:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Format
         run: dotnet format --verify-no-changes

CHANGELOG.md

@@ -13,6 +13,7 @@
 * [NEW] Added NuGet Package README file.
 * [UPDATE] Make public api and tests the same for all TFMs
 * [UPDATE] Migrate documentation samples to NUnit4
+* [NEW] Added .NET 10 to test matrix
 
 ### 5.3.0 (October 2024)
 

docs/help/received-calls/index.md

@@ -31,7 +31,7 @@ public void Should_execute_command() {
 }
 ```
 
-In this case `command` did receive a call to `Execute()`, and so will complete successfully. If `Execute()` has not been received NSubstitute will throw a `ReceivedCallsException` and let you know what call was expected and with which arguments, as well as listing actual calls to that method and which the arguments differed.
+In this case `command` did receive a call to `Execute()`, and so will complete successfully. If `Execute()` has not been received NSubstitute will throw a `ReceivedCallsException` and let you know what call was expected and with which arguments, as well as listing actual calls to that method and which of the arguments differed.
 
 ## Check a call was not received
 NSubstitute can also make sure a call was not received using the `DidNotReceive()` extension method.

docs/help/set-return-value/index.md

@@ -51,4 +51,4 @@ Assert.That("HEX", Is.EqualTo(calculator.Mode));
 
 
 ## More ways of setting return values
-This covers the very basics of setting a return value, but NSubstitute can do much more. Read on for other approachs, including [matching specific arguments](/help/return-for-args), [ignoring arguments](/help/return-for-any-args), using [functions to calculate return values](/help/return-from-function) and returning [multiple results](/help/multiple-returns).
+This covers the very basics of setting a return value, but NSubstitute can do much more. Read on for other approaches, including [matching specific arguments](/help/return-for-args), [ignoring arguments](/help/return-for-any-args), using [functions to calculate return values](/help/return-from-function) and returning [multiple results](/help/multiple-returns).

global.json

@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}

tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj

@@ -1,14 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net462</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net462</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <EnableNUnitRunner>true</EnableNUnitRunner>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
-    <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">

tests/NSubstitute.Benchmarks/NSubstitute.Benchmarks.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.15.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.8" />
   </ItemGroup>
 
   <ItemGroup>