.github/workflows/ci.yml

@@ -30,6 +30,10 @@ env:
 
   ENABLED_DIAGNOSTICS: ${{ secrets.ENABLED_DIAGNOSTICS }}
 
+permissions:
+  contents: read
+  packages: write
+
 jobs:
   prepare:
     name: Prepare Build
@@ -162,6 +166,13 @@ jobs:
       shell: pwsh
       run: dotnet run/build.dll --target=Test --dotnet_target=${{ matrix.targetFramework }}
 
+    -
+      name: Test Summary
+      uses: test-summary/action@v1
+      with:
+        paths: artifacts/test-results/*.results.xml
+      if: always()
+
   artifacts_windows_test:
     name: Test artifacts on windows
     needs: [build]
@@ -251,10 +262,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
     -
@@ -309,10 +320,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 +334,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 +357,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.6
       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/Directory.Packages.props

@@ -1,11 +1,12 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="Cake.Common" Version="2.1.0" />
+        <PackageReference Include="Cake.Common" Version="2.2.0" />
         <PackageReference Include="Cake.Compression" Version="0.2.6" />
-        <PackageReference Include="Cake.Frosting" Version="2.1.0" />
+        <PackageReference Include="Cake.Frosting" Version="2.2.0" />
         <PackageReference Include="Cake.Incubator" Version="7.0.0" />
+        <PackageReference Include="Cake.DotNetLocalTools.Module" Version="1.0.2" />
 
-        <PackageReference Include="Cake.Docker" Version="1.1.1" />
+        <PackageReference Include="Cake.Docker" Version="1.1.2" />
 
     </ItemGroup>
 </Project>

build/artifacts/Program.cs

@@ -1,6 +1,11 @@
 using Artifacts;
+using Common.Lifetime;
+using Common.Utilities;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/build/Program.cs

@@ -1,6 +1,12 @@
 using Build;
+using Common.Lifetime;
+using Common.Utilities;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
+    .InstallNugetTool(Tools.NugetCmd, Tools.Versions[Tools.NugetCmd])
     .Run(args);

build/build/Tasks/Test/UnitTest.cs

@@ -54,7 +54,7 @@ public override void Finally(BuildContext context)
         {
             TestResultsFiles = testResultsFiles.ToArray(),
             Platform = context.Environment.Platform.Family.ToString(),
-            TestRunner = AzurePipelinesTestRunnerType.NUnit
+            TestRunner = AzurePipelinesTestRunnerType.JUnit
         };
         context.BuildSystem().AzurePipelines.Commands.PublishTestResults(data);
     }
@@ -75,7 +75,7 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
         {
             settings.TestAdapterPath = new DirectoryPath(".");
             var resultsPath = context.MakeAbsolute(testResultsPath.CombineWithFilePath($"{projectName}.results.xml"));
-            settings.Loggers = new[] { $"nunit;LogFilePath={resultsPath}" };
+            settings.Loggers = new[] { $"junit;LogFilePath={resultsPath}" };
         }
 
         var coverletSettings = new CoverletSettings

build/common/Utilities/CakeHostExtensions.cs

@@ -0,0 +1,24 @@
+using Cake.DotNetLocalTools.Module;
+
+namespace Common.Utilities;
+
+public static class ServicesExtensions
+{
+    public static CakeHost UseRootDirectory(this CakeHost host)
+    {
+        host = host.ConfigureServices(services => services.UseWorkingDirectory(Extensions.GetRootDirectory()));
+        return host;
+    }
+
+    public static CakeHost InstallToolsFromRootManifest(this CakeHost host)
+    {
+        host = host.UseModule<LocalToolsModule>().InstallToolsFromManifest(Extensions.GetRootDirectory().CombineWithFilePath("dotnet-tools.json").FullPath);
+        return host;
+    }
+
+    public static CakeHost InstallNugetTool(this CakeHost host, string toolName, string toolVersion)
+    {
+        var toolUrl = new Uri($"nuget:?package={toolName}&version={toolVersion}");
+        return host.ConfigureServices(services => services.UseTool(toolUrl));
+    }
+}

build/common/Utilities/Extensions.cs

@@ -53,7 +53,7 @@ public static DirectoryPath GetRootDirectory()
         var currentPath = DirectoryPath.FromString(Directory.GetCurrentDirectory());
         while (!Directory.Exists(currentPath.Combine(".git").FullPath))
         {
-            currentPath = DirectoryPath.FromString(Directory.GetParent(currentPath.FullPath)?.FullName);
+            currentPath = currentPath.GetParent();
         }
 
         return currentPath;

build/common/Utilities/Tools.cs

@@ -4,18 +4,8 @@ public class Tools
 {
     public const string NugetCmd = "NuGet.CommandLine";
 
-    public const string GitVersion = "GitVersion.Tool";
-    public const string GitReleaseManager = "GitReleaseManager.Tool";
-    public const string Codecov = "Codecov.Tool";
-    public const string Wyam2 = "Wyam2.Tool";
-
     public static readonly Dictionary<string, string> Versions = new()
     {
-        { NugetCmd, "6.0.0" },
-
-        { GitVersion, "5.8.3" },
-        { GitReleaseManager, "0.13.0" },
-        { Codecov, "1.13.0" },
-        { Wyam2, "3.0.0-rc3&prerelease" },
+        { NugetCmd, "6.1.0" },
     };
 }

build/docker/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Docker;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/docs/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Docs;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/publish/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Publish;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);