Merge branch 'develop'

Author: devlead

.config/dotnet-tools.json

@@ -38,14 +38,20 @@ jobs:
         with:
           global-json-file: global.json
 
+      - name: NuGet Login
+        uses: NuGet/login@v1
+        id: login
+        with:
+          user: ${{ secrets.NUGET_USER }}
+
       - name: Run Cake script
         uses: cake-build/cake-action@v3
         env:
           NuGetReportSettings_SharedKey: ${{ secrets.NUGETREPORTSETTINGS_SHAREDKEY }}
           NuGetReportSettings_WorkspaceId: ${{ secrets.NUGETREPORTSETTINGS_WORKSPACEID }}
           GH_PACKAGES_NUGET_SOURCE: ${{ secrets.GH_PACKAGES_NUGET_SOURCE }}
           NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
-          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
+          NUGET_APIKEY: ${{ steps.login.outputs.NUGET_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -54,5 +60,5 @@ jobs:
           AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
           AZURE_STORAGE_ACCOUNT_CONTAINER: ${{ secrets.AZURE_STORAGE_ACCOUNT_CONTAINER }}${{ matrix.os }}
         with:
-          cake-version: tool-manifest
+          file-path: cake.cs
           target: GitHub-Actions

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-#tool dotnet:?package=GitVersion.Tool&version=6.5.0
+#tool dotnet:?package=GitVersion.Tool&version=6.5.1
 #load "build/records.cake"
 #load "build/helpers.cake"
 

build.cake

@@ -0,0 +1,39 @@
+/*****************************
+ * Helpers
+ *****************************/
+
+public partial class Program
+{
+    static void Main_SetupExtensions()
+    {        
+        if (BuildSystem.GitHubActions.IsRunningOnGitHubActions)
+        {
+            TaskSetup(context => BuildSystem.GitHubActions.Commands.StartGroup(context.Task.Name));
+            TaskTeardown(context => BuildSystem.GitHubActions.Commands.EndGroup());
+        }
+    }
+}
+
+
+public static partial class CakeTaskBuilderExtensions
+{
+    private static ExtensionHelper extensionHelper = new (Task, () => RunTarget(Argument("target", "Default")));
+
+    public static CakeTaskBuilder Then(this CakeTaskBuilder cakeTaskBuilder, string name)
+        => extensionHelper
+            .TaskCreate(name)
+            .IsDependentOn(cakeTaskBuilder);
+
+
+    public static CakeReport Run(this CakeTaskBuilder cakeTaskBuilder)
+        => extensionHelper.Run();
+
+    public static CakeTaskBuilder Default(this CakeTaskBuilder cakeTaskBuilder)
+    {
+        extensionHelper
+            .TaskCreate("Default")
+            .IsDependentOn(cakeTaskBuilder);
+        return cakeTaskBuilder;
+    }
+
+}

build/helpers.cake

@@ -1,4 +1,3 @@
-#load "helpers.cake"
 using System.Text.Json.Serialization;
 
 /*****************************
@@ -22,15 +21,15 @@ DirectoryPath OutputPath
     public DirectoryPath BinaryOutputPath { get; } = OutputPath.Combine("bin");
     public DirectoryPath IntegrationTestPath { get; } = OutputPath.Combine(IntegrationTest);
 
-    public string GitHubNuGetSource { get; } = System.Environment.GetEnvironmentVariable("GH_PACKAGES_NUGET_SOURCE");
-    public string GitHubNuGetApiKey { get; } = System.Environment.GetEnvironmentVariable("GITHUB_TOKEN");
+    public string? GitHubNuGetSource { get; } = System.Environment.GetEnvironmentVariable("GH_PACKAGES_NUGET_SOURCE");
+    public string? GitHubNuGetApiKey { get; } = System.Environment.GetEnvironmentVariable("GITHUB_TOKEN");
 
     public bool ShouldPushGitHubPackages() =>   !ShouldNotPublish
                                                 && !string.IsNullOrWhiteSpace(GitHubNuGetSource)
                                                 && !string.IsNullOrWhiteSpace(GitHubNuGetApiKey);
 
-    public string NuGetSource { get; } = System.Environment.GetEnvironmentVariable("NUGET_SOURCE");
-    public string NuGetApiKey { get; } = System.Environment.GetEnvironmentVariable("NUGET_APIKEY");
+    public string? NuGetSource { get; } = System.Environment.GetEnvironmentVariable("NUGET_SOURCE");
+    public string? NuGetApiKey { get; } = System.Environment.GetEnvironmentVariable("NUGET_APIKEY");
     public bool ShouldPushNuGetPackages() =>    IsMainBranch &&
                                                 !ShouldNotPublish &&
                                                 !string.IsNullOrWhiteSpace(NuGetSource) &&
@@ -49,9 +48,9 @@ public bool ShouldPushNuGetPackages() =>    IsMainBranch &&
                                                             System.Environment.GetEnvironmentVariable("AZURE_AUTHORITY_HOST")
                                                         );
 
-    public string AzureStorageAccount { get; } = System.Environment.GetEnvironmentVariable("AZURE_STORAGE_ACCOUNT");
+    public string? AzureStorageAccount { get; } = System.Environment.GetEnvironmentVariable("AZURE_STORAGE_ACCOUNT");
 
-    public string AzureStorageAccountContainer { get; } = System.Environment.GetEnvironmentVariable("AZURE_STORAGE_ACCOUNT_CONTAINER");
+    public string? AzureStorageAccountContainer { get; } = System.Environment.GetEnvironmentVariable("AZURE_STORAGE_ACCOUNT_CONTAINER");
 
     public bool ShouldRunIntegrationTests() =>  !string.IsNullOrWhiteSpace(AzureStorageAccount) &&
                                                 !string.IsNullOrWhiteSpace(AzureStorageAccountContainer) &&
@@ -62,15 +61,16 @@ public bool ShouldRunIntegrationTests() =>  !string.IsNullOrWhiteSpace(AzureStor
 }
 
 public record AzureCredentials(
-    string TenantId,
-    string ClientId,
-    string ClientSecret,
-    string AuthorityHost = "login.microsoftonline.com"
+    string? TenantId,
+    string? ClientId,
+    string? ClientSecret,
+    string? AuthorityHost = "login.microsoftonline.com"
 )
 {
     public bool AzureCredentialsSpecified { get; } = !string.IsNullOrWhiteSpace(TenantId) &&
                                                      !string.IsNullOrWhiteSpace(ClientId) &&
                                                      !string.IsNullOrWhiteSpace(ClientSecret) &&
                                                      !string.IsNullOrWhiteSpace(AuthorityHost);
 }
-private record ExtensionHelper(Func<string, CakeTaskBuilder> TaskCreate, Func<CakeReport> Run);
+internal record ExtensionHelper(Func<string, CakeTaskBuilder> TaskCreate, Func<CakeReport> Run);
+