minor changes in build scripts

Author: arturcic

build/build/Tasks/Package/PackageArchive.cs

@@ -12,7 +12,7 @@ public override void Run(BuildContext context)
     {
         context.EnsureDirectoryExists(Paths.Native);
 
-        var platform = context.Environment.Platform.Family;
+        var platform = context.Platform;
         var runtimes = context.NativeRuntimes[platform];
 
         foreach (var runtime in runtimes)

build/build/Tasks/Package/PackagePrepare.cs

@@ -25,7 +25,7 @@ public override void Run(BuildContext context)
     private static void PackPrepareNative(BuildContext context)
     {
         // publish single file for all native runtimes (self contained)
-        var platform = context.Environment.Platform.Family;
+        var platform = context.Platform;
         var runtimes = context.NativeRuntimes[platform];
 
         foreach (var runtime in runtimes)
@@ -34,7 +34,7 @@ private static void PackPrepareNative(BuildContext context)
 
             // testing windows and macos artifacts, the linux is tested with docker
             if (platform == PlatformFamily.Linux) continue;
-            if (runtime.EndsWith("arm64")) continue;
+            if (runtime.EndsWith("arm64")) continue; // TODO: enable when we have arm64 macos agent
 
             context.Information("Validating native lib:");
             var nativeExe = outputPath.CombineWithFilePath(context.IsOnWindows ? "gitversion.exe" : "gitversion");
@@ -44,7 +44,7 @@ private static void PackPrepareNative(BuildContext context)
 
     private static DirectoryPath PackPrepareNative(BuildContext context, string runtime)
     {
-        var platform = context.Environment.Platform.Family;
+        var platform = context.Platform;
         var outputPath = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
 
         var settings = new DotNetPublishSettings

build/build/Tasks/Test/UnitTest.cs

@@ -53,7 +53,7 @@ public override void Finally(BuildContext context)
         var data = new AzurePipelinesPublishTestResultsData
         {
             TestResultsFiles = testResultsFiles.ToArray(),
-            Platform = context.Environment.Platform.Family.ToString(),
+            Platform = context.Platform.ToString(),
             TestRunner = AzurePipelinesTestRunnerType.JUnit
         };
         context.BuildSystem().AzurePipelines.Commands.PublishTestResults(data);

build/common/Utilities/BuildContextBase.cs

@@ -2,11 +2,9 @@ namespace Common.Utilities;
 
 public class BuildContextBase : FrostingContext
 {
-    protected BuildContextBase(ICakeContext context) : base(context)
-    {
-    }
+    protected BuildContextBase(ICakeContext context) : base(context) => Platform = Environment.Platform.Family;
+    public PlatformFamily Platform { get; set; }
     public BuildVersion? Version { get; set; }
-
     public bool IsOriginalRepo { get; set; }
     public string BranchName { get; set; } = string.Empty;
     public string RepositoryName { get; set; } = string.Empty;

build/common/Utilities/DockerContextExtensions.cs

@@ -153,7 +153,7 @@ private static void DockerTestRun(this BuildContextBase context, string image, A
     {
         var settings = GetDockerRunSettings(context, arch);
         context.Information($"Testing image: {image}");
-        var output = context.DockerRunImage(settings, image, command, args);
+        var output = context.DockerRun(settings, image, command, args);
         context.Information("Output : " + output);
 
         Assert.NotNull(context.Version?.GitVersion);
@@ -235,7 +235,7 @@ private static DockerContainerRunSettings GetDockerRunSettings(this BuildContext
 
         return settings;
     }
-    private static string DockerRunImage(this ICakeContext context, DockerContainerRunSettings settings, string image, string command, params string[] args)
+    /*private static string DockerRunImage(this ICakeContext context, DockerContainerRunSettings settings, string image, string command, params string[] args)
     {
         if (string.IsNullOrEmpty(image))
         {
@@ -257,5 +257,5 @@ private static string DockerRunImage(this ICakeContext context, DockerContainerR
 
         var result = runner.RunWithResult("run", settings, r => r.ToArray(), arguments.ToArray());
         return string.Join("\n", result);
-    }
+    }*/
 }