From cbaaf7d9866541c5b7d25796fa3714974dd2d9ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 13:27:10 +0000 Subject: [PATCH 1/3] (deps): Bump NUnit3TestAdapter from 5.2.0 to 6.0.0 --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- new-cli/Directory.Packages.props | 2 +- src/Directory.Packages.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props index c2bf08a18f..63ab2c9f2f 100644 --- a/new-cli/Directory.Packages.props +++ b/new-cli/Directory.Packages.props @@ -20,7 +20,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index d51be906a4..6ec75705f5 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -36,7 +36,7 @@ - + From afabca6454885e380a9ce0f693547a2a023ae97e Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Tue, 16 Dec 2025 23:39:26 +0100 Subject: [PATCH 2/3] wip --- .github/workflows/new-cli.yml | 2 +- global.json | 19 +++++++++++-------- .../GitVersion.Cli.Generator.Tests.csproj | 12 ++---------- src/Directory.Build.props | 15 ++++++++++----- .../Core/DynamicRepositoryTests.cs | 1 + .../GitVersion.Testing.csproj | 2 ++ 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.github/workflows/new-cli.yml b/.github/workflows/new-cli.yml index 5fd7034189..ae9ec5d10d 100644 --- a/.github/workflows/new-cli.yml +++ b/.github/workflows/new-cli.yml @@ -53,4 +53,4 @@ jobs: run: dotnet format ./new-cli --exclude ~/.nuget/packages --verify-no-changes - name: Test 'new-cli' solution - run: dotnet test ./new-cli --no-build --verbosity normal + run: dotnet test --solution ./new-cli/GitVersion.slnx --no-build --verbosity normal diff --git a/global.json b/global.json index 87935393fc..e6a9b38454 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,13 @@ { - "projects": [ - "build", - "new-cli", - "src" - ], - "sdk": { - "version": "10.0.101" - } + "projects": [ + "build", + "new-cli", + "src" + ], + "sdk": { + "version": "10.0.101" + }, + "test": { + "runner": "Microsoft.Testing.Platform" + } } diff --git a/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj b/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj index 9478d94c71..7c28fa017a 100644 --- a/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj +++ b/new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj @@ -1,19 +1,11 @@  - - true - true - - - true - Exe GitVersion.Cli.Generator.Tests false + + true diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 504f1ea51b..19fdad8232 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -34,13 +34,18 @@ false false - true + true true + + Exe + true + + all @@ -51,7 +56,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -64,7 +69,7 @@ - + @@ -77,13 +82,13 @@ - + - + diff --git a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs index 03eb85b522..4a14693413 100644 --- a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs +++ b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs @@ -21,6 +21,7 @@ public void TearDown() // Note: use same name twice to see if changing commits works on same (cached) repository [NonParallelizable] + [Explicit] [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "2dc142a4a4df77db61a00d9fb7510b18b3c2c85a", "5.8.2-47")] [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")] public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer) diff --git a/src/GitVersion.Testing/GitVersion.Testing.csproj b/src/GitVersion.Testing/GitVersion.Testing.csproj index 08c0eba912..4a461294b8 100644 --- a/src/GitVersion.Testing/GitVersion.Testing.csproj +++ b/src/GitVersion.Testing/GitVersion.Testing.csproj @@ -1,10 +1,12 @@ + Library false true + From 77fb9c2b23832f36c9e45644f40f581eddcf813f Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Wed, 17 Dec 2025 07:51:12 +0100 Subject: [PATCH 3/3] ww --- src/Directory.Packages.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 6ec75705f5..c3ca348ea7 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -6,7 +6,7 @@ - + @@ -20,11 +20,11 @@ - + - - + + @@ -39,11 +39,11 @@ - - + + - +