Rebase v2 on main

.config/dotnet-tools.json

@@ -6,13 +6,22 @@
       "version": "1.10.175",
       "commands": [
         "dotnet-serve"
-      ]
+      ],
+      "rollForward": false
     },
     "docfx": {
-      "version": "2.76.0",
+      "version": "2.78.2",
       "commands": [
         "docfx"
-      ]
+      ],
+      "rollForward": false
+    },
+    "dotnet-dump": {
+      "version": "9.0.553101",
+      "commands": [
+        "dotnet-dump"
+      ],
+      "rollForward": false
     }
   }
 }

.devcontainer/devcontainer.json

@@ -3,11 +3,11 @@
 {
 	"name": "Full",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/dotnet/sdk:9.0-preview",
+	"image": "mcr.microsoft.com/dotnet/sdk:9.0",
 	"features": {
 		"ghcr.io/devcontainers/features/dotnet:2": {
 			"version": "latest",
-			"additionalVersions": "7.0,6.0,5.0,3.1"
+			"additionalVersions": "8.0,7.0,6.0,5.0,3.1"
 		}
 	},
 

.devcontainer/post-install.sh

@@ -1,7 +1,7 @@
 #/bin/bash
 
 # Install docfx (should be aligned with docs-deploy.yml)
-dotnet tool install --global docfx --version 2.74.1
+dotnet tool restore
 
 # Trust dotnet developer certs
 dotnet dev-certs https --check --trust

.editorconfig

@@ -453,6 +453,7 @@ dotnet_diagnostic.S112.severity = none # S112: General exceptions should never b
 dotnet_diagnostic.S1075.severity = suggestion # S1075: URIs should not be hardcoded
 dotnet_diagnostic.S1186.severity = suggestion # S1186: Methods should not be empty
 dotnet_diagnostic.S2292.severity = suggestion # S2292: Trivial properties should be auto-implemented
+dotnet_diagnostic.S3267.severity = suggestion # S3267: Convert foreach loop to LINQ query
 dotnet_diagnostic.S4158.severity = none # BUGGY with C#9 code - doesnt understand local methods
 
 # Razor specific rules

.github/workflows/ci.yml

@@ -53,6 +53,7 @@ jobs:
 
     - name: ⚙️ Setup GIT versioning
       uses: dotnet/[email protected]
+      id: nbgv
       with:
         setAllVars: true
 
@@ -68,7 +69,7 @@ jobs:
       with:
         files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]'
       env:
-        RELEASE_VERSION: ${{ env.NBGV_SimpleVersion }}${{ env.NBGV_PrereleaseVersion }}
+        RELEASE_VERSION: ${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }}
         RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }}
 
     # Create the NuGet package in the folder from the environment variable NuGetDirectory
@@ -136,29 +137,37 @@ jobs:
             8.0.x
             9.0.x
 
+      - name: ⚙️ Restore packages and tools
+        run: |
+          dotnet restore
+          dotnet tool restore
+
       - name: 🧪 Run unit tests
-        run: dotnet test -c release -p:VSTestUseMSBuildOutput=false
+        run: dotnet test -c release --no-restore
 
       - name: 📛 Upload hang- and crash-dumps on test failure
-        if: failure()
-        uses: actions/upload-artifact@v3
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: ignore
           name: test-dumps
           path: |
-            **/*hangdump.dmp
-            **/*crashdump.dmp
+            **/*.dmp
+            **/*.dmp
 
-  validate_template:
+  validate-template:
     runs-on: ubuntu-latest
     needs: [ create-nuget ]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Get all history to allow automatic versioning using MinVer
 
-      - name: Setup .NET
+      - name: ⚙️ Setup dotnet
         uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            9.0.x
 
       - uses: actions/download-artifact@v4
         with:
@@ -178,20 +187,23 @@ jobs:
         run: |
           dotnet new bunit --no-restore -o ${{ github.workspace }}/TemplateTestXunit
           echo '<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"></Project>' >> ${{ github.workspace }}/TemplateTestXunit/Directory.Build.props
+          echo '<Project><PropertyGroup><ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally></PropertyGroup></Project>' >> ${{ github.workspace }}/TemplateTestXunit/Directory.Packages.props
           dotnet restore ${{ github.workspace }}/TemplateTestXunit --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }}
           dotnet test ${{ github.workspace }}/TemplateTestXunit
 
       - name: ✔ Verify NUnit template
         run: |
           dotnet new bunit --framework nunit --no-restore -o ${{ github.workspace }}/TemplateTestNunit
           echo '<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"></Project>' >> ${{ github.workspace }}/TemplateTestNunit/Directory.Build.props
+          echo '<Project><PropertyGroup><ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally></PropertyGroup></Project>' >> ${{ github.workspace }}/TemplateTestNunit/Directory.Packages.props
           dotnet restore ${{ github.workspace }}/TemplateTestNunit --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }}
           dotnet test ${{ github.workspace }}/TemplateTestNunit
 
       - name: ✔ Verify MSTest template
         run: |
           dotnet new bunit --framework mstest --no-restore -o ${{ github.workspace }}/TemplateTestMstest
           echo '<?xml version="1.0" encoding="utf-8"?><Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"></Project>' >> ${{ github.workspace }}/TemplateTestMstest/Directory.Build.props
+          echo '<Project><PropertyGroup><ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally></PropertyGroup></Project>' >> ${{ github.workspace }}/TemplateTestMstest/Directory.Packages.props
           dotnet restore ${{ github.workspace }}/TemplateTestMstest --source https://api.nuget.org/v3/index.json --source ${{ env.NUGET_DIRECTORY }}
           dotnet test ${{ github.workspace }}/TemplateTestMstest
 
@@ -216,15 +228,23 @@ jobs:
 
       - name: ⚙️ Setup GIT versioning
         uses: dotnet/[email protected]
+        id: nbgv
         with:
           setAllVars: true
 
+      - name: 🛠️ Get Changelog Entry
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v2
+        with:
+          version: Unreleased
+          path: ./CHANGELOG.md
+
       - name: 🍥 Replace tokens in files
         uses: cschleiden/replace-tokens@v1
         with:
           files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props", "docs/site/docfx.json"]'
         env:
-          RELEASE_VERSION: ${{ env.NBGV_SimpleVersion }}${{ env.NBGV_PrereleaseVersion }}
+          RELEASE_VERSION: ${{ steps.nbgv.outputs.SimpleVersion }}${{ steps.nbgv.outputs.PrereleaseVersion }}
           RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }}
 
       - name: 📄 Build bUnit
@@ -254,7 +274,7 @@ jobs:
   release-preview:
     if: github.event_name == 'workflow_dispatch' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/v2')
     runs-on: ubuntu-latest
-    needs: [ validate-nuget, run-test, validate_template, validate-docs ]
+    needs: [ validate-nuget, run-test, validate-template, validate-docs ]
     steps:
       - uses: actions/download-artifact@v4
         with:

.github/workflows/docs-deploy.yml

@@ -51,6 +51,7 @@ jobs:
 
       - name: ⚙️ Setup GIT versioning
         uses: dotnet/[email protected]
+        id: nbgv
         with:
           setAllVars: true
 
@@ -60,10 +61,10 @@ jobs:
         with:
           path: ./CHANGELOG.md
 
-      - name: 🛠️ Update tokens in project files
+      - name: 🛠️ Update tokens in files
         uses: cschleiden/replace-tokens@v1
         with:
-          files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]'
+          files: '["docs/site/*.md", "docs/**/*.md", "docs/**/docfx.json", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]'
         env:
           RELEASE_VERSION: ${{ steps.changelog_reader.outputs.version }}
           RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }}
@@ -123,9 +124,8 @@ jobs:
       - name: ⏭ Create pull request from stable to main when direct merge fails
         if: steps.mergeMainline.outcome == 'failure'
         uses: thomaseizinger/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
+          github_token: ${{ secrets.BUNIT_BOT_TOKEN }}
           head: stable
           base: main
           title: Update main with documentation in stable

.github/workflows/prepare-release.yml

@@ -28,6 +28,12 @@ jobs:
           version: Unreleased
           path: ./CHANGELOG.md
 
+      - name: ⚙️ Setup GIT versioning
+        uses: dotnet/[email protected]
+        id: nbgv
+        with:
+          setAllVars: true
+
       - name: ☑ Check that release contains changes
         if: steps.changelog_reader.outputs.changes == ''
         run: |
@@ -85,12 +91,11 @@ jobs:
 
       - name: ⏭ Create pull request for release branch
         uses: thomaseizinger/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
-          head: release/v${{ env.NBGV_MajorMinorVersion }}
+          github_token: ${{ secrets.BUNIT_BOT_TOKEN }}
+          head: release/v${{ steps.nbgv.outputs.MajorMinorVersion }}
           base: stable
-          title: Release of new ${{ github.event.inputs.versionIncrement }} version v${{ env.NBGV_MajorMinorVersion }}
+          title: Release of new ${{ github.event.inputs.versionIncrement }} version v${{ steps.nbgv.outputs.MajorMinorVersion }}
           body: |
             This PR was created in response to a manual trigger of the [prepare-release workflow](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
 

.github/workflows/rebase-v2-on-main.yml

@@ -48,9 +48,8 @@ jobs:
       - name: ⏭ Create pull request
         if: steps.rebaseV2.outcome == 'failure'
         uses: thomaseizinger/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
+          github_token: ${{ secrets.BUNIT_BOT_TOKEN }}
           head: main
           base: v2
           title: Rebase v2 on main

.github/workflows/release.yml

@@ -50,6 +50,7 @@ jobs:
 
       - name: ⚙️ Setup GIT versioning
         uses: dotnet/[email protected]
+        id: nbgv
         with:
           setAllVars: true
 
@@ -65,9 +66,9 @@ jobs:
             9.0.x
 
       - name: 🛠️ Update changelog
-        uses: thomaseizinger/keep-a-changelog-new-release@3.0.0
+        uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
         with:
-          version: ${{ env.NBGV_SemVer2 }}
+          version: ${{ steps.nbgv.outputs.SemVer2 }}
 
       - name: 🛠️ Update changelog compare URLs
         shell: bash
@@ -78,30 +79,31 @@ jobs:
       - name: 🛠️ Commit CHANGELOG.md to stable branch
         run: |
           git add CHANGELOG.md
-          git commit -S -m "Updated CHANGELOG.md for ${{ env.NBGV_SimpleVersion }} release"
+          git commit -S -m "Updated CHANGELOG.md for ${{ steps.nbgv.outputs.SimpleVersion }} release"
           echo "RELEASE_COMMIT_HASH=$(git rev-parse stable)" >> $GITHUB_ENV
 
       - name: 🛠️ Get Changelog Entry
         id: changelog_reader
         uses: mindsers/changelog-reader-action@v2
         with:
-          version: ${{ env.NBGV_SemVer2 }}
+          version: ${{ steps.nbgv.outputs.SemVer2 }}
           path: ./CHANGELOG.md
 
       - name: 🛠️ Update tokens in project files
         uses: cschleiden/replace-tokens@v1
         with:
           files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj", "src/Directory.Build.props"]'
         env:
-          RELEASE_VERSION: ${{ env.NBGV_NuGetPackageVersion }}
+          RELEASE_VERSION: ${{ steps.nbgv.outputs.NuGetPackageVersion }}
           RELEASE_NOTES: ${{ steps.changelog_reader.outputs.changes }}
 
       - name: 🛠️ Packing library in release mode
         run: |
           dotnet pack src/bunit/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
           dotnet pack src/bunit.core/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
           dotnet pack src/bunit.web/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
-          dotnet pack src/bunit.template/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
+          dotnet pack src/bunit.generators/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
+          dotnet pack src/bunit.web.query/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
 
       - name: 🛠️ Upload library to NuGet.org repository
         run: |
@@ -111,16 +113,15 @@ jobs:
         run: git push origin stable
 
       - name: 🛠️ Create GitHub release
-        uses: thomaseizinger/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: thomaseizinger/[email protected]
         with:
-          tag_name: v${{ env.NBGV_SemVer2 }}
+          tag_name: v${{ steps.nbgv.outputs.SemVer2 }}
           target_commitish: ${{ env.RELEASE_COMMIT_HASH }}
-          name: ${{ env.NBGV_SemVer2 }}
+          name: ${{ steps.nbgv.outputs.SemVer2 }}
           body: ${{ steps.changelog_reader.outputs.changes }}
           draft: false
-          prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
+          prerelease: ${{ steps.nbgv.outputs.PublicRelease == 'False' }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: ⏩ Merge stable with main, push to origin
         id: mergeMainline
@@ -133,12 +134,11 @@ jobs:
       - name: ⏭ Create pull request from stable to main when direct merge fails
         if: steps.mergeMainline.outcome == 'failure'
         uses: thomaseizinger/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
+          github_token: ${{ secrets.BUNIT_BOT_TOKEN }}
           head: stable
           base: main
-          title: Update main with changes in stable after v${{ env.NBGV_SemVer2 }} release
+          title: Update main with changes in stable after v${{ steps.nbgv.outputs.SemVer2 }} release
           reviewers: ${{ github.actor }} # By default, we request a review from the person who triggered the workflow.
           body: |
             Hi @${{ github.actor }}

.vscode/tasks.json

@@ -6,12 +6,12 @@
         {
             "label": "Serve Docs (Without Build)",
             "type": "shell",
-            "command": "docfx metadata docs/site/docfx.json && docfx docs/site/docfx.json --serve"
+            "command": "dotnet docfx metadata docs/site/docfx.json && dotnet docfx docs/site/docfx.json --serve"
         },
         {
             "label": "Serve Docs (With Build for API Documentation)",
             "type": "shell",
-            "command": "dotnet build -c Release && docfx metadata docs/site/docfx.json && docfx docs/site/docfx.json --serve"
+            "command": "dotnet build -c Release && dotnet docfx metadata docs/site/docfx.json && docfx docs/site/docfx.json --serve"
         },
         {
             "label": "Run all tests (Release Mode)",