Automated commit (#302 )

Co-authored-by: patrick-conscriptus[bot] <175414948+patrick-conscriptus[bot]@users.noreply.github.com>
Switch to trusted publishing (#301 )
2025-10-06 09:48:40 +00:00 · 2025-10-05 00:47:01 +00:00 · 2025-10-03 09:37:51 +00:00 · 2025-09-30 22:55:29 +01:00 · 2025-09-30 22:49:22 +01:00 · 2025-09-30 07:21:29 +00:00
13 changed files with 78 additions and 37 deletions
--- a/.envrc
+++ b/.envrc
@@ -1 +1,23 @@
 use flake
+DOTNET_PATH=$(readlink "$(which dotnet)")
+SETTINGS_FILE=$(find . -maxdepth 1 -type f -name '*.sln.DotSettings.user')
+MSBUILD=$(realpath "$(find "$(dirname "$DOTNET_PATH")/../share/dotnet/sdk" -maxdepth 2 -type f -name MSBuild.dll)")
+if [ -f "$SETTINGS_FILE" ] ; then
+    xmlstarlet ed --inplace \
+    -N wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" \
+    -N x="http://schemas.microsoft.com/winfx/2006/xaml" \
+    -N s="clr-namespace:System;assembly=mscorlib" \
+    -N ss="urn:shemas-jetbrains-com:settings-storage-xaml" \
+    --update "//s:String[@x:Key='/Default/Environment/Hierarchy/Build/BuildTool/DotNetCliExePath/@EntryValue']" \
+    --value "$(realpath "$(dirname "$DOTNET_PATH")/../share/dotnet/dotnet")" \
+    "$SETTINGS_FILE"
+
+    xmlstarlet ed --inplace \
+    -N wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" \
+    -N x="http://schemas.microsoft.com/winfx/2006/xaml" \
+    -N s="clr-namespace:System;assembly=mscorlib" \
+    -N ss="urn:shemas-jetbrains-com:settings-storage-xaml" \
+    --update "//s:String[@x:Key='/Default/Environment/Hierarchy/Build/BuildTool/CustomBuildToolPath/@EntryValue']" \
+    --value "$MSBUILD" \
+    "$SETTINGS_FILE"
+fi
--- a/.github/workflows/dotnet.yaml
+++ b/.github/workflows/dotnet.yaml
@@ -39,7 +39,7 @@ jobs:
      run: 'nix develop --command dotnet build --no-restore --configuration ${{matrix.config}}'
    - name: Test
      run: |
-          nix develop --command dotnet test --no-build --verbosity normal --configuration ${{matrix.config}} --framework net8.0 --filter 'FullyQualifiedName !~ FailingConsumer'
+          nix develop --command dotnet test --no-build --verbosity normal --configuration ${{matrix.config}} --filter 'FullyQualifiedName !~ FailingConsumer'

  selftest-intended-failures:
    runs-on: ubuntu-latest
@@ -57,7 +57,7 @@ jobs:
    - name: Build
      run: 'nix develop --command dotnet build --no-restore --configuration Release'
    - name: Test using self
-      run: 'nix develop --command dotnet exec ./WoofWare.NUnitTestRunner/bin/Release/net6.0/WoofWare.NUnitTestRunner.dll ./FailingConsumer/bin/Release/net8.0/FailingConsumer.dll --trx TrxOut/out.trx || true'
+      run: 'nix develop --command dotnet exec ./WoofWare.NUnitTestRunner/bin/Release/net9.0/WoofWare.NUnitTestRunner.dll ./FailingConsumer/bin/Release/net9.0/FailingConsumer.dll --trx TrxOut/out.trx || true'
    - name: Munge output
      run: 'nix develop --command xmlstarlet sel -N x="http://microsoft.com/schemas/VisualStudio/TeamTest/2010" -t -m "//x:UnitTestResult" -v "@testName" -o ": " -v ".//x:ErrorInfo/x:Message" -n TrxOut/out.trx > snapshot.txt'
    - name: Check output matches expected
@@ -94,7 +94,7 @@ jobs:
    - name: Build
      run: 'nix develop --command dotnet build --no-restore --configuration Release'
    - name: Test using self
-      run: 'nix develop --command dotnet exec ./WoofWare.NUnitTestRunner/bin/Release/net6.0/WoofWare.NUnitTestRunner.dll ./Consumer/bin/Release/net8.0/Consumer.dll --trx TrxOut/out.trx'
+      run: 'nix develop --command dotnet exec ./WoofWare.NUnitTestRunner/bin/Release/net9.0/WoofWare.NUnitTestRunner.dll ./Consumer/bin/Release/net9.0/Consumer.dll --trx TrxOut/out.trx'
    - name: Parse Trx files
      uses: NasAmin/trx-parser@v0.7.0
      if: always() && github.ref_name != 'main'
@@ -311,11 +311,16 @@ jobs:
      - name: Identify .NET
        id: identify-dotnet
        run: nix develop --command bash -c "echo dotnet=$(which dotnet) >> $GITHUB_OUTPUT"
+      - name: Obtain NuGet key
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: ${{ secrets.NUGET_USER }}
      - name: Publish NuGet package
        uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
        with:
          package-name: WoofWare.NUnitTestRunner.Lib
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
+          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
          nupkg-dir: packed/
          dotnet: ${{ steps.identify-dotnet.outputs.dotnet }}

@@ -343,11 +348,16 @@ jobs:
      - name: Identify .NET
        id: identify-dotnet
        run: nix develop --command bash -c "echo dotnet=$(which dotnet) >> $GITHUB_OUTPUT"
+      - name: Obtain NuGet key
+        uses: NuGet/login@d22cc5f58ff5b88bf9bd452535b4335137e24544
+        id: login
+        with:
+            user: ${{ secrets.NUGET_USER }}
      - name: Publish NuGet package
        uses: G-Research/common-actions/publish-nuget@2b7dc49cb14f3344fbe6019c14a31165e258c059
        with:
          package-name: WoofWare.NUnitTestRunner
-          nuget-key: ${{ secrets.NUGET_API_KEY }}
+          nuget-key: ${{ steps.login.outputs.NUGET_API_KEY }}
          nupkg-dir: packed/
          dotnet: ${{ steps.identify-dotnet.outputs.dotnet }}

--- a/Consumer/Consumer.fsproj
+++ b/Consumer/Consumer.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net9.0</TargetFrameworks>
        <IsPackable>false</IsPackable>
        <IsTestProject>true</IsTestProject>
    </PropertyGroup>
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,7 +10,7 @@
    <WarnOn>FS3388,FS3559</WarnOn>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.8.38-alpha" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" PrivateAssets="all" />
  </ItemGroup>
  <PropertyGroup Condition="'$(GITHUB_ACTION)' != ''">
    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
--- a/FailingConsumer/FailingConsumer.fsproj
+++ b/FailingConsumer/FailingConsumer.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net9.0</TargetFramework>
      <IsPackable>false</IsPackable>
      <IsTestProject>true</IsTestProject>
    </PropertyGroup>
--- a/README.md
+++ b/README.md
@@ -13,3 +13,7 @@ However, we would recommend phrasing some of them differently, for maximum peace

 WoofWare.NUnitTestRunner has *limited* support for parallelism.
 By default, we run tests in parallel, taking half the available processors; we may or may not respect the NUnit parallelism attributes to any given extent that they tell us to be *more* parallel (but we will never incorrectly run tests in parallel).
+
+# Licence
+
+WoofWare.NUnitTestRunner is licensed to you under the MIT licence, a copy of which can be found at [LICENSE](./LICENSE).
--- a/WoofWare.NUnitTestRunner.Lib/WoofWare.NUnitTestRunner.Lib.fsproj
+++ b/WoofWare.NUnitTestRunner.Lib/WoofWare.NUnitTestRunner.Lib.fsproj
@@ -14,7 +14,7 @@
      <PackageId>WoofWare.NUnitTestRunner.Lib</PackageId>
      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
      <WarnOn>FS3559</WarnOn>
-      <WoofWareMyriadPluginVersion>8.0.5</WoofWareMyriadPluginVersion>
+      <WoofWareMyriadPluginVersion>8.1.1</WoofWareMyriadPluginVersion>
    </PropertyGroup>

    <ItemGroup>
--- a/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.Test/WoofWare.NUnitTestRunner.Test.fsproj
+++ b/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.Test/WoofWare.NUnitTestRunner.Test.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
        <IsPackable>false</IsPackable>
        <IsTestProject>true</IsTestProject>
    </PropertyGroup>
--- a/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.fsproj
+++ b/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.fsproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
    <RollForward>Major</RollForward>
    <PackAsTool>true</PackAsTool>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- a/WoofWare.NUnitTestRunner/version.json
+++ b/WoofWare.NUnitTestRunner/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.2",
+  "version": "0.3",
  "publicReleaseRefSpec": [
    "^refs/heads/main$"
  ],
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1758262103,
-        "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=",
+        "lastModified": 1759536663,
+        "narHash": "sha256-hhM8SUI6kQMei5TImFdNQy9EDT8g2hAD161DUtbfAy0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01",
+        "rev": "27ac93958969b5f3dccd654b402599cf3de633ac",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -14,8 +14,8 @@
    flake-utils.lib.eachDefaultSystem (system: let
      pkgs = nixpkgs.legacyPackages.${system};
      pname = "unofficial-nunit-runner";
-      dotnet-sdk = pkgs.dotnetCorePackages.sdk_8_0;
-      dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0;
+      dotnet-sdk = pkgs.dotnetCorePackages.sdk_9_0;
+      dotnet-runtime = pkgs.dotnetCorePackages.runtime_9_0;
      version = "0.1";
      dotnetTool = dllOverride: toolName: toolVersion: hash:
        pkgs.stdenvNoCC.mkDerivation rec {
--- a/nix/deps.json
+++ b/nix/deps.json
@@ -1,8 +1,8 @@
 [
  {
    "pname": "ApiSurface",
-    "version": "5.0.1",
-    "hash": "sha256-0GMXEMFgWbbE2OGxW+6h4zGgQHg+IZy1aI13Dn97xSU="
+    "version": "5.0.2",
+    "hash": "sha256-zcq1H1ccQzsZQf4kolzoOBSbyz07skihgPAvQ9Jri+E="
  },
  {
    "pname": "fantomas",
@@ -29,6 +29,11 @@
    "version": "0.32.1",
    "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
  },
+  {
+    "pname": "FSharp.Core",
+    "version": "4.3.4",
+    "hash": "sha256-styyo+6mJy+yxE0NZG/b1hxkAjPOnJfMgd9zWzCJ5uk="
+  },
  {
    "pname": "FSharp.Core",
    "version": "6.0.1",
@@ -36,8 +41,8 @@
  },
  {
    "pname": "FSharp.Core",
-    "version": "8.0.403",
-    "hash": "sha256-3XSQp7JUOU5T6gvSQXNfBF4t4gaX4J4xushH+cfM9mE="
+    "version": "9.0.303",
+    "hash": "sha256-AxR6wqodeU23KOTgkUfIgbavgbcSuzD4UBP+tiFydgA="
  },
  {
    "pname": "FsUnit",
@@ -129,11 +134,21 @@
    "version": "6.0.36",
    "hash": "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs="
  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
  {
    "pname": "Microsoft.NETCore.Platforms",
    "version": "1.1.1",
    "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
  {
    "pname": "Microsoft.NETCore.Targets",
    "version": "1.1.3",
@@ -191,8 +206,8 @@
  },
  {
    "pname": "Nerdbank.GitVersioning",
-    "version": "3.8.38-alpha",
-    "hash": "sha256-gPMrVbjOZxXoofczF/pn6eVkLhjVSJIyQrLO2oljrDc="
+    "version": "3.8.118",
+    "hash": "sha256-Hmyy0ZKOmwN4zIhI4+MqoN8geZNc1sd033aZJ6APrO8="
  },
  {
    "pname": "Newtonsoft.Json",
@@ -284,21 +299,11 @@
    "version": "4.5.5",
    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
  },
-  {
-    "pname": "System.Memory",
-    "version": "4.6.3",
-    "hash": "sha256-JgeK63WMmumF6L+FH5cwJgYdpqXrSDcgTQwtIgTHKVU="
-  },
  {
    "pname": "System.Private.Uri",
    "version": "4.3.0",
    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
-  },
  {
    "pname": "System.Reflection.Metadata",
    "version": "8.0.0",
@@ -341,13 +346,13 @@
  },
  {
    "pname": "WoofWare.Myriad.Plugins",
-    "version": "8.0.5",
-    "hash": "sha256-IfTT2GM9ktUW5BQoKQGFKK39BAKeziJJnrOIL7Vs19o="
+    "version": "8.1.1",
+    "hash": "sha256-Cx7/+5+qc8lhxb0On/OW58PrabadMfbcNP1TvLZGHrY="
  },
  {
    "pname": "WoofWare.Myriad.Plugins.Attributes",
-    "version": "3.6.12",
-    "hash": "sha256-90uiVtc5exCbkcdS8DgTmlEZZT8/AdrY0QuFzy+FHUo="
+    "version": "3.7.1",
+    "hash": "sha256-Mn0OVvC/AwTYg6+3MCKLkNKGGSdzLfBOaLapxHsUDCw="
  },
  {
    "pname": "WoofWare.PrattParser",
Author	SHA1	Message	Date
patrick-conscriptus[bot]	6ba06b2d6c	Automated commit (#302 ) Co-authored-by: patrick-conscriptus[bot] <175414948+patrick-conscriptus[bot]@users.noreply.github.com>	2025-10-05 00:47:01 +00:00
Patrick Stevens	81aa6832d5	Switch to trusted publishing (#301 )	2025-10-03 09:37:51 +00:00
dependabot[bot]	a20f32de02	Bump WoofWare.Myriad.Plugins from 8.0.5 to 8.1.1 (#297 ) * Bump WoofWare.Myriad.Plugins from 8.0.5 to 8.1.1 --- updated-dependencies: - dependency-name: WoofWare.Myriad.Plugins dependency-version: 8.1.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Deps --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com>	2025-09-30 22:55:29 +01:00
dependabot[bot]	1e53e72d4a	Bump ApiSurface from 5.0.1 to 5.0.2 (#299 ) * Bump ApiSurface from 5.0.1 to 5.0.2 --- updated-dependencies: - dependency-name: ApiSurface dependency-version: 5.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Deps --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com>	2025-09-30 22:49:22 +01:00
dependabot[bot]	b38a3fcc02	Upgrade to net9, bump Nerdbank.GitVersioning from 3.8.38-alpha to 3.8.118 (#300 ) * Bump Nerdbank.GitVersioning from 3.8.38-alpha to 3.8.118 --- updated-dependencies: - dependency-name: Nerdbank.GitVersioning dependency-version: 3.8.118 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Deps * Try upgrading to net9 * Bump tests * Upgrade pipeline * Bump version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com>	2025-09-30 07:21:29 +00:00