Skip to content

Commit 708293e

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #4791 from GitTools/dependabot/nuget/new-cli/NUnit3TestAdapter-6.0.0
(deps): Bump NUnit3TestAdapter from 5.2.0 to 6.1.0
2 parents 6b82f04 + e2bf640 commit 708293e

File tree

10 files changed

+112
-94
lines changed

10 files changed

+112
-94
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ env:
3030
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3131
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
3232
DOTNET_NOLOGO: 1
33+
TESTINGPLATFORM_TELEMETRY_OPTOUT: 1
3334

3435
ENABLED_DIAGNOSTICS: ${{ secrets.ENABLED_DIAGNOSTICS }}
3536

‎.github/workflows/new-cli.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ env:
3131
DOTNET_CLI_TELEMETRY_OPTOUT: 1
3232
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
3333
DOTNET_NOLOGO: 1
34+
TESTINGPLATFORM_TELEMETRY_OPTOUT: 1
3435

3536
jobs:
3637
format:
@@ -53,4 +54,4 @@ jobs:
5354
run: dotnet format ./new-cli --exclude ~/.nuget/packages --verify-no-changes
5455
-
5556
name: Test 'new-cli' solution
56-
run: dotnet test ./new-cli --no-build --verbosity normal
57+
run: dotnet test --solution ./new-cli/GitVersion.slnx --no-build --verbosity normal

‎build/build/Tasks/Test/PublishCoverage.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ public override void Run(BuildContext context)
2929
throw new InvalidOperationException("Could not resolve CodeCov token.");
3030
}
3131

32+
if (coverageFiles.Length == 0)
33+
{
34+
context.Warning("No coverage files found.");
35+
return;
36+
}
37+
3238
context.Codecov(new CodecovSettings
3339
{
3440
Files = coverageFiles,

‎build/build/Tasks/Test/UnitTest.cs‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,21 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
6969
var projectName = $"{project.GetFilenameWithoutExtension()}.net{framework}";
7070
var settings = new DotNetTestSettings
7171
{
72+
PathType = DotNetTestPathType.Project,
7273
Framework = $"net{framework}",
73-
NoBuild = true,
74-
NoRestore = true,
74+
NoBuild = false,
75+
NoRestore = false,
7576
Configuration = context.MsBuildConfiguration,
76-
TestAdapterPath = new(".")
77+
MSBuildSettings = new()
7778
};
79+
settings.MSBuildSettings.SetContinuousIntegrationBuild(false);
7880

7981
var resultsPath = context.MakeAbsolute(testResultsPath.CombineWithFilePath($"{projectName}.results.xml"));
80-
settings.Loggers = [$"junit;LogFilePath={resultsPath}"];
82+
settings.WithArgumentCustomization(args => args
83+
.Append("--report-spekt-junit")
84+
.Append("--report-spekt-junit-filename").AppendQuoted(resultsPath.FullPath)
85+
);
8186

82-
var coverletSettings = new CoverletSettings
83-
{
84-
CollectCoverage = true,
85-
CoverletOutputFormat = CoverletOutputFormat.cobertura,
86-
CoverletOutputDirectory = testResultsPath,
87-
CoverletOutputName = $"{projectName}.coverage.xml",
88-
Exclude = ["[GitVersion*.Tests]*", "[GitTools.Testing]*"]
89-
};
90-
91-
context.DotNetTest(project.FullPath, settings, coverletSettings);
87+
context.DotNetTest(project.FullPath, settings);
9288
}
9389
}

‎global.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
2-
"projects": [
3-
"build",
4-
"new-cli",
5-
"src"
6-
],
7-
"sdk": {
8-
"version": "10.0.102"
9-
}
2+
"projects": [
3+
"build",
4+
"new-cli",
5+
"src"
6+
],
7+
"sdk": {
8+
"version": "10.0.102"
9+
},
10+
"test": {
11+
"runner": "Microsoft.Testing.Platform"
12+
}
1013
}

‎new-cli/Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageVersion>
23-
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
23+
<PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
2424
<PackageVersion Include="Polly" Version="8.6.5" />
2525
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
2626
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.15.0" />

‎new-cli/GitVersion.Cli.Generator.Tests/GitVersion.Cli.Generator.Tests.csproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!-- Enable the NUnit runner, this is an opt-in feature -->
5-
<EnableNUnitRunner>true</EnableNUnitRunner>
6-
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
7-
8-
<!--
9-
Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
10-
For more information, visit https://learn.microsoft.com/dotnet/core/testing/microsoft-testing-platform-integration-dotnet-test#show-failure-per-test
11-
-->
12-
<TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
13-
144
<OutputType>Exe</OutputType>
155
<RootNamespace>GitVersion.Cli.Generator.Tests</RootNamespace>
166
<IsPackable>false</IsPackable>
7+
8+
<EnableNUnitRunner>true</EnableNUnitRunner>
179
</PropertyGroup>
1810

1911
<ItemGroup>

‎src/Directory.Build.props‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,25 @@
3333
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
3434

3535
<IsUnitTestProject>false</IsUnitTestProject>
36-
<IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.EndsWith('.Testing'))">true</IsUnitTestProject>
36+
<IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.Tests'))">true</IsUnitTestProject>
3737

3838
<DisableAnalyzers>false</DisableAnalyzers>
3939
<DisableApiAnalyzers>false</DisableApiAnalyzers>
4040
<DisableApiAnalyzers Condition=" '$(IsUnitTestProject)' == 'true' ">true</DisableApiAnalyzers>
4141
<DisableApiAnalyzers Condition="$(MSBuildProjectName.EndsWith('.Schema')) == 'true'">true</DisableApiAnalyzers>
42+
<DisableApiAnalyzers Condition="$(MSBuildProjectName.EndsWith('.Testing')) == 'true'">true</DisableApiAnalyzers>
43+
</PropertyGroup>
44+
45+
<PropertyGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
46+
<OutputType>Exe</OutputType>
47+
<IsPackable>false</IsPackable>
48+
49+
<EnableNUnitRunner>true</EnableNUnitRunner>
50+
<EnableMicrosoftTestingPlatformRunner>true</EnableMicrosoftTestingPlatformRunner>
51+
52+
<DebugType>full</DebugType>
53+
<Optimize>false</Optimize>
54+
<DebugSymbols>true</DebugSymbols>
4255
</PropertyGroup>
4356

4457
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -61,33 +74,27 @@
6174
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6275
</PackageReference>
6376
</ItemGroup>
64-
<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
77+
<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' or $(MSBuildProjectName.EndsWith('.Testing')) ">
6578
<PackageReference Include="Microsoft.NET.Test.Sdk" />
66-
6779
<PackageReference Include="NSubstitute" />
68-
6980
<PackageReference Include="NUnit" />
7081
<PackageReference Include="NUnit3TestAdapter" />
7182
<PackageReference Include="JunitXml.TestLogger" />
7283
<PackageReference Include="Shouldly" />
7384

74-
<PackageReference Include="coverlet.msbuild">
75-
<PrivateAssets>all</PrivateAssets>
76-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
77-
</PackageReference>
7885
<PackageReference Include="NUnit.Analyzers">
7986
<PrivateAssets>all</PrivateAssets>
8087
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8188
</PackageReference>
8289

8390
</ItemGroup>
84-
<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' and $(MSBuildProjectName.EndsWith('.Tests'))">
91+
<ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
8592
<ProjectReference Include="..\GitVersion.Testing\GitVersion.Testing.csproj" />
8693

87-
<Using Include="GitVersion.Testing" />
8894
<Using Include="NSubstitute" />
8995
<Using Include="NUnit.Framework" />
9096
<Using Include="Shouldly" />
97+
<Using Include="GitVersion.Testing" />
9198
</ItemGroup>
9299

93100
<ItemGroup>

‎src/Directory.Packages.props‎

Lines changed: 61 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,62 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
</PropertyGroup>
5-
<ItemGroup>
6-
<!-- common packages -->
7-
<PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
8-
<PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
9-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
10-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
11-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
12-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
13-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="5.0.0" />
14-
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
15-
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
16-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
17-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
18-
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.3" />
19-
<PackageVersion Include="Polly" Version="8.6.5" />
20-
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
21-
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.15.0" />
22-
<!-- specific packages -->
23-
<PackageVersion Include="Buildalyzer" Version="7.1.0" />
24-
<PackageVersion Include="JsonSchema.Net.Generation" Version="6.0.0" />
25-
<PackageVersion Include="JunitXml.TestLogger" Version="8.0.0" />
26-
<PackageVersion Include="MSBuild.ProjectCreation" Version="16.1.0" />
27-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
28-
<PackageVersion Include="Microsoft.Build" Version="18.0.2" />
29-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.0.2" />
30-
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.2" />
31-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.2" />
32-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
33-
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.2" />
34-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
35-
<PackageVersion Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
36-
<PackageVersion Include="NSubstitute" Version="5.3.0" />
37-
<PackageVersion Include="NUnit" Version="4.4.0" />
38-
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
39-
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
40-
<PackageVersion Include="Shouldly" Version="4.3.0" />
41-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.2" />
42-
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
43-
<PackageVersion Include="System.Formats.Nrbf" Version="10.0.0" />
44-
<PackageVersion Include="System.IO.Abstractions" Version="22.1.0" />
45-
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.2" />
46-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
47-
<PackageVersion Include="System.Text.Json" Version="10.0.2" />
48-
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
49-
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
50-
</ItemGroup>
51-
</Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<!-- common packages -->
7+
<PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
8+
<PackageVersion Include="LibGit2Sharp" Version="0.31.0" />
9+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
11+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
12+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="5.0.0" />
13+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
14+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
15+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
17+
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.3" />
18+
<PackageVersion Include="Polly" Version="8.6.5" />
19+
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
20+
<PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.15.0" />
21+
<!-- specific packages -->
22+
<PackageVersion Include="Buildalyzer" Version="8.0.0" />
23+
<PackageVersion Include="JsonSchema.Net.Generation" Version="6.0.0" />
24+
<PackageVersion Include="JunitXml.TestLogger" Version="8.0.0" />
25+
<PackageVersion Include="MSBuild.ProjectCreation" Version="17.0.1" />
26+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
27+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.2" />
28+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.2" />
29+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
30+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.2" />
31+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
32+
<PackageVersion Include="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21301.5" />
33+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
34+
<PackageVersion Include="NUnit" Version="4.4.0" />
35+
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
36+
<PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
37+
<PackageVersion Include="Shouldly" Version="4.3.0" />
38+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.2" />
39+
<PackageVersion Include="System.Drawing.Common" Version="10.0.0" />
40+
<PackageVersion Include="System.Formats.Nrbf" Version="10.0.0" />
41+
<PackageVersion Include="System.IO.Abstractions" Version="22.1.0" />
42+
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.2" />
43+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.0" />
44+
<PackageVersion Include="System.Text.Json" Version="10.0.2" />
45+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
46+
</ItemGroup>
47+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
48+
<PackageVersion Include="Microsoft.Build" Version="17.11.48" />
49+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
50+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.11.48" />
51+
</ItemGroup>
52+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
53+
<PackageVersion Include="Microsoft.Build" Version="17.14.28" />
54+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
55+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.14.28" />
56+
</ItemGroup>
57+
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
58+
<PackageVersion Include="Microsoft.Build" Version="18.0.2" />
59+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
60+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.0.2" />
61+
</ItemGroup>
62+
</Project>

‎src/GitVersion.Testing/GitVersion.Testing.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3+
<OutputType>Library</OutputType>
34
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
45
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
56
</PropertyGroup>

0 commit comments

Comments
 (0)