Merge branch 'develop' into feature/net8-update

Author: mitchelsellers

.github/workflows/ci-build.yml

@@ -14,12 +14,12 @@ jobs:
     env:
       solution-path: './src/ICG NetCore Utilities.sln'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Ensure .NET Installed
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
 
@@ -49,25 +49,25 @@ jobs:
       solution-path: './src/ICG NetCore Utilities.sln'
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: zulu
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4.2.0
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v4.2.0
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner

.github/workflows/release-build.yml

@@ -13,12 +13,12 @@ jobs:
     env:
       solution-path: './src/ICG NetCore Utilities.sln'
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
     - name: Ensure .NET Installed
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
 
@@ -41,4 +41,4 @@ jobs:
       run: dotnet test "${{ env.solution-path }}" --no-build --configuration Release
 
     - name: Publish
-      run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.ICG_NUGET_API_KEY}}
+      run: dotnet nuget push **\*.nupkg -s 'https://api.nuget.org/v3/index.json' -k ${{secrets.ICG_NUGET_API_KEY}}

GitVersion.yml

@@ -3,15 +3,22 @@ next-version: 5.1.4
 branches: 
   develop:
     regex: develop
-    tag: 'alpha'
+    label: 'alpha'
     increment: Patch
+    prevent-increment:
+      when-current-commit-tagged: true
     source-branches: []
+  hotfix:
+    regex: hotfix[/-]
+    source-branches: [develop]
+    prevent-increment:
+      when-current-commit-tagged: true
+    is-release-branch: true
   pull-request:
     regex: (pull|pull\-requests|pr)[/-]
-    tag: 'pr'
-    tag-number-pattern: '[/-](?<number>\d+)[-/]'
+    label: 'pr'
+    label-number-pattern: '[/-](?<number>\d+)[-/]'
     increment: Patch
-    prevent-increment-of-merged-branch-version: false
     is-release-branch: false
     source-branches: []
 ignore: