merge support/5.x

Author: ThomasPiskol

.github/workflows/ci.yml

@@ -6,15 +6,15 @@ on:
     - main
     - 'fix/*'
     - 'feature/*'
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'
 
   pull_request:
     branches:
     - main
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'

.github/workflows/codeql-analysis.yml

@@ -4,15 +4,15 @@ on:
   push:
     branches:
     - main
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'
 
   pull_request:
     branches:
     - main
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'

.github/workflows/docs.yml

@@ -3,6 +3,9 @@ name: Verify & Publish Docs
 on:
   workflow_dispatch:
   push:
+    branches:
+    # - main
+    - 'support/*'
     paths:
     - docs/**
     - package*.json
@@ -11,6 +14,9 @@ on:
     - mkdocs.yml
     - .github/workflows/docs.yml
   pull_request:
+    branches:
+    # - main
+    - 'support/*'
     paths:
     - docs/**
     - package*.json

.github/workflows/format.yml

@@ -6,15 +6,15 @@ on:
     - main
     - 'fix/*'
     - 'feature/*'
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'
 
   pull_request:
     branches:
     - main
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'

.gitignore

@@ -6,6 +6,7 @@
 ## files generated by popular Visual Studio add-ons.
 
 # User-specific files
+.vs
 *.suo
 *.user
 *.userprefs

GitVersion.yml

@@ -2,3 +2,5 @@ assembly-versioning-scheme: MajorMinorPatch
 branches:
   main:
     tag: beta
+  support:
+    tag: beta

build/artifacts/Startup.cs

@@ -13,6 +13,6 @@ public void Configure(IServiceCollection services)
 
         services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
+        services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
     }
 }

build/build/Startup.cs

@@ -13,8 +13,8 @@ public void Configure(IServiceCollection services)
 
         services.UseWorkingDirectory(Extensions.GetRootDirectory());
 
-        services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.0.0"));
-        services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
-        services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
+        services.UseNugetTool(Tools.NugetCmd, Tools.Versions[Tools.NugetCmd]);
+        services.UseDotnetTool(Tools.Codecov, Tools.Versions[Tools.Codecov]);
+        services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
     }
 }

build/build/Tasks/Test/PublishCoverage.cs

@@ -12,7 +12,7 @@ public override bool ShouldRun(BuildContext context)
     {
         var shouldRun = true;
         shouldRun &= context.ShouldRun(context.IsOnWindows, $"{nameof(PublishCoverage)} works only on Windows agents.");
-        shouldRun &= context.ShouldRun(context.IsOnMainOrReleaseBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository.");
+        shouldRun &= context.ShouldRun(context.IsOnMainOrSupportBranchOriginalRepo, $"{nameof(PublishCoverage)} works only for on main or release branch original repository.");
 
         return shouldRun;
     }

build/common/Utilities/BuildContextBase.cs

@@ -8,8 +8,9 @@ protected BuildContextBase(ICakeContext context) : base(context)
     public BuildVersion? Version { get; set; }
 
     public bool IsOriginalRepo { get; set; }
+    public string BranchName { get; set; } = string.Empty;
     public bool IsMainBranch { get; set; }
-    public bool IsReleaseBranch { get; set; }
+    public bool IsSupportBranch { get; set; }
     public bool IsPullRequest { get; set; }
     public bool IsTagged { get; set; }
     public bool IsLocalBuild { get; set; }
@@ -18,7 +19,7 @@ protected BuildContextBase(ICakeContext context) : base(context)
     public bool IsOnWindows { get; set; }
     public bool IsOnLinux { get; set; }
     public bool IsOnMacOS { get; set; }
-    public bool IsOnMainOrReleaseBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsReleaseBranch) && !IsPullRequest;
-    public bool IsStableRelease => IsOnMainOrReleaseBranchOriginalRepo && IsTagged;
-    public bool IsPreRelease => IsOnMainOrReleaseBranchOriginalRepo && !IsTagged;
+    public bool IsOnMainOrSupportBranchOriginalRepo => !IsLocalBuild && IsOriginalRepo && (IsMainBranch || IsSupportBranch) && !IsPullRequest;
+    public bool IsStableRelease => IsOnMainOrSupportBranchOriginalRepo && IsTagged;
+    public bool IsPreRelease => IsOnMainOrSupportBranchOriginalRepo && !IsTagged;
 }