Switched to Nerdbank.GitVersioning in the hope of reducing hacks and improving reliability

Author: Sebazzz

build.cake

@@ -1,7 +1,6 @@
-#module nuget:?package=Cake.DotNetTool.Module&version=0.4.0
 #addin nuget:?package=Cake.Compression&version=0.2.4
 #addin nuget:?package=SharpZipLib&version=1.2.0
-#tool dotnet:?package=GitVersion.Tool&version=5.2.4
+#addin nuget:?package=Cake.GitVersioning&version=3.1.71
 
 //////////////////////////////////////////////////////////////////////
 // ARGUMENTS
@@ -42,6 +41,11 @@ Task("Clean")
 	CleanDirectories("./src/**/obj");
 });
 
+Task("Clean-TestResults")
+    .Does(() => {
+    CleanDirectory(testResultsDir);
+});
+
 Task("Rebuild")
 	.IsDependentOn("Clean")
 	.IsDependentOn("Build");
@@ -112,8 +116,7 @@ Task("Check-Yarn-Version")
 Task("Restore-NuGet-Packages")
     .Does(() => {
     DotNetCoreRestore(new DotNetCoreRestoreSettings {
-		IgnoreFailedSources = true,
-		DisableParallel = AppVeyor.IsRunningOnAppVeyor // GitVersion/issues/1381
+		IgnoreFailedSources = true
 	});
 });
 
@@ -171,11 +174,7 @@ Task("Build")
     .IsDependentOn("Restore-NuGet-Packages")
     .IsDependentOn("Restore-Node-Packages")
     .Does(() => {
-        DotNetCoreBuild($"./{baseName}.sln", new DotNetCoreBuildSettings {
-			MSBuildSettings = new DotNetCoreMSBuildSettings {
-			   MaxCpuCount = AppVeyor.IsRunningOnAppVeyor ? (int?) 1 : null
-		    } // GitVersion/issues/1381
-		});
+        DotNetCoreBuild($"./{baseName}.sln");
 });
 
 Task("Run")
@@ -282,9 +281,9 @@ Task("Publish-Common")
 	.IsDependentOn("Run-FrontendBuild");
 
 string GetVersionString() {
-	var version = GitVersion();
+	var version = GitVersioningGetVersion();
 
-	return version.NuGetVersion;
+	return version.SemVer1;
 }
 
 var windowsAllPublishTask = Task("Publish-Windows");
@@ -356,6 +355,7 @@ void TestTask(string name, string projectName, Func<bool> criteria = null) {
 		.IsDependentOn("Restore-NuGet-Packages")
 		.IsDependentOn("Set-HeadlessEnvironment")
 		.IsDependentOn("Run-FrontendBuild")
+		.IsDependentOn("Clean-TestResults")
 		.IsDependeeOf("Test-CS")
 		.WithCriteria(criteria)
 		.Does(() => {

dotnet-tools.json

@@ -9,9 +9,9 @@
             "version": "3.3.111304",
             "commands": ["dotnet-format"]
         },
-        "GitVersion.Tool": {
-            "version": "5.2.4",
-            "commands": ["dotnet-gitversion"]
+        "nbgv": {
+            "version": "3.1.71",
+            "commands": ["nbgv"]
         }
     }
 }

src/Common.props

@@ -36,7 +36,7 @@
 
     <!-- Git versioning -->
     <ItemGroup>
-        <PackageReference Include="GitVersionTask" Version="5.2.4">
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.71">
             <PrivateAssets>All</PrivateAssets>
         </PackageReference>
     </ItemGroup>

src/Return.Web/Components/Layout/Footer.razor

@@ -1,7 +1,15 @@
+@using System.Reflection
+@{
+    Assembly currentAssembly = typeof(Startup).Assembly;
+
+    string version = currentAssembly.GetName().Version?.ToString(3) ?? ThisAssembly.AssemblyVersion;
+    string uniqueVersionId = ThisAssembly.AssemblyInformationalVersion;
+}
+
 <footer class="footer">
     <div class="content has-text-centered">
         <p>
-            <span title="@GitVersionInformation.InformationalVersion"><strong>Return</strong> v@(GitVersionInformation.MajorMinorPatch)</span> by <a href="https://damsteen.nl/">Sebastiaan Dammann</a>
+            <span title="@uniqueVersionId"><strong>Return</strong> v@(version)</span> by <a href="https://damsteen.nl/">Sebastiaan Dammann</a>
             <a href="https://github.com/Sebazzz/Return" target="_blank" class="footer__gh-link">
                 <span class="icon"><span class="fab fa-github"></span></span>
                 <span>Github</span>