Merge branch 'master' into develop

.github/workflows/build.yml

@@ -49,10 +49,11 @@ jobs:
         uses: actions/[email protected]
         with:
           # codecov in cake.recipe needs 2.1!
+          # version used for GitReleaseManager needs .NET Core 3.0
           dotnet-version: |
             2.1.x
-            3.1.x
             5.0.x
+            6.0.x
       - name: Build Addin
         uses: cake-build/cake-action@v2
         with:

.github/workflows/pre-release-notes.yml

@@ -19,6 +19,15 @@ jobs:
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('setup.cake') }}
+      - name: install .NET versions
+        uses: actions/[email protected]
+        with:
+          # codecov in cake.recipe needs 2.1!
+          # version used for GitReleaseManager needs .NET Core 3.0
+          dotnet-version: |
+            2.1.x
+            5.0.x
+            6.0.x
       - name: Set up git version
         if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
         uses: gittools/actions/gitversion/[email protected]

.github/workflows/publishdocs.yml

@@ -23,6 +23,14 @@ jobs:
         with:
           path: tools
           key: ${{ runner.os }}-doc-tools-${{ hashFiles('setup.cake') }}
+      - name: install .NET versions
+        uses: actions/[email protected]
+        with:
+          # codecov in cake.recipe needs 2.1!
+          dotnet-version: |
+            2.1.x
+            3.1.x
+            5.0.x
       - name: Publishing documentaiton
         uses: cake-build/cake-action@v2
         with:

.github/workflows/release-notes.yml

@@ -19,6 +19,15 @@ jobs:
         with:
           path: tools
           key: ${{ runner.os }}-tools-${{ hashFiles('setup.cake') }}
+      - name: install .NET versions
+        uses: actions/[email protected]
+        with:
+          # codecov in cake.recipe needs 2.1!
+          # version used for GitReleaseManager needs .NET Core 3.0
+          dotnet-version: |
+            2.1.x
+            5.0.x
+            6.0.x
       - name: Set up git version
         if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }}
         uses: gittools/actions/gitversion/[email protected]
@@ -44,4 +53,3 @@ jobs:
           target: releasenotes
           verbosity: Diagnostic
           cake-version: tool-manifest
-          cake-bootstrap: true

setup.cake

@@ -28,7 +28,10 @@ BuildParameters.PrintParameters(Context);
 ToolSettings.SetToolSettings(
                             context: Context,
                             testCoverageFilter: "+[Cake.Codecov]*");
-ToolSettings.SetToolPreprocessorDirectives(codecovTool: "#tool nuget:?package=CodecovUploader&version=0.7.3");
+ToolSettings.SetToolPreprocessorDirectives(
+    codecovTool: "#tool nuget:?package=CodecovUploader&version=0.7.3",
+    gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.12.0",
+    gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.17.0");
 
 // Tasks we want to override
 ((CakeTask)BuildParameters.Tasks.UploadCodecovReportTask.Task).Actions.Clear();