From 5e6660aeee63d5db459ab3eb0526eb32d327e2ed Mon Sep 17 00:00:00 2001 From: Miheichev Aleksandr Sergeevich Date: Mon, 17 Aug 2026 06:33:18 +0000 Subject: [PATCH] chore(deps): update xunit.v3 and NLog, and drop the VSTest packages xunit replaces (#9975) * chore(deps): update xunit.v3 to 4.0.0 and drop the VSTest packages xunit.v3 4.0.0 moves from Microsoft.Testing.Platform v1 to v2, and MTP v2 drops the VSTest bridge on the .NET 10 SDK, so anything routed through VSTest now fails before a single test runs. Rather than bridging back to VSTest, the two VSTest-era packages are removed. The test project is already an executable carrying xunit's own in-process runner, so Microsoft.NET.Test.Sdk and xunit.runner.visualstudio have nothing left to contribute, and without them no opt-in file is needed anywhere. No source or test changes are required: every 4.0.0 breaking change is in the extensibility and runner APIs, and the suite uses only [Fact], [Theory] and [InlineData]. * ci: run the tests directly and let versions float on their major test.yml requested the 8.0.x SDK while every project targets net10.0, which an 8.0 SDK cannot build (NETSDK1045), and it invoked dotnet test, which needs the VSTest bridge that MTP v2 has dropped. It now runs the test executable, which needs no adapter and no test SDK. All three setup-dotnet steps ask for 10.x with quality ga, so a new .NET 10 patch or feature band is picked up automatically while previews and release candidates stay out of builds. setup-dotnet and upload-artifact were the only actions pinned to an exact patch; they now track their major tag like the other seven. * chore(deps): update NLog to 6.2.0 A minor release with no API change on the surface this project uses. Verified beyond compilation: Logging.Setup builds its FileTarget, and both SaveLog overloads write through it at runtime with the expected layout. --- .github/workflows/build-windows-x86.yml | 7 ++++--- .github/workflows/build.yml | 7 ++++--- .github/workflows/test.yml | 7 ++++--- v2rayN/Directory.Packages.props | 6 ++---- v2rayN/ServiceLib.Tests/ServiceLib.Tests.csproj | 5 ----- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-windows-x86.yml b/.github/workflows/build-windows-x86.yml index d2958c08..9e9affd8 100644 --- a/.github/workflows/build-windows-x86.yml +++ b/.github/workflows/build-windows-x86.yml @@ -51,10 +51,11 @@ jobs: echo "After:" dotnet --list-sdks 2>$null; $LASTEXITCODE=0 - - name: Setup .NET 10.0.1xx - uses: actions/setup-dotnet@v6.0.0 + - name: Setup .NET + uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.1xx + dotnet-version: '10.x' + dotnet-quality: 'ga' - name: Publish ${{ matrix.flavor }} win-x86 shell: pwsh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c96c21b..dbe95ddf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,9 +69,10 @@ jobs: dotnet --list-sdks 2>$null; $LASTEXITCODE=0 - name: Setup .NET - uses: actions/setup-dotnet@v6.0.0 + uses: actions/setup-dotnet@v6 with: - dotnet-version: '10.0.1xx' + dotnet-version: '10.x' + dotnet-quality: 'ga' - name: Build v2rayN shell: bash @@ -89,7 +90,7 @@ jobs: find ${{ matrix.arch }} -type f -name '*.pdb' -delete - name: Upload build artifacts - uses: actions/upload-artifact@v7.0.1 + uses: actions/upload-artifact@v7 with: name: ${{ matrix.arch }} path: ${{ matrix.arch }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6a616776..9cb4496c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,10 +20,11 @@ jobs: fetch-depth: '0' - name: Setup .NET - uses: actions/setup-dotnet@v6.0.0 + uses: actions/setup-dotnet@v6 with: - dotnet-version: '8.0.x' + dotnet-version: '10.x' + dotnet-quality: 'ga' - name: Test Code working-directory: ./v2rayN - run: dotnet test ./ServiceLib.Tests + run: dotnet run --project ./ServiceLib.Tests -c Release diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props index ae214b2e..bafc2993 100644 --- a/v2rayN/Directory.Packages.props +++ b/v2rayN/Directory.Packages.props @@ -15,7 +15,6 @@ - @@ -25,13 +24,12 @@ - + - - + diff --git a/v2rayN/ServiceLib.Tests/ServiceLib.Tests.csproj b/v2rayN/ServiceLib.Tests/ServiceLib.Tests.csproj index f86ca573..adefda0d 100644 --- a/v2rayN/ServiceLib.Tests/ServiceLib.Tests.csproj +++ b/v2rayN/ServiceLib.Tests/ServiceLib.Tests.csproj @@ -8,11 +8,6 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive -