Merge branch 'develop'

devlead · Nov 4, 2024 · 6066dd3 · 6066dd3
2 parents dee35cc + 3b53dae
commit 6066dd3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,10 +3,18 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "4.0.0",
+      "version": "4.2.0",
       "commands": [
         "dotnet-cake"
-      ]
+      ],
+      "rollForward": false
+    },
+    "dpi": {
+      "version": "2024.9.25.81",
+      "commands": [
+        "dpi"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/build.cake b/build.cake
@@ -101,9 +101,10 @@ Task("Clean")
     .WithCriteria(BuildSystem.IsRunningOnGitHubActions, nameof(BuildSystem.IsRunningOnGitHubActions))
     .Does<BuildData>(
         static (context, data) => context
-            .GitHubActions()
-            .Commands
-            .UploadArtifact(data.ArtifactsPath, "artifacts")
+            .GitHubActions() is var gh && gh != null
+                ?   gh.Commands
+                    .UploadArtifact(data.ArtifactsPath,  $"Artifact_{gh.Environment.Runner.ImageOS ?? gh.Environment.Runner.OS}_{context.Environment.Runtime.BuiltFramework.Identifier}_{context.Environment.Runtime.BuiltFramework.Version}")
+                : throw new Exception("GitHubActions not available")
     )
 .Then("Integration-Tests-Restore-MultiTarget")
     .Does<BuildData>(
@@ -228,7 +229,7 @@ Task("Clean")
          async (context, data) => {
             await GitHubActions.Commands.UploadArtifact(
                 data.MarkdownPath,
-                "Markdown"
+                $"Markdown_{GitHubActions.Environment.Runner.ImageOS ?? GitHubActions.Environment.Runner.OS}_{context.Environment.Runtime.BuiltFramework.Identifier}_{context.Environment.Runtime.BuiltFramework.Version}"
             );
             GitHubActions.Commands.SetStepSummary(
                 string.Join(

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12"
+    "version": "9.0.100-rc.2.24474.11"
   }
 }
diff --git a/src/DPI/DPI.csproj b/src/DPI/DPI.csproj
@@ -16,14 +16,14 @@
     <PackageReference Include="Spectre.Console.Cli.Extensions.DependencyInjection" Version="0.2.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
-    <PackageReference Include="Cake.Core" Version="4.0.0" />
-    <PackageReference Include="Cake.Common" Version="4.0.0" />
+    <PackageReference Include="Cake.Core" Version="4.2.0" />
+    <PackageReference Include="Cake.Common" Version="4.2.0" />
     <PackageReference Include="Cake.Bridge.DependencyInjection" Version="0.15.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>