Merge pull request #1724 from qdraw/feature/202409_net_upgrade

update .NET packages
qdraw · Sep 20, 2024 · 7c54858 · 7c54858
2 parents c89ff7c + dac886d
commit 7c54858
Show file tree

Hide file tree

Showing 21 changed files with 1,022 additions and 1,050 deletions.
diff --git a/starsky/.config/dotnet-tools.json b/starsky/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-sonarscanner": {
-      "version": "8.0.0",
+      "version": "8.0.3",
       "commands": [
         "dotnet-sonarscanner"
       ],

diff --git a/starsky/.nuke/build.schema.json b/starsky/.nuke/build.schema.json
@@ -1,23 +1,111 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "$ref": "#/definitions/build",
-  "title": "Build Schema",
+  "properties": {
+    "Branch": {
+      "type": "string",
+      "description": "Overwrite branch name"
+    },
+    "Configuration": {
+      "type": "string",
+      "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
+      "enum": [
+        "Debug",
+        "Release"
+      ]
+    },
+    "NoClient": {
+      "type": "boolean",
+      "description": "Skip clientside code"
+    },
+    "NoDependencies": {
+      "type": "boolean",
+      "description": "Skip Dependencies download e.g. exiftool / geo data, nuget/npm deps are always installed"
+    },
+    "NoPublish": {
+      "type": "boolean",
+      "description": "Skip Publish step"
+    },
+    "NoSonar": {
+      "type": "boolean",
+      "description": "Is SonarQube Disabled"
+    },
+    "NoTest": {
+      "type": "boolean",
+      "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
+    },
+    "NoTests": {
+      "type": "boolean",
+      "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
+    },
+    "NoUnitTest": {
+      "type": "boolean",
+      "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
+    },
+    "NoUnitTests": {
+      "type": "boolean",
+      "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
+    },
+    "ReadyToRun": {
+      "type": "boolean",
+      "description": "Enable Ready to run builds"
+    },
+    "Runtime": {
+      "type": "string",
+      "description": "Runtime arg"
+    },
+    "Solution": {
+      "type": "string",
+      "description": "Path to a solution file that is automatically loaded"
+    }
+  },
   "definitions": {
-    "build": {
-      "type": "object",
+    "Host": {
+      "type": "string",
+      "enum": [
+        "AppVeyor",
+        "AzurePipelines",
+        "Bamboo",
+        "Bitbucket",
+        "Bitrise",
+        "GitHubActions",
+        "GitLab",
+        "Jenkins",
+        "Rider",
+        "SpaceAutomation",
+        "TeamCity",
+        "Terminal",
+        "TravisCI",
+        "VisualStudio",
+        "VSCode"
+      ]
+    },
+    "ExecutableTarget": {
+      "type": "string",
+      "enum": [
+        "BuildNetCore",
+        "BuildNetCoreRuntimeSpecific",
+        "Client",
+        "Compile",
+        "CoverageReport",
+        "DownloadDependencies",
+        "ShowSettingsInformation",
+        "SonarBuildTest",
+        "TestNetCore",
+        "Zip"
+      ]
+    },
+    "Verbosity": {
+      "type": "string",
+      "description": "",
+      "enum": [
+        "Verbose",
+        "Normal",
+        "Minimal",
+        "Quiet"
+      ]
+    },
+    "NukeBuild": {
       "properties": {
-        "Branch": {
-          "type": "string",
-          "description": "Overwrite branch name"
-        },
-        "Configuration": {
-          "type": "string",
-          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
-          "enum": [
-            "Debug",
-            "Release"
-          ]
-        },
         "Continue": {
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
@@ -27,62 +115,13 @@
           "description": "Shows the help text for this build assembly"
         },
         "Host": {
-          "type": "string",
           "description": "Host for execution. Default is 'automatic'",
-          "enum": [
-            "AppVeyor",
-            "AzurePipelines",
-            "Bamboo",
-            "Bitbucket",
-            "Bitrise",
-            "GitHubActions",
-            "GitLab",
-            "Jenkins",
-            "Rider",
-            "SpaceAutomation",
-            "TeamCity",
-            "Terminal",
-            "TravisCI",
-            "VisualStudio",
-            "VSCode"
-          ]
-        },
-        "NoClient": {
-          "type": "boolean",
-          "description": "Skip clientside code"
-        },
-        "NoDependencies": {
-          "type": "boolean",
-          "description": "Skip Dependencies download e.g. exiftool / geo data, nuget/npm deps are always installed"
+          "$ref": "#/definitions/Host"
         },
         "NoLogo": {
           "type": "boolean",
           "description": "Disables displaying the NUKE logo"
         },
-        "NoPublish": {
-          "type": "boolean",
-          "description": "Skip Publish step"
-        },
-        "NoSonar": {
-          "type": "boolean",
-          "description": "Is SonarQube Disabled"
-        },
-        "NoTest": {
-          "type": "boolean",
-          "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
-        },
-        "NoTests": {
-          "type": "boolean",
-          "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
-        },
-        "NoUnitTest": {
-          "type": "boolean",
-          "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
-        },
-        "NoUnitTests": {
-          "type": "boolean",
-          "description": "Is Unit Test Disabled (same as NoUnitTest, NoUnitTests, NoTest and NoTests)"
-        },
         "Partition": {
           "type": "string",
           "description": "Partition to use on CI"
@@ -98,71 +137,30 @@
             "type": "string"
           }
         },
-        "ReadyToRun": {
-          "type": "boolean",
-          "description": "Enable Ready to run builds"
-        },
         "Root": {
           "type": "string",
           "description": "Root directory during build execution"
         },
-        "Runtime": {
-          "type": "string",
-          "description": "Runtime arg"
-        },
         "Skip": {
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
-            "enum": [
-              "BuildNetCore",
-              "BuildNetCoreRuntimeSpecific",
-              "Client",
-              "Compile",
-              "CoverageReport",
-              "DownloadDependencies",
-              "ShowSettingsInformation",
-              "SonarBuildTest",
-              "TestNetCore",
-              "Zip"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
-        "Solution": {
-          "type": "string",
-          "description": "Path to a solution file that is automatically loaded"
-        },
         "Target": {
           "type": "array",
           "description": "List of targets to be invoked. Default is '{default_target}'",
           "items": {
-            "type": "string",
-            "enum": [
-              "BuildNetCore",
-              "BuildNetCoreRuntimeSpecific",
-              "Client",
-              "Compile",
-              "CoverageReport",
-              "DownloadDependencies",
-              "ShowSettingsInformation",
-              "SonarBuildTest",
-              "TestNetCore",
-              "Zip"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
         "Verbosity": {
-          "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",
-          "enum": [
-            "Minimal",
-            "Normal",
-            "Quiet",
-            "Verbose"
-          ]
+          "$ref": "#/definitions/Verbosity"
         }
       }
     }
-  }
+  },
+  "$ref": "#/definitions/NukeBuild"
 }
diff --git a/starsky/build/Constants/ReadyToRunSupportedPlatforms.cs b/starsky/build/Constants/ReadyToRunSupportedPlatforms.cs
@@ -6,23 +6,23 @@ namespace Constants;
 public static class ReadyToRunSupportedPlatforms
 {
 	/// <summary>
-	/// SDK-platform 	Supported target platforms
-	/// 	Windows X64 	Windows (X86, X64, Arm64), Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
-	/// win-x64 - supports: win-x86, win-x64, win-arm64, linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
-	/// Windows X86 	Windows (X86), Linux (Arm32)
-	/// win-x86 - supports: win-x86, linux-arm
-	/// Linux X64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
-	/// linux-x64 - supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
-	/// Linux Arm32 	Linux Arm32
-	/// linux-arm, supports linux-arm
-	/// Linux Arm64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
-	/// linux-arm64 supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64 
-	/// macOS X64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
-	/// osx-x64 supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64 
-	/// macOS Arm64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
-	/// osx-arm64 supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
-	/// 
-	/// @see: https://learn.microsoft.com/en-us/dotnet/core/deploying/ready-to-run
+	///     SDK-platform 	Supported target platforms
+	///     Windows X64 	Windows (X86, X64, Arm64), Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
+	///     win-x64 - supports: win-x86, win-x64, win-arm64, linux-x64, linux-arm, linux-arm64, osx-x64,
+	///     osx-arm64
+	///     Windows X86 	Windows (X86), Linux (Arm32)
+	///     win-x86 - supports: win-x86, linux-arm
+	///     Linux X64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
+	///     linux-x64 - supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
+	///     Linux Arm32 	Linux Arm32
+	///     linux-arm, supports linux-arm
+	///     Linux Arm64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
+	///     linux-arm64 supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
+	///     macOS X64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
+	///     osx-x64 supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
+	///     macOS Arm64 	Linux (X64, Arm32, Arm64), macOS (X64, Arm64)
+	///     osx-arm64 supports linux-x64, linux-arm, linux-arm64, osx-x64, osx-arm64
+	///     @see: https://learn.microsoft.com/en-us/dotnet/core/deploying/ready-to-run
 	/// </summary>
 	public static readonly ImmutableDictionary<string, ImmutableList<string>> SupportedPlatforms =
 		new Dictionary<string, ImmutableList<string>>

diff --git a/starsky/build/_build.csproj b/starsky/build/_build.csproj
@@ -14,10 +14,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0"/>
-        <PackageReference Include="Nuke.Common" Version="8.0.0"/>
-        <PackageReference Include="ReportGenerator.Core" Version="5.2.4" />
+        <PackageReference Include="Nuke.Common" Version="8.1.0" />
+        <PackageReference Include="ReportGenerator.Core" Version="5.2.5" />
         <PackageReference Include="SimpleExec" Version="12.0.0"/>
     </ItemGroup>