Merge pull request #4252 from arturcic/main

(build) improvements in the CI solution

Author: arturcic

build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

@@ -4,9 +4,9 @@ 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.VersionCurrent, Constants.VersionLatest)]
-[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
+[DockerRegistryArgument]
+[DockerDotnetArgument]
+[DockerDistroArgument]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
 {

build/artifacts/Tasks/ArtifactsExecutableTest.cs

@@ -36,10 +36,10 @@ private static void PackageTest(BuildContextBase context, string packageToTest)
 
         context.NuGetInstall(packageToTest, new NuGetInstallSettings
         {
-            Source = new[]
-            {
+            Source =
+            [
                 context.MakeAbsolute(Paths.Nuget).FullPath
-            },
+            ],
             ExcludeVersion = true,
             Prerelease = true,
             OutputDirectory = outputDirectory

build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

@@ -4,9 +4,9 @@ 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.VersionCurrent, Constants.VersionLatest)]
-[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
+[DockerRegistryArgument]
+[DockerDotnetArgument]
+[DockerDistroArgument]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
 {

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

@@ -36,7 +36,7 @@ public override void Run(BuildContext context)
                 Verbosity = DotNetVerbosity.Minimal,
                 Configuration = context.MsBuildConfiguration,
                 MSBuildSettings = dotnetMsBuildSettings,
-                Sources = new[] { nugetSource }
+                Sources = [nugetSource]
             });
 
             var exe = Paths.Integration.Combine("build").Combine(framework).CombineWithFilePath("app.dll");

build/artifacts/Tasks/ArtifactsNativeTest.cs

@@ -4,9 +4,9 @@ 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.VersionCurrent, Constants.VersionLatest)]
-[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
+[DockerRegistryArgument]
+[DockerDotnetArgument]
+[DockerDistroArgument]
 [IsDependentOn(typeof(ArtifactsPrepare))]
 public class ArtifactsNativeTest : FrostingTask<BuildContext>
 {

build/artifacts/Tasks/ArtifactsPrepare.cs

@@ -4,9 +4,9 @@ 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.VersionCurrent, Constants.VersionLatest)]
-[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
+[DockerRegistryArgument]
+[DockerDotnetArgument]
+[DockerDistroArgument]
 public class ArtifactsPrepare : FrostingTask<BuildContext>
 {
     public override bool ShouldRun(BuildContext context)

build/artifacts/Tasks/ArtifactsTest.cs

@@ -4,9 +4,9 @@ namespace Artifacts.Tasks;
 
 [TaskName(nameof(ArtifactsTest))]
 [TaskDescription("Tests packages in docker container")]
-[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
-[TaskArgument(Arguments.DockerDotnetVersion, Constants.VersionCurrent, Constants.VersionLatest)]
-[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
+[DockerRegistryArgument]
+[DockerDotnetArgument]
+[DockerDistroArgument]
 [IsDependentOn(typeof(ArtifactsNativeTest))]
 [IsDependentOn(typeof(ArtifactsDotnetToolTest))]
 [IsDependentOn(typeof(ArtifactsMsBuildCoreTest))]

build/build/BuildLifetime.cs

@@ -29,7 +29,8 @@ public override void Setup(BuildContext context, ISetupContext info)
     private static void SetMsBuildSettingsVersion(BuildContext context)
     {
         var msBuildSettings = context.MsBuildSettings;
-        var version = context.Version!;
+        ArgumentNullException.ThrowIfNull(context.Version);
+        var version = context.Version;
 
         msBuildSettings.SetVersion(version.SemVersion);
         msBuildSettings.SetAssemblyVersion(version.Version);

build/build/Tasks/Build.cs

@@ -16,7 +16,7 @@ public override void Run(BuildContext context)
         context.DotNetRestore(sln, new DotNetRestoreSettings
         {
             Verbosity = DotNetVerbosity.Minimal,
-            Sources = new[] { Constants.NugetOrgUrl },
+            Sources = [Constants.NugetOrgUrl],
             MSBuildSettings = context.MsBuildSettings
         });
 

build/build/Tasks/BuildPrepare.cs

@@ -16,7 +16,7 @@ public override void Run(BuildContext context)
             new()
             {
                 Verbosity = DotNetVerbosity.Minimal,
-                Sources = new[] { Constants.NugetOrgUrl },
+                Sources = [Constants.NugetOrgUrl],
             });
 
         context.DotNetBuild("./src/GitVersion.App/GitVersion.App.csproj",