dogfood GitVersion to handle breaking changes

GitTools · Dec 21, 2022 · 9623cc4 · 9623cc4
1 parent 3ec073d
commit 9623cc4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 34 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 branches:
   main:
-    tag: beta
+    label: beta
   support:
-    tag: beta
+    label: beta
diff --git a/build/build/Tasks/ValidateVersion.cs b/build/build/Tasks/ValidateVersion.cs
@@ -1,4 +1,3 @@
-using Build.Utilities;
 using Common.Utilities;
 
 namespace Build.Tasks;

diff --git a/build/common/Lifetime/BuildLifetimeBase.cs b/build/common/Lifetime/BuildLifetimeBase.cs
@@ -24,10 +24,17 @@ public override void Setup(T context, ISetupContext info)
         context.IsOnLinux = context.IsRunningOnLinux();
         context.IsOnMacOS = context.IsRunningOnMacOs();
 
-        var gitVersion = context.GitVersion(new GitVersionSettings
+        BuildSolution(context);
+
+        var gitversionTool = context.GetGitVersionToolLocation();
+        var gitVersionSettings = new GitVersionSettings
         {
-            OutputTypes = new HashSet<GitVersionOutput> { GitVersionOutput.Json, GitVersionOutput.BuildServer }
-        });
+            OutputTypes = new HashSet<GitVersionOutput> { GitVersionOutput.Json, GitVersionOutput.BuildServer },
+            ToolPath = context.Tools.Resolve(new[] { "dotnet.exe", "dotnet" }),
+            ArgumentCustomization = args => args.Prepend(gitversionTool!.FullPath)
+        };
+
+        var gitVersion = context.GitVersion(gitVersionSettings);
 
         context.Version = BuildVersion.Calculate(gitVersion);
     }
@@ -69,4 +76,25 @@ protected void LogBuildInformation(T context)
         context.Information("Support Branch:    {0}", context.IsSupportBranch);
         context.Information("Tagged:            {0}", context.IsTagged);
     }
+    private static void BuildSolution(T context)
+    {
+        context.Information("Builds solution...");
+
+        const string sln = "./src/GitVersion.sln";
+
+        context.DotNetRestore(sln,
+            new()
+            {
+                Verbosity = DotNetVerbosity.Minimal,
+                Sources = new[] { "https://api.nuget.org/v3/index.json" },
+            });
+
+        context.DotNetBuild(sln,
+            new()
+            {
+                Verbosity = DotNetVerbosity.Minimal,
+                Configuration = Constants.DefaultConfiguration,
+                NoRestore = true,
+            });
+    }
 }
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -1,30 +1,24 @@
 {
-    "version": 1,
-    "isRoot": true,
-    "tools": {
-        "codecov.tool": {
-            "version": "1.13.0",
-            "commands": [
-                "codecov"
-            ]
-        },
-        "gitversion.tool": {
-            "version": "5.11.1",
-            "commands": [
-                "dotnet-gitversion"
-            ]
-        },
-        "gitreleasemanager.tool": {
-            "version": "0.13.0",
-            "commands": [
-                "dotnet-gitreleasemanager"
-            ]
-        },
-        "Wyam2": {
-            "version": "3.0.0",
-            "commands": [
-                "wyam2"
-            ]
-        }
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "codecov.tool": {
+      "version": "1.13.0",
+      "commands": [
+        "codecov"
+      ]
+    },
+    "gitreleasemanager.tool": {
+      "version": "0.13.0",
+      "commands": [
+        "dotnet-gitreleasemanager"
+      ]
+    },
+    "wyam2": {
+      "version": "3.0.0",
+      "commands": [
+        "wyam2"
+      ]
     }
-}
+  }
+}