Simplify the testing categories

build/Build.TestCalamariFlavourProject.cs

@@ -4,19 +4,56 @@ namespace Calamari.Build;
 
 partial class Build
 {
-    [Parameter(Name = "CalamariFlavour")] readonly string? CalamariFlavourToTest;
-    [Parameter(Name = "VSTest_TestCaseFilter")] readonly string? CalamariFlavourTestCaseFilter;
+    [Parameter(Name = "ProjectToTest")] readonly string? CalamariProjectToTest;
+
+    [PublicAPI]
+    Target LinuxHostTests =>
+        target => target
+            .Executes(async () =>
+                      {
+                          var dotnetPath = await LocateOrInstallDotNetSdk();
+
+                          var project = CalamariProjectToTest ?? "Calamari";
 
+                          var dll = $"TestBinaries/{project}.Tests.dll";
+
+                          CreateTestRun(dll)
+                              .WithDotNetPath(dotnetPath)
+                              .WithFilter("TestCategory != Windows") // Linux is all tests that are non-Windows specific
+                              .Execute();
+                      });
+
     [PublicAPI]
-    Target TestCalamariFlavourProject =>
+    Target WindowsHostTests =>
         target => target
             .Executes(async () =>
                       {
                           var dotnetPath = await LocateOrInstallDotNetSdk();
 
-                          CreateTestRun($"CalamariTests/Calamari.{CalamariFlavourToTest}.Tests.dll")
+                          var project = CalamariProjectToTest ?? "Calamari";
+
+                          var dll = $"TestBinaries/{project}.Tests.dll";
+
+                          CreateTestRun(dll)
+                              .WithDotNetPath(dotnetPath)
+                              .WithFilter("TestCategory != Linux & TestCategory != MacOs & TestCategory != Windows2016OrLater") // Windows is all tests that are non-Linux or MacOS specific and not Win 2016 or later
+                              .Execute();
+                      });
+
+    [PublicAPI]
+    Target Windows2016OrLaterHostTests =>
+        target => target
+            .Executes(async () =>
+                      {
+                          var dotnetPath = await LocateOrInstallDotNetSdk();
+
+                          var project = CalamariProjectToTest ?? "Calamari";
+
+                          var dll = $"TestBinaries/{project}.Tests.dll";
+
+                          CreateTestRun(dll)
                               .WithDotNetPath(dotnetPath)
-                              .WithFilter(CalamariFlavourTestCaseFilter)
+                              .WithFilter("TestCategory = Windows2016OrLater")  // Windows 2016 or later specific tests
                               .Execute();
                       });
 }

source/Calamari.AzureResourceGroup.Tests/AzureResourceGroupActionHandlerFixture.cs

@@ -159,7 +159,7 @@ await CommandTestBuilder.CreateAsync<DeployAzureResourceGroupCommand, Program>()
         }
 
         [Test]
-        [WindowsTest]
+        [TestPlatforms(TestPlatforms.Windows)]
         [RequiresPowerShell5OrAbove]
         public async Task Deploy_Ensure_Tools_Are_Configured()
         {

source/Calamari.AzureResourceGroup.Tests/DeployAzureBicepTemplateCommandFixture.cs

@@ -18,7 +18,9 @@
 namespace Calamari.AzureResourceGroup.Tests
 {
     [TestFixture]
-    [WindowsTest] // NOTE: We should look at having the Azure CLI installed on Linux boxes so that these steps can be tested there, particularly if we're moving cloud to a Ubuntu Default Worker.
+    [Category(TestCategories.Windows2016OrLater)]
+    [RequiresWindowsServer2016OrAbove("This test requires the az cli, which relies on python 3.10, which doesn't run on windows 2012/2012R2")]
+    [TestPlatforms(TestPlatforms.Windows)] // NOTE: We should look at having the Azure CLI installed on Linux boxes so that these steps can be tested there, particularly if we're moving cloud to a Ubuntu Default Worker.
     class DeployAzureBicepTemplateCommandFixture
     {
         string clientId;
@@ -93,7 +95,6 @@ await armClient.GetResourceGroupResource(ResourceGroupResource.CreateResourceIde
         }
 
         [Test]
-        [RequiresWindowsServer2016OrAbove("This test requires the az cli, which relies on python 3.10, which doesn't run on windows 2012/2012R2")]
         public async Task DeployAzureBicepTemplate_PackageSource()
         {
             await CommandTestBuilder.CreateAsync<DeployAzureBicepTemplateCommand, Program>()
@@ -108,7 +109,6 @@ await CommandTestBuilder.CreateAsync<DeployAzureBicepTemplateCommand, Program>()
         }
 
         [Test]
-        [RequiresWindowsServer2016OrAbove("This test requires the az cli, which relies on python 3.10, which doesn't run on windows 2012/2012R2")]
         public async Task DeployAzureBicepTemplate_GitSource()
         {
             // For the purposes of Bicep templates in Calamari, a template in a Git Repository
@@ -127,7 +127,6 @@ await CommandTestBuilder.CreateAsync<DeployAzureBicepTemplateCommand, Program>()
         }
 
         [Test]
-        [RequiresWindowsServer2016OrAbove("This test requires the az cli, which relies on python 3.10, which doesn't run on windows 2012/2012R2")]
         public async Task DeployAzureBicepTemplate_InlineSource()
         {
             var templateFileContent = File.ReadAllText(Path.Combine(packagePath, "azure_website_template.bicep"));

source/Calamari.AzureScripting.Tests/AzurePowershellCommandFixture.cs

@@ -31,7 +31,7 @@ public async Task Setup()
         }
 
         [Test]
-        [WindowsTest]
+        [TestPlatforms(TestPlatforms.Windows)]
         [RequiresPowerShell5OrAbove]
         public async Task ExecuteAnInlineWindowsPowerShellScript()
         {

source/Calamari.AzureServiceFabric.Tests/DeployAzureServiceFabricAppCommandFixture.cs

@@ -16,7 +16,7 @@
 namespace Calamari.AzureServiceFabric.Tests
 {
     [TestFixture]
-    [WindowsTest]
+    [TestPlatforms(TestPlatforms.Windows)]
     public class DeployAzureServiceFabricAppCommandFixture
     {
         string clientCertThumbprint;

source/Calamari.AzureServiceFabric.Tests/HealthCheckCommandFixture.cs

@@ -14,7 +14,7 @@
 namespace Calamari.AzureServiceFabric.Tests
 {
     [TestFixture]
-    [WindowsTest]
+    [TestPlatforms(TestPlatforms.Windows)]
     public class HealthCheckCommandFixture
     {       
         string clientCertThumbprint;

source/Calamari.Common/Plumbing/Extensions/ScriptingEnvironment.cs

@@ -20,28 +20,6 @@ public static bool IsRunningOnMono()
             var monoRuntime = Type.GetType("Mono.Runtime");
             return monoRuntime != null;
         }
-
-        public static Version GetMonoVersion()
-        {
-            // A bit hacky, but this is what Mono community seems to be using:
-            // http://stackoverflow.com/questions/8413922/programmatically-determining-mono-runtime-version
-
-            var monoRuntime = Type.GetType("Mono.Runtime");
-            if (monoRuntime == null)
-                throw new MonoVersionCanNotBeDeterminedException("It looks like the code is not running on Mono.");
-
-            var dispalayNameMethod = monoRuntime.GetMethod("GetDisplayName", BindingFlags.NonPublic | BindingFlags.Static);
-            if (dispalayNameMethod == null)
-                throw new MonoVersionCanNotBeDeterminedException("Mono.Runtime.GetDisplayName can not be found.");
-
-            var displayName = dispalayNameMethod.Invoke(null, null).ToString();
-            var match = Regex.Match(displayName, @"^\d+\.\d+.\d+");
-            if (match == null || !match.Success || string.IsNullOrEmpty(match.Value))
-                throw new MonoVersionCanNotBeDeterminedException($"Display name does not seem to include version number. Retrieved value: {displayName}.");
-
-            return Version.Parse(match.Value);
-        }
-
         public static Version SafelyGetPowerShellVersion()
         {
             try

source/Calamari.Terraform.Tests/CommandsFixture.cs

@@ -29,6 +29,7 @@ namespace Calamari.Terraform.Tests
 {
     [TestFixture("0.13.7")]
     [TestFixture("1.8.5")]
+    [Category(TestCategories.Windows2016OrLater)]
     public class CommandsFixture
     {
         string? customTerraformExecutable;