Build uplift

Author: Dylan Lerch

.nuke/build.schema.json

@@ -6,6 +6,10 @@
     "build": {
       "type": "object",
       "properties": {
+        "AutoDetectBranch": {
+          "type": "boolean",
+          "description": "Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI"
+        },
         "Configuration": {
           "type": "string",
           "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
@@ -46,6 +50,10 @@
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
+        "OCTOVERSION_CurrentBranch": {
+          "type": "string",
+          "description": "Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch"
+        },
         "Partition": {
           "type": "string",
           "description": "Partition to use on CI"
@@ -75,7 +83,8 @@
               "Compile",
               "Pack",
               "Restore",
-              "Test"
+              "TestNet6",
+              "TestNetCoreApp31"
             ]
           }
         },
@@ -93,7 +102,8 @@
               "Compile",
               "Pack",
               "Restore",
-              "Test"
+              "TestNet6",
+              "TestNetCoreApp31"
             ]
           }
         },

LibGit2Sharp/LibGit2Sharp.csproj

@@ -55,4 +55,10 @@
     </PropertyGroup>
   </Target>
 
+  <Target Name="OverrideVersion" AfterTargets="GetBuildVersion" Condition="'$(OverridePackageVersion)'!=''">
+    <PropertyGroup>
+      <PackageVersion>$(OverridePackageVersion)</PackageVersion>
+    </PropertyGroup>
+  </Target>
+
 </Project>

build/Build.cs

@@ -1,17 +1,12 @@
-using System;
-using System.Linq;
 using Nuke.Common;
 using Nuke.Common.CI;
 using Nuke.Common.Execution;
-using Nuke.Common.Git;
 using Nuke.Common.IO;
 using Nuke.Common.ProjectModel;
-using Nuke.Common.Tooling;
 using Nuke.Common.Tools.DotNet;
+using Nuke.Common.Tools.OctoVersion;
 using Nuke.Common.Utilities.Collections;
-using static Nuke.Common.EnvironmentInfo;
 using static Nuke.Common.IO.FileSystemTasks;
-using static Nuke.Common.IO.PathConstruction;
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 
 [CheckBuildProjectConfigurations]
@@ -33,6 +28,17 @@ class Build : NukeBuild
 
     [Solution] readonly Solution Solution;
 
+    [Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch.",
+     Name = "OCTOVERSION_CurrentBranch")]
+    readonly string BranchName;
+
+    [Parameter("Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI.")]
+    readonly bool AutoDetectBranch = IsLocalBuild;
+
+    [OctoVersion(UpdateBuildNumber = true, BranchParameter = nameof(BranchName),
+        AutoDetectBranchParameter = nameof(AutoDetectBranch), Framework = "net6.0")]
+    readonly OctoVersionInfo OctoVersionInfo;
+
     // For outline of original build process used by original source repository, check ./azure-pipelines/dotnet.yml
     Target Clean => _ => _
         .Before(Restore)
@@ -56,6 +62,8 @@ class Build : NukeBuild
             DotNetBuild(s => s
                 .SetProjectFile(Solution)
                 .SetConfiguration(Configuration)
+                .SetVersion(OctoVersionInfo.FullSemVer)
+                .SetInformationalVersion(OctoVersionInfo.InformationalVersion)
                 .EnableNoRestore());
         });
 
@@ -97,6 +105,7 @@ class Build : NukeBuild
                 .SetRunCodeAnalysis(false)
                 .SetIncludeSymbols(false)
                 .SetPackageId("Octopus.LibGit2Sharp")
+                .SetProperty("OverridePackageVersion", OctoVersionInfo.FullSemVer)
                 .SetNoBuild(true)
             );
         });

build/_build.csproj

@@ -11,7 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.2.1" />
+    <PackageReference Include="Nuke.Common" Version="6.0.3" />
+    <PackageDownload Include="OctoVersion.Tool" Version="[0.2.1058]" />
   </ItemGroup>
 
 </Project>

version.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+  "version": "0.27.0-octopus.{height}",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$",                  // we release out of master
+    "^refs/heads/maint/v\\d+(?:\\.\\d+)?$"  // and maint/vNN branches
+  ],
+  "cloudBuild": {
+    "setVersionVariables": false,
+    "buildNumber": {
+      "enabled": false
+    }
+  }
+}