wip

Author: arturcic

.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

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"
+    }
 }

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

@@ -1,19 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <!-- Enable the NUnit runner, this is an opt-in feature -->
-        <EnableNUnitRunner>true</EnableNUnitRunner>
-        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
-
-        <!--
-          Displays error on console in addition to the log file. Note that this feature comes with a performance impact.
-          For more information, visit https://learn.microsoft.com/dotnet/core/testing/microsoft-testing-platform-integration-dotnet-test#show-failure-per-test
-          -->
-        <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
-
         <OutputType>Exe</OutputType>
         <RootNamespace>GitVersion.Cli.Generator.Tests</RootNamespace>
         <IsPackable>false</IsPackable>
+
+        <EnableNUnitRunner>true</EnableNUnitRunner>
     </PropertyGroup>
 
     <ItemGroup>

src/Directory.Build.props

@@ -34,13 +34,18 @@
 
         <IsUnitTestProject>false</IsUnitTestProject>
         <DisableApiAnalyzers>false</DisableApiAnalyzers>
-        <IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.EndsWith('.Testing'))">true</IsUnitTestProject>
+        <IsUnitTestProject Condition="$(MSBuildProjectName.EndsWith('.Tests'))">true</IsUnitTestProject>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
+    <PropertyGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
+        <OutputType>Exe</OutputType>
+        <EnableNUnitRunner>true</EnableNUnitRunner>
+    </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Roslynator.Analyzers">
             <PrivateAssets>all</PrivateAssets>
@@ -51,7 +56,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
-    <ItemGroup Condition=" '$(IsUnitTestProject)' == 'false' and $(MSBuildProjectName.EndsWith('.Schema')) == 'false' and '$(DisableApiAnalyzers)' == 'false'">
+    <ItemGroup Condition=" '$(DisableApiAnalyzers)' == 'false' and '$(IsUnitTestProject)' == 'false' and $(MSBuildProjectName.EndsWith('.Schema')) == 'false' and $(MSBuildProjectName.EndsWith('.Testing')) == 'false' ">
         <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -64,7 +69,7 @@
 
         <PackageReference Include="NUnit" />
         <PackageReference Include="NUnit3TestAdapter" />
-        <PackageReference Include="JunitXml.TestLogger" />
+<!--        <PackageReference Include="JunitXml.TestLogger" />-->
         <PackageReference Include="Shouldly" />
 
         <PackageReference Include="coverlet.msbuild">
@@ -77,13 +82,13 @@
         </PackageReference>
 
     </ItemGroup>
-    <ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' and $(MSBuildProjectName.EndsWith('.Tests'))">
+    <ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
         <ProjectReference Include="..\GitVersion.Testing\GitVersion.Testing.csproj" />
 
-        <Using Include="GitVersion.Testing" />
         <Using Include="NSubstitute" />
         <Using Include="NUnit.Framework" />
         <Using Include="Shouldly" />
+        <Using Include="GitVersion.Testing" />
     </ItemGroup>
 
     <ItemGroup>

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)

src/GitVersion.Testing/GitVersion.Testing.csproj

@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
+        <OutputType>Library</OutputType>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp" />
+        <PackageReference Include="Shouldly" />
         <PackageReference Include="System.IO.Abstractions" />
         <PackageReference Include="System.Reflection.Metadata" />
     </ItemGroup>