Merge branch 'release/4.11.0'

pascalberger · Oct 6, 2024 · 0a15339 · 0a15339
2 parents 9276b7a + f9463a0
commit 0a15339
Show file tree

Hide file tree

Showing 68 changed files with 101 additions and 110 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -18,10 +18,9 @@ install:
   - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
   - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
   - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
   - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.425 -InstallDir $env:DOTNET_INSTALL_DIR'
   - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 7.0.409 -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.401 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.402 -InstallDir $env:DOTNET_INSTALL_DIR'
   - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
   - ps: dotnet --info
 

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-git-repository.yml b/.azuredevops/pipelines/templates/stages/integration-tests-git-repository.yml
@@ -13,8 +13,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-markdownlint.yml b/.azuredevops/pipelines/templates/stages/integration-tests-markdownlint.yml
@@ -13,8 +13,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-msbuild.yml b/.azuredevops/pipelines/templates/stages/integration-tests-msbuild.yml
@@ -13,8 +13,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-reporting-console.yml b/.azuredevops/pipelines/templates/stages/integration-tests-reporting-console.yml
@@ -13,8 +13,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:
@@ -37,8 +37,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-reporting-generic.yml b/.azuredevops/pipelines/templates/stages/integration-tests-reporting-generic.yml
@@ -13,8 +13,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:
@@ -40,8 +40,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:

diff --git a/.azuredevops/pipelines/templates/stages/integration-tests-reporting-sarif.yml b/.azuredevops/pipelines/templates/stages/integration-tests-reporting-sarif.yml
@@ -13,8 +13,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:
@@ -40,8 +40,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:
@@ -67,8 +67,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:
@@ -94,8 +94,8 @@ stages:
             imageName: 'windows-2019'
           Windows_Server_2022:
             imageName: 'windows-2022'
-          macOS_12:
-            imageName: 'macOS-12'
+          macOS_13:
+            imageName: 'macOS-13'
           macOS_14:
             imageName: 'macOS-14'
           Ubuntu_20_04:

diff --git a/.azuredevops/pipelines/templates/stages/unit-tests.yml b/.azuredevops/pipelines/templates/stages/unit-tests.yml
@@ -14,7 +14,7 @@ stages:
           Ubuntu:
             imageName: 'ubuntu-22.04'
           macOS:
-            imageName: 'macOS-12'
+            imageName: 'macOS-13'
       pool:
         vmImage: $(imageName)
       steps:

diff --git a/.azuredevops/pipelines/templates/steps/install-net5.yml b/.azuredevops/pipelines/templates/steps/install-net5.yml
diff --git a/.azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml b/.azuredevops/pipelines/templates/steps/install-required-dotnet-versions-for-building.yml
@@ -1,8 +1,6 @@
 # Installs required .NET SDKs for building the solution.
 
 steps:
-  # .NET 5 required for GitVersion
-  - template: install-net5.yml
   - template: install-net6.yml
   - template: install-net7.yml
   - template: install-net8.yml
diff --git a/.github/workflows/integrationtests.yml b/.github/workflows/integrationtests.yml
@@ -32,7 +32,7 @@ jobs:
         run: ./build.sh --target=Create-NuGet-Packages
         shell: bash
       - name: Publish NuGet package as build artifact
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
         with:
           name: NuGet Package
           path: ./BuildArtifacts/Packages/NuGet/
@@ -46,7 +46,7 @@ jobs:
         os: [
           windows-2019, windows-2022,
           ubuntu-20.04, ubuntu-22.04,
-          macos-12, macos-14]
+          macos-13, macos-14]
         dotnet: [6.x, 7.x, 8.x]
     runs-on: ${{ matrix.os }}
     steps:
@@ -70,7 +70,7 @@ jobs:
         os: [
           windows-2019, windows-2022,
           ubuntu-20.04, ubuntu-22.04,
-          macos-12, macos-14]
+          macos-13, macos-14]
         dotnet: [6.x, 7.x, 8.x]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -19,7 +19,7 @@ jobs:
           windows-2019, windows-2022,
           ubuntu-20.04, ubuntu-22.04,
           # Cake.Recipe currently does not support macOS 14 (M1)
-          macos-12, macos-13]
+          macos-13]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Get the sources