.editorconfig

@@ -155,6 +155,12 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
+# Alignment
+align_multiline_parameter = true
+
+# Qualify fields with "this."
+csharp_instance_members_qualify_members = field
+
 # IDE0011: Add braces
 dotnet_diagnostic.IDE0011.severity = none
 

.github/workflows/ci.yml

@@ -6,15 +6,15 @@ on:
     - main
     - 'fix/*'
     - 'feature/*'
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'
 
   pull_request:
     branches:
     - main
-    - 'release/*'
+    - 'support/*'
     paths:
     - '**'
     - '!docs/**'
@@ -46,7 +46,7 @@ jobs:
     -
       name: Cache cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -78,14 +78,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -141,14 +141,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -180,14 +180,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -226,14 +226,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -290,14 +290,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -322,48 +322,48 @@ jobs:
         dotnet-version: '6.0.x'
     -
       name: Login to DockerHub
-      if: success() && github.event_name != 'pull_request'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
     -
       name: '[Docker Build/Test/Publish (amd64)] DockerHub'
-      if: success() && github.event_name != 'pull_request'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
     -
       name: '[Docker Build/Test/Publish (arm64)] DockerHub'
-      if: success() && github.event_name != 'pull_request'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
     -
       name: '[Docker Publish Manifest] DockerHub'
-      if: success() && github.event_name != 'pull_request'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
 
     -
       name: Login to GitHub Container Registry
-      if: success() && github.event_name != 'pull_request' && github.repository == 'GitTools/GitVersion'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       uses: docker/login-action@v1
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
     -
       name: '[Docker Build/Test/Publish (amd64)] GitHub Container Registry'
-      if: success() && github.event_name != 'pull_request' && github.repository == 'GitTools/GitVersion'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerPublish --arch amd64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
     -
       name: '[Docker Build/Test/Publish (arm64)] GitHub Container Registry'
-      if: success() && github.event_name != 'pull_request' && github.repository == 'GitTools/GitVersion'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerPublish --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
     -
       name: '[Docker Publish Manifest] GitHub Container Registry'
-      if: success() && github.event_name != 'pull_request' && github.repository == 'GitTools/GitVersion'
+      if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
 
@@ -388,14 +388,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -430,14 +430,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}

.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/**'
@@ -45,7 +45,7 @@ jobs:
     -
       name: Cache cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}

.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
@@ -39,14 +45,14 @@ jobs:
     -
       name: Cache cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -57,7 +63,7 @@ jobs:
     -
       name: Cache Node Modules
       id: cache-node
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: ${{ steps.cache-node-dir.outputs.dir }}
         key: node-${{ runner.os }}-${{ hashFiles('./package-lock.json') }}
@@ -85,14 +91,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
@@ -142,14 +148,14 @@ jobs:
     -
       name: Use cached cake frosting
       id: cache-cake
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: run
         key: run-${{ runner.os }}-${{ hashFiles('./build/**') }}
     -
       name: Use cached tools
       id: cache-tools
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: tools
         key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}

.github/workflows/format.yml

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

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: peter-evans/repository-dispatch@v1.1.3
+      - uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           repository: ${{ github.repository }}

.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/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;
 }