cleanup

GitTools · Dec 21, 2022 · 3ec073d · 3ec073d
1 parent 198c91c
commit 3ec073d
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 13 deletions.
diff --git a/build/artifacts/BuildContext.cs b/build/artifacts/BuildContext.cs
@@ -4,7 +4,7 @@ namespace Artifacts;
 
 public class BuildContext : BuildContextBase
 {
-    public string MsBuildConfiguration { get; set; } = "Release";
+    public string MsBuildConfiguration { get; set; } = Constants.DefaultConfiguration;
 
     public bool IsDockerOnLinux { get; set; }
 

diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
@@ -1,3 +1,4 @@
+using Common.Lifetime;
 using Common.Utilities;
 
 namespace Artifacts;

diff --git a/build/build/BuildContext.cs b/build/build/BuildContext.cs
@@ -5,7 +5,7 @@ namespace Build;
 
 public class BuildContext : BuildContextBase
 {
-    public string MsBuildConfiguration { get; set; } = "Release";
+    public string MsBuildConfiguration { get; set; } = Constants.DefaultConfiguration;
 
     public readonly Dictionary<PlatformFamily, string[]> NativeRuntimes = new()
     {

diff --git a/build/build/BuildLifetime.cs b/build/build/BuildLifetime.cs
@@ -1,4 +1,5 @@
 using Build.Utilities;
+using Common.Lifetime;
 using Common.Utilities;
 
 namespace Build;
@@ -9,7 +10,7 @@ public override void Setup(BuildContext context, ISetupContext info)
     {
         base.Setup(context, info);
 
-        context.MsBuildConfiguration = context.Argument(Arguments.Configuration, "Release");
+        context.MsBuildConfiguration = context.Argument(Arguments.Configuration, Constants.DefaultConfiguration);
         context.EnabledUnitTests = context.IsEnabled(EnvVars.EnabledUnitTests);
 
         context.Credentials = Credentials.GetCredentials(context);

diff --git a/build/build/Utilities/ContextExtensions.cs b/build/build/Utilities/ContextExtensions.cs
diff --git a/build/common/Utilities/BuildLifetimeBase.cs → build/common/Lifetime/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs → build/common/Lifetime/BuildLifetimeBase.cs
@@ -1,7 +1,8 @@
 using Cake.Incubator.LoggingExtensions;
 using Common.Addins.GitVersion;
+using Common.Utilities;
 
-namespace Common.Utilities;
+namespace Common.Lifetime;
 
 public class BuildLifetimeBase<T> : FrostingLifetime<T> where T : BuildContextBase
 {

diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
@@ -11,6 +11,9 @@ public class Constants
     public const string NetVersion60 = $"net{Version60}";
     public const string NetVersion70 = $"net{Version70}";
 
+    public const string DefaultBranch = "main";
+    public const string DefaultConfiguration = "Release";
+
     public static readonly string[] VersionsToBuild = { Version60, Version70 };
     public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
     public static readonly string[] DistrosToSkip = { Alpine313, Alpine314, Centos7, Ubuntu2204 };

diff --git a/build/common/Utilities/ContextExtensions.cs b/build/common/Utilities/ContextExtensions.cs
@@ -52,7 +52,7 @@ public static bool IsOriginalRepo(this ICakeContext context)
     public static bool IsMainBranch(this ICakeContext context)
     {
         var repositoryBranch = GetBranchName(context);
-        return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals("main", repositoryBranch);
+        return !string.IsNullOrWhiteSpace(repositoryBranch) && StringComparer.OrdinalIgnoreCase.Equals(Constants.DefaultBranch, repositoryBranch);
     }
 
     public static bool IsSupportBranch(this ICakeContext context)
@@ -163,4 +163,7 @@ public static string GetBranchName(this ICakeContext context)
     private static void StartGroup(this IAzurePipelinesCommands _, ICakeContext context, string title) => context.Information("##[group]{0}", title);
 
     private static void EndGroup(this IAzurePipelinesCommands _, ICakeContext context) => context.Information("##[endgroup]");
+
+    public static FilePath? GetGitVersionToolLocation(this ICakeContext context) =>
+        context.GetFiles($"src/GitVersion.App/bin/{Constants.DefaultConfiguration}/{Constants.NetVersion60}/gitversion.dll").SingleOrDefault();
 }
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
@@ -1,3 +1,4 @@
+using Common.Lifetime;
 using Common.Utilities;
 
 namespace Docker;

diff --git a/build/docs/BuildLifetime.cs b/build/docs/BuildLifetime.cs
@@ -1,4 +1,5 @@
 using Cake.Wyam;
+using Common.Lifetime;
 using Common.Utilities;
 using Docs.Utilities;
 

diff --git a/build/publish/BuildLifetime.cs b/build/publish/BuildLifetime.cs
@@ -1,3 +1,4 @@
+using Common.Lifetime;
 using Common.Utilities;
 using Publish.Utilities;
 

diff --git a/build/release/BuildLifetime.cs b/build/release/BuildLifetime.cs
@@ -1,3 +1,4 @@
+using Common.Lifetime;
 using Common.Utilities;
 using Release.Utilities;
 

diff --git a/build/release/Tasks/PublishRelease.cs b/build/release/Tasks/PublishRelease.cs
@@ -47,7 +47,7 @@ public override void Run(BuildContext context)
             Milestone = milestone,
             Name = milestone,
             Prerelease = false,
-            TargetCommitish = "main"
+            TargetCommitish = Constants.DefaultBranch
         });
 
         context.GitReleaseManagerAddAssets(token, Constants.RepoOwner, Constants.Repository, milestone, assets);