skip running tests with NoNet48 category

arturcic · arturcic · commit 22b8be5ee687 · 2020-10-14T18:00:15.000+02:00
skip running tests with NoNet48 category


skip running tests with NoNet48 category


skip running tests with NoNet48 category


skip running tests with NoNet48 category


skip running tests with NoNet48 category


skip running tests with NoNet48 category
diff --git a/build/test.cake b/build/test.cake
@@ -39,11 +39,15 @@ Task("UnitTest")
                     Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitVersionTask.MsBuild]*" }
                 };
 
-                if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion48))
+                if (string.Equals(framework, parameters.FullFxVersion48)) 
                 {
-                    settings.Filter = "TestCategory!=NoMono";
+                    if (IsRunningOnUnix()) {
+                        settings.Filter = "TestCategory!=NoMono";
+                    } else {
+                        settings.Filter = "TestCategory!=NoNet48";
+                    }
                 }
-
+                
                 DotNetCoreTest(project.FullPath, settings, coverletSettings);
             });
         }
diff --git a/src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs b/src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs
@@ -198,8 +198,8 @@ public void NextVersionCanHavePatch()
 
         [Test]
         [MethodImpl(MethodImplOptions.NoInlining)]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CanWriteOutEffectiveConfiguration()
         {
             var config = configProvider.Provide(repoPath);
diff --git a/src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs b/src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs
@@ -21,8 +21,8 @@ public void Setup()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CanSetNextVersion()
         {
             var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
diff --git a/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs
@@ -79,8 +79,8 @@ public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails here when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CacheKeyForWorktree()
         {
             using var fixture = new EmptyRepositoryFixture();
@@ -409,8 +409,8 @@ public void WorkingDirectoryWithoutCommits()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
         {
             using var fixture = new EmptyRepositoryFixture();
@@ -497,8 +497,8 @@ public void GetDotGitDirectoryNoWorktree()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void GetDotGitDirectoryWorktree()
         {
             using var fixture = new EmptyRepositoryFixture();
@@ -528,8 +528,8 @@ public void GetDotGitDirectoryWorktree()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void CalculateVersionFromWorktreeHead()
         {
             // Setup
diff --git a/src/GitVersionCore.Tests/Helpers/TestBase.cs b/src/GitVersionCore.Tests/Helpers/TestBase.cs
@@ -13,6 +13,7 @@ public class TestBase
     {
         protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
         protected const string NoMono = "NoMono";
+        protected const string NoNet48 = "NoNet48";
 
         protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
         {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/WorktreeScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/WorktreeScenarios.cs
@@ -12,8 +12,8 @@ public class WorktreeScenarios : TestBase
     {
 
         [Test]
-        [Category("NoMono")]
-        [Description("LibGit2Sharp fails here when running under Mono")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void UseWorktreeRepositoryForVersion()
         {
             using var fixture = new EmptyRepositoryFixture();
diff --git a/src/GitVersionCore.Tests/VersionCalculation/JsonVersionBuilderTests.cs b/src/GitVersionCore.Tests/VersionCalculation/JsonVersionBuilderTests.cs
@@ -18,8 +18,8 @@ public void Setup()
         }
 
         [Test]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void Json()
         {
             var semanticVersion = new SemanticVersion
diff --git a/src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs b/src/GitVersionCore.Tests/VersionConverters/GitVersionInfoGeneratorTests.cs
@@ -23,8 +23,8 @@ public void Setup()
         [TestCase("cs")]
         [TestCase("fs")]
         [TestCase("vb")]
-        [Category("NoMono")]
-        [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
+        [Category(NoMono)]
+        [Description(NoMonoDescription)]
         public void ShouldCreateFile(string fileExtension)
         {
             var directory = Path.GetTempPath();
diff --git a/src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs b/src/GitVersionTask.Tests/GenerateGitVersionInformationTest.cs
@@ -53,6 +53,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()
         }
 
         [Test]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()
         {
@@ -82,6 +83,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild(
         }
 
         [Test]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
         {
diff --git a/src/GitVersionTask.Tests/GetVersionTaskTests.cs b/src/GitVersionTask.Tests/GetVersionTaskTests.cs
@@ -64,6 +64,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesForBuildServer()
         [TestCase(nameof(VersionVariables.Patch), "4")]
         [TestCase(nameof(VersionVariables.MajorMinorPatch), "1.2.4")]
         [TestCase(nameof(VersionVariables.FullSemVer), "1.2.4+1")]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(string outputProperty, string version)
         {
@@ -87,6 +88,7 @@ public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuild(s
         [TestCase(nameof(VersionVariables.Patch), "1")]
         [TestCase(nameof(VersionVariables.MajorMinorPatch), "1.0.1")]
         [TestCase(nameof(VersionVariables.FullSemVer), "1.0.1+1")]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void GetVersionTaskShouldReturnVersionOutputVariablesWhenRunWithMsBuildInBuildServer(string outputProperty, string version)
         {
diff --git a/src/GitVersionTask.Tests/UpdateAssemblyInfoTaskTest.cs b/src/GitVersionTask.Tests/UpdateAssemblyInfoTaskTest.cs
@@ -44,6 +44,7 @@ public void UpdateAssemblyInfoTaskShouldCreateFileInBuildServer()
         }
 
         [Test]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuild()
         {
@@ -69,6 +70,7 @@ public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuild()
         }
 
         [Test]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void UpdateAssemblyInfoTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()
         {
diff --git a/src/GitVersionTask.Tests/WriteVersionInfoTest.cs b/src/GitVersionTask.Tests/WriteVersionInfoTest.cs
@@ -36,6 +36,7 @@ public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputInBuildServ
         }
 
         [Test]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputWhenRunWithMsBuild()
         {
@@ -55,6 +56,7 @@ public void WriteVersionInfoTaskShouldNotLogOutputVariablesToBuildOutputWhenRunW
         }
 
         [Test]
+        [Category(NoNet48)]
         [Category(NoMono)]
         public void WriteVersionInfoTaskShouldLogOutputVariablesToBuildOutputWhenRunWithMsBuildInBuildServer()
         {

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,15 @@ Task("UnitTest")`
`39`	`39`	`Exclude = new List<string> { "[GitVersion.Tests]", "[GitVersionTask.MsBuild]*" }`
`40`	`40`	`};`
`41`	`41`
`42`		`- if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion48))`
	`42`	`+ if (string.Equals(framework, parameters.FullFxVersion48))`
`43`	`43`	`{`
`44`		`- settings.Filter = "TestCategory!=NoMono";`
	`44`	`+ if (IsRunningOnUnix()) {`
	`45`	`+ settings.Filter = "TestCategory!=NoMono";`
	`46`	`+ } else {`
	`47`	`+ settings.Filter = "TestCategory!=NoNet48";`
	`48`	`+ }`
`45`	`49`	`}`
`46`		`-`
	`50`	`+`
`47`	`51`	`DotNetCoreTest(project.FullPath, settings, coverletSettings);`
`48`	`52`	`});`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public void Setup()`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`[Test]`
`24`		`- [Category("NoMono")]`
`25`		`- [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]`
	`24`	`+ [Category(NoMono)]`
	`25`	`+ [Description(NoMonoDescription)]`
`26`	`26`	`public void CanSetNextVersion()`
`27`	`27`	`{`
`28`	`28`	`var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public void GitPreparerShouldNotFailWhenTargetPathNotInitialized()`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`[Test]`
`82`		`- [Category("NoMono")]`
`83`		`- [Description("LibGit2Sharp fails here when running under Mono")]`
	`82`	`+ [Category(NoMono)]`
	`83`	`+ [Description(NoMonoDescription)]`
`84`	`84`	`public void CacheKeyForWorktree()`
`85`	`85`	`{`
`86`	`86`	`using var fixture = new EmptyRepositoryFixture();`
`@@ -409,8 +409,8 @@ public void WorkingDirectoryWithoutCommits()`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`[Test]`
`412`		`- [Category("NoMono")]`
`413`		`- [Description("LibGit2Sharp fails when running under Mono")]`
	`412`	`+ [Category(NoMono)]`
	`413`	`+ [Description(NoMonoDescription)]`
`414`	`414`	`public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()`
`415`	`415`	`{`
`416`	`416`	`using var fixture = new EmptyRepositoryFixture();`
`@@ -497,8 +497,8 @@ public void GetDotGitDirectoryNoWorktree()`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`[Test]`
`500`		`- [Category("NoMono")]`
`501`		`- [Description("LibGit2Sharp fails when running under Mono")]`
	`500`	`+ [Category(NoMono)]`
	`501`	`+ [Description(NoMonoDescription)]`
`502`	`502`	`public void GetDotGitDirectoryWorktree()`
`503`	`503`	`{`
`504`	`504`	`using var fixture = new EmptyRepositoryFixture();`
`@@ -528,8 +528,8 @@ public void GetDotGitDirectoryWorktree()`
`528`	`528`	`}`
`529`	`529`
`530`	`530`	`[Test]`
`531`		`- [Category("NoMono")]`
`532`		`- [Description("LibGit2Sharp fails when running under Mono")]`
	`531`	`+ [Category(NoMono)]`
	`532`	`+ [Description(NoMonoDescription)]`
`533`	`533`	`public void CalculateVersionFromWorktreeHead()`
`534`	`534`	`{`
`535`	`535`	`// Setup`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public class TestBase`
`13`	`13`	`{`
`14`	`14`	`protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";`
`15`	`15`	`protected const string NoMono = "NoMono";`
	`16`	`+ protected const string NoNet48 = "NoNet48";`
`16`	`17`
`17`	`18`	`protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public class WorktreeScenarios : TestBase`
`12`	`12`	`{`
`13`	`13`
`14`	`14`	`[Test]`
`15`		`- [Category("NoMono")]`
`16`		`- [Description("LibGit2Sharp fails here when running under Mono")]`
	`15`	`+ [Category(NoMono)]`
	`16`	`+ [Description(NoMonoDescription)]`
`17`	`17`	`public void UseWorktreeRepositoryForVersion()`
`18`	`18`	`{`
`19`	`19`	`using var fixture = new EmptyRepositoryFixture();`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public void Setup()`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[Test]`
`21`		`- [Category("NoMono")]`
`22`		`- [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]`
	`21`	`+ [Category(NoMono)]`
	`22`	`+ [Description(NoMonoDescription)]`
`23`	`23`	`public void Json()`
`24`	`24`	`{`
`25`	`25`	`var semanticVersion = new SemanticVersion`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileInBuildServer()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`[Test]`
	`56`	`+ [Category(NoNet48)]`
`56`	`57`	`[Category(NoMono)]`
`57`	`58`	`public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild()`
`58`	`59`	`{`
`@@ -82,6 +83,7 @@ public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuild(`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`[Test]`
	`86`	`+ [Category(NoNet48)]`
`85`	`87`	`[Category(NoMono)]`
`86`	`88`	`public void GenerateGitVersionInformationTaskShouldCreateFileWhenRunWithMsBuildInBuildServer()`
`87`	`89`	`{`