Update to support TestCentricRunner

Author: CharliePoole

.config/dotnet-tools.json

@@ -8,6 +8,20 @@
         "dotnet-cake"
       ],
       "rollForward": false
+    },
+    "gitversion.tool": {
+      "version": "6.4.0",
+      "commands": [
+        "dotnet-gitversion"
+      ],
+      "rollForward": false
+    },
+    "gitreleasemanager.tool": {
+      "version": "0.20.0",
+      "commands": [
+        "dotnet-gitreleasemanager"
+      ],
+      "rollForward": false
     }
   }
 }

GitVersion.yml

@@ -1,14 +1,10 @@
 # This copy of GitVersion.yml is used in building the recipe package itself.
 next-version: 1.5.0
 mode: ContinuousDelivery
-legacy-semver-padding: 5
-build-metadata-padding: 5
-commits-since-version-source-padding: 5
 branches:
-  master:
-    regex: ^main$
-    tag: alpha
+  main:
+    label: alpha
   release:
-    tag: pre
+    label: pre
   pull-request:
-    tag: pr
+    label: pr

recipe/build-settings.cake

@@ -176,8 +176,50 @@ public static class BuildSettings
 	public static string AssemblyInformationalVersion => BuildVersion.AssemblyInformationalVersion;
 	public static bool IsDevelopmentRelease => PackageVersion.Contains("-dev");
 
-	// Standard Directory Structure - not changeable by user
-	public static string ProjectDirectory => Context.Environment.WorkingDirectory.FullPath + "/";
+    // Chocolatey.org does not yet support semver 2.0, so we have to use a legacy format
+    private static string _chocolateyPackageVersion;
+    public static string ChocolateyPackageVersion
+    {
+        get
+        {
+            if (!IsPreRelease)
+                return PackageVersion;
+
+            if (_chocolateyPackageVersion == null)
+            {
+                // Use PackageVersion as default
+                _chocolateyPackageVersion = PackageVersion;
+
+                var semver = BuildVersion.SemVer;
+                var label = BuildVersion.PreReleaseLabel;
+                var suffix = BuildVersion.PreReleaseSuffix;
+                int num1, num2;
+
+                // Our standard pre-releases are in the form <label> "." <num1> ["." <num2>]
+                // If anything else comes up, we just use the default PackageVersion
+                if (!suffix.StartsWith(label + "."))
+                    return _chocolateyPackageVersion;
+
+                suffix = suffix.Substring(label.Length + 1);
+                int dot2 = suffix.IndexOf('.');
+                if (dot2 > 0) // another dot?
+                {
+                    if (int.TryParse(suffix.Substring(0, dot2), out num1) && int.TryParse(suffix.Substring(dot2 + 1), out num2))
+                        _chocolateyPackageVersion = $"{semver}-{label}{num1:000}-{num2:000}";
+                }
+                else // just one dot
+                {
+                    if (int.TryParse(suffix, out num1))
+                        _chocolateyPackageVersion = $"{semver}-{label}{num1:000}";
+                }
+            }
+
+            return _chocolateyPackageVersion;
+        }
+    }
+
+    // Standard Directory Structure - not changeable by user
+    public static string ProjectDirectory => Context.Environment.WorkingDirectory.FullPath + "/";
 	public static string SourceDirectory => ProjectDirectory + SRC_DIR;
 	public static string OutputDirectory => ProjectDirectory + BIN_DIR + Configuration + "/";
 	public static string NuGetDirectory => ProjectDirectory + NUGET_DIR;

recipe/known-extensions.cake recipe/extension-specifier.cakerecipe/known-extensions.cake renamed to recipe/extension-specifier.cake

@@ -40,7 +40,8 @@ public abstract class PackageDefinition
 
         PackageType = packageType;
         PackageId = id;
-        PackageVersion = BuildSettings.PackageVersion;
+        // HACK
+        PackageVersion = packageType == PackageType.Chocolatey ? BuildSettings.ChocolateyPackageVersion : BuildSettings.PackageVersion;
         PackageSource = source;
         BasePath = basePath ?? BuildSettings.OutputDirectory;
         TestRunner = testRunner;

recipe/package-definition.cake

@@ -33,14 +33,16 @@ public class ExpectedResult : TestResultSummary
 
 public class ExpectedAssemblyResult
 {
-	public ExpectedAssemblyResult(string name, string expectedRuntime = null)
-	{
-		AssemblyName = name;
-		Runtime = expectedRuntime;
-	}
-
-	public string AssemblyName { get; }
-	public string Runtime { get; }
+    public ExpectedAssemblyResult(string name, string expectedRuntime = null, string expectedAgent = null)
+    {
+        AssemblyName = name;
+        Runtime = expectedRuntime;
+        AgentName = expectedAgent;
+    }
+
+    public string AssemblyName { get; }
+    public string Runtime { get; }
+    public string AgentName { get; }
 }
 
 public class ActualResult : TestResultSummary

recipe/test-results.cake

@@ -1,9 +1,15 @@
 // Load all tools used by the recipe
 #tool NuGet.CommandLine&version=6.9.1
-#tool dotnet:?package=GitVersion.Tool&version=5.12.0
-#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0
+#tool dotnet:?package=GitVersion.Tool&version=6.4.0
+#tool dotnet:?package=GitReleaseManager.Tool&version=0.20.0
 #addin nuget:?package=Cake.Git&version=5.0.1
 
+// Using statements needed in the scripts
+using Cake.Git;
+using System.Text.RegularExpressions;
+using System.Xml;
+using SIO = System.IO;
+
 public static class Tools
 {
 	public static DirectoryPath FindInstalledTool(string packageId)

recipe/tools.cake

@@ -49,16 +49,23 @@ public class BuildVersion
         PreReleaseLabel = label;
         PreReleaseSuffix = suffix;
 
-        PackageVersion = packageVersion;
+        PackageVersion = LegacyPackageVersion = packageVersion;
         AssemblyVersion = SemVer + ".0";
         AssemblyFileVersion = SemVer;
         AssemblyInformationalVersion = packageVersion;
+
+        // We use a legacy SemVer 1.0 format for alpha, beta and rc releases on chocolatey
+        var labelWithDot = label + ".";
+        int num;
+        if (suffix.StartsWith(labelWithDot) && int.TryParse(suffix.Substring(labelWithDot.Length), out num))
+            LegacyPackageVersion = $"{SemVer}-{label}{num:000}";
     }
 
     public string BranchName { get; }
     public bool IsReleaseBranch { get; }
 
     public string PackageVersion { get; }
+    public string LegacyPackageVersion { get; }
     public string AssemblyVersion { get; }
     public string AssemblyFileVersion { get; }
     public string AssemblyInformationalVersion { get; }
@@ -97,13 +104,11 @@ public class BuildVersion
             case "dev":
             case "pre":
             case "pr":
-                suffix += "." + _gitVersion.PreReleaseNumber;
-                break;
             case "rc":
             case "alpha":
             case "beta":
             default:
-                suffix += "." + _gitVersion.CommitsSinceVersionSource;
+                suffix += "." + _gitVersion.PreReleaseNumber;
                 break;
         }