From b38a3fcc02d6b21136bd8c1c4ed66d5ae0cbee0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Sep 2025 07:21:29 +0000 Subject: [PATCH] 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] * Deps * Try upgrading to net9 * Bump tests * Upgrade pipeline * Bump version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com> --- .envrc | 22 ++++ .github/workflows/dotnet.yaml | 6 +- Consumer/Consumer.fsproj | 2 +- Directory.Build.props | 2 +- FailingConsumer/FailingConsumer.fsproj | 2 +- .../WoofWare.NUnitTestRunner.Test.fsproj | 2 +- .../WoofWare.NUnitTestRunner.fsproj | 2 +- WoofWare.NUnitTestRunner/version.json | 2 +- flake.nix | 4 +- nix/deps.json | 103 +++++++++++++++--- 10 files changed, 122 insertions(+), 25 deletions(-) diff --git a/.envrc b/.envrc index 3550a30..e75d028 100644 --- 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 diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index 790ee5d..43f8627 100644 --- 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' diff --git a/Consumer/Consumer.fsproj b/Consumer/Consumer.fsproj index 2342298..e41b6b9 100644 --- a/Consumer/Consumer.fsproj +++ b/Consumer/Consumer.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false true diff --git a/Directory.Build.props b/Directory.Build.props index a149877..d102b4a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -10,7 +10,7 @@ FS3388,FS3559 - + true diff --git a/FailingConsumer/FailingConsumer.fsproj b/FailingConsumer/FailingConsumer.fsproj index cf18b08..cb14ff2 100644 --- a/FailingConsumer/FailingConsumer.fsproj +++ b/FailingConsumer/FailingConsumer.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false true diff --git a/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.Test/WoofWare.NUnitTestRunner.Test.fsproj b/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.Test/WoofWare.NUnitTestRunner.Test.fsproj index e621863..8d9d56d 100644 --- a/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.Test/WoofWare.NUnitTestRunner.Test.fsproj +++ b/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.Test/WoofWare.NUnitTestRunner.Test.fsproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 false true diff --git a/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.fsproj b/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.fsproj index ea40a7d..4cea81c 100644 --- a/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.fsproj +++ b/WoofWare.NUnitTestRunner/WoofWare.NUnitTestRunner.fsproj @@ -2,7 +2,7 @@ Exe - net6.0 + net9.0 Major true true diff --git a/WoofWare.NUnitTestRunner/version.json b/WoofWare.NUnitTestRunner/version.json index 1951af5..9b191de 100644 --- a/WoofWare.NUnitTestRunner/version.json +++ b/WoofWare.NUnitTestRunner/version.json @@ -1,5 +1,5 @@ { - "version": "0.2", + "version": "0.3", "publicReleaseRefSpec": [ "^refs/heads/main$" ], diff --git a/flake.nix b/flake.nix index feb8f0c..6c85ef4 100644 --- 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 { diff --git a/nix/deps.json b/nix/deps.json index 36c5769..e2d0d62 100644 --- a/nix/deps.json +++ b/nix/deps.json @@ -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", @@ -54,26 +59,51 @@ "version": "6.0.36", "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU=" }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.20", + "hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4=" + }, { "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", "version": "6.0.36", "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4=" }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", + "version": "8.0.20", + "hash": "sha256-0nex3AN8BVoda2LgDGLWh0leL1/7rBV8skXr37crYPI=" + }, { "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", "version": "6.0.36", "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY=" }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.20", + "hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE=" + }, { "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", "version": "6.0.36", "hash": "sha256-2seqZcz0JeUjkzh3QcGa9TcJ4LUafpFjTRk+Nm8T6T0=" }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", + "version": "8.0.20", + "hash": "sha256-9Z/RcY2hwVb4W+sJaruvQIPlyb9Xqkgcv6t0GSQRmDE=" + }, { "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", "version": "6.0.36", "hash": "sha256-yxLafxiBKkvfkDggPk0P9YZIHBkDJOsFTO7/V9mEHuU=" }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", + "version": "8.0.20", + "hash": "sha256-7g/PKgz5M30BqIpHoY4r5KjAmst/eeMze+Ksy0HH0I0=" + }, { "pname": "Microsoft.CodeCoverage", "version": "17.14.1", @@ -89,51 +119,106 @@ "version": "6.0.36", "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0=" }, + { + "pname": "Microsoft.NETCore.App.Host.linux-arm64", + "version": "8.0.20", + "hash": "sha256-N0zuC748wi+Offfe7ryhnwqUgYzXhYFhG0LgNktJolY=" + }, { "pname": "Microsoft.NETCore.App.Host.linux-x64", "version": "6.0.36", "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10=" }, + { + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.20", + "hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU=" + }, { "pname": "Microsoft.NETCore.App.Host.osx-arm64", "version": "6.0.36", "hash": "sha256-DaSWwYACJGolEBuMhzDVCj/rQTdDt061xCVi+gyQnuo=" }, + { + "pname": "Microsoft.NETCore.App.Host.osx-arm64", + "version": "8.0.20", + "hash": "sha256-s8XRSsezmdxSo3QSyMTp9ixgY9Mi6hUiWH3i7wjIbzA=" + }, { "pname": "Microsoft.NETCore.App.Host.osx-x64", "version": "6.0.36", "hash": "sha256-FrRny9EI6HKCKQbu6mcLj5w4ooSRrODD4Vj2ZMGnMd4=" }, + { + "pname": "Microsoft.NETCore.App.Host.osx-x64", + "version": "8.0.20", + "hash": "sha256-gRMhTwxva9zSCahzCwWNzRsLhtXtPXuBi72TeSaZ8Uw=" + }, { "pname": "Microsoft.NETCore.App.Ref", "version": "6.0.36", "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8=" }, + { + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.20", + "hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM=" + }, { "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", "version": "6.0.36", "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8=" }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", + "version": "8.0.20", + "hash": "sha256-mWM6g5K63sGC/LevPeV1plNQBUgNpHeKZ9mz98ywo8M=" + }, { "pname": "Microsoft.NETCore.App.Runtime.linux-x64", "version": "6.0.36", "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c=" }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.20", + "hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no=" + }, { "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", "version": "6.0.36", "hash": "sha256-UfLcrL2Gj/OLz0s92Oo+OCJeDpZFAcQLPLiSNND8D5Y=" }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", + "version": "8.0.20", + "hash": "sha256-FrM1AKX+OZIJG7q2SlKq1n9N4sVvqMBNoXRNanB9AI4=" + }, { "pname": "Microsoft.NETCore.App.Runtime.osx-x64", "version": "6.0.36", "hash": "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs=" }, + { + "pname": "Microsoft.NETCore.App.Runtime.osx-x64", + "version": "8.0.20", + "hash": "sha256-HbyucVCFDD3uqVn5XoONKoZBn0TWT2FUw1fOhkkUS+E=" + }, + { + "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 +276,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 +369,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",