Merge branch 'main' into const_string

Author: asbjornu

.github/workflows/ci.yml

@@ -30,6 +30,9 @@ env:
 
   ENABLED_DIAGNOSTICS: ${{ secrets.ENABLED_DIAGNOSTICS }}
 
+permissions:
+  contents: read
+
 jobs:
   prepare:
     name: Prepare Build
@@ -129,7 +132,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
+        targetFramework: [net6.0, netcoreapp3.1]
       fail-fast: false
 
     steps:
@@ -213,7 +216,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0', '6.0' ]
+        targetFramework: [ '3.1', '6.0' ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
@@ -251,10 +254,10 @@ jobs:
         path: ${{ github.workspace }}/artifacts/packages/native
     -
       name: Setup QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
       with:
         install: true
     -
@@ -277,7 +280,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        targetFramework: [ '3.1', '5.0', '6.0' ]
+        targetFramework: [ '3.1', '6.0' ]
         distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
       fail-fast: false
 
@@ -309,10 +312,10 @@ jobs:
         path: ${{ github.workspace }}/artifacts/packages/nuget
     -
       name: Setup QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
       with:
         install: true
     -
@@ -323,7 +326,7 @@ jobs:
     -
       name: Login to DockerHub
       if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
@@ -346,7 +349,7 @@ jobs:
     -
       name: Login to GitHub Container Registry
       if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}

.github/workflows/codeql-analysis.yml

@@ -20,8 +20,15 @@ on:
   schedule:
     - cron: '0 12 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
+    permissions:
+      actions: read  # for github/codeql-action/init to get workflow details
+      contents: read  # for actions/checkout to fetch code
+      security-events: write  # for github/codeql-action/analyze to upload SARIF results
     name: Analyze
     runs-on: ubuntu-latest
 
@@ -38,7 +45,7 @@ jobs:
         fetch-depth: 0
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
@@ -70,4 +77,4 @@ jobs:
       run: dotnet run/build.dll --target=Build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/docs.yml

@@ -127,7 +127,7 @@ jobs:
         if_false: github-check
     -
       name: '[Remark Lint]'
-      uses: reviewdog/action-remark-lint@v5.3
+      uses: reviewdog/action-remark-lint@v5.4
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         reporter: ${{ steps.reporter.outputs.value }}

.github/workflows/format.yml

@@ -19,6 +19,9 @@ on:
     - '**'
     - '!docs/**'
 
+permissions:
+  contents: read
+
 jobs:
   format:
     runs-on: ubuntu-latest

.github/workflows/homebrew.yml

@@ -4,8 +4,13 @@ on:
   workflow_dispatch:
   repository_dispatch:
     types: [release]
+permissions:
+  contents: read
+
 jobs:
   homebrew:
+    permissions:
+      contents: none
     name: Bump Homebrew formula
     runs-on: macos-latest
     steps:

build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsDotnetToolTest))]
 [TaskDescription("Tests the dotnet global tool in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>

build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsMsBuildCoreTest))]
 [TaskDescription("Tests the msbuild package in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
@@ -36,7 +36,6 @@ public override void Run(BuildContext context)
             targetFramework = targetFramework switch
             {
                 Constants.Version31 => $"netcoreapp{targetFramework}",
-                Constants.Version50 => $"net{targetFramework}",
                 Constants.Version60 => $"net{targetFramework}",
                 _ => targetFramework
             };

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
         var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
         context.Information("\nTesting msbuild task with dotnet build (for .net core)\n");
-        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
+        var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion60 };
         foreach (var framework in frameworks)
         {
             var dotnetMsBuildSettings = new DotNetMSBuildSettings();
@@ -43,21 +43,5 @@ public override void Run(BuildContext context)
             var netcoreExe = Paths.Integration.Combine("core").Combine("build").Combine(framework).CombineWithFilePath("app.dll");
             context.ValidateOutput("dotnet", netcoreExe.FullPath, context.Version.GitVersion.FullSemVer);
         }
-
-        context.Information("\nTesting msbuild task with msbuild (for full framework)\n");
-
-        var msBuildSettings = new MSBuildSettings
-        {
-            Verbosity = Verbosity.Minimal,
-            Restore = true
-        };
-
-        msBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
-        msBuildSettings.WithProperty("RestoreSource", nugetSource);
-
-        context.MSBuild("./tests/integration/full", msBuildSettings);
-
-        var fullExe = Paths.Integration.Combine("full").Combine("build").CombineWithFilePath("app.exe");
-        context.ValidateOutput(fullExe.FullPath, null, context.Version.GitVersion.FullSemVer);
     }
 }

build/artifacts/Tasks/ArtifactsNativeTest.cs

@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsNativeTest))]
 [TaskDescription("Tests the native executables in docker container")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsNativeTest : FrostingTask<BuildContext>

build/artifacts/Tasks/ArtifactsPrepare.cs

@@ -5,7 +5,7 @@ namespace Artifacts.Tasks;
 [TaskName(nameof(ArtifactsPrepare))]
 [TaskDescription("Pulls the docker images needed for testing the artifacts")]
 [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version50, Constants.Version60, Constants.Version31)]
+[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version31)]
 [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
 public class ArtifactsPrepare : FrostingTask<BuildContext>
 {