(build) added - arm64 windows and macos native tar.gz

GitTools · Nov 15, 2021 · 5c21ee6 · 5c21ee6
1 parent 1b52a39
commit 5c21ee6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/build/build/BuildContext.cs b/build/build/BuildContext.cs
@@ -10,9 +10,9 @@ public class BuildContext : BuildContextBase
 
     public readonly Dictionary<PlatformFamily, string[]> NativeRuntimes = new()
     {
-        [PlatformFamily.Windows] = new[] { "win-x64", "win-x86" },
+        [PlatformFamily.Windows] = new[] { "win-x64", "win-x86", "win-arm64" },
         [PlatformFamily.Linux] = new[] { "linux-x64", "linux-musl-x64", "linux-arm64", "linux-musl-arm64" },
-        [PlatformFamily.OSX] = new[] { "osx-x64" },
+        [PlatformFamily.OSX] = new[] { "osx-x64", "osx-arm64" },
     };
 
     public bool EnabledUnitTests { get; set; }

diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
@@ -39,6 +39,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;
 
             context.Information("Validating native lib:");
             var nativeExe = outputPath.CombineWithFilePath(context.IsOnWindows ? "gitversion.exe" : "gitversion");
@@ -64,6 +65,12 @@ private static DirectoryPath PackPrepareNative(BuildContext context, string runt
             SelfContained = true
         };
 
+        // workaround for https://github.com/dotnet/runtime/issues/49508
+        if (runtime == "osx-arm64")
+        {
+            settings.ArgumentCustomization = arg => arg.Append("/p:OsxArm64=true");
+        }
+
         context.DotNetPublish("./src/GitVersion.App/GitVersion.App.csproj", settings);
 
         return outputPath;

diff --git a/src/GitVersion.App/GitVersion.App.csproj b/src/GitVersion.App/GitVersion.App.csproj
@@ -14,6 +14,11 @@
         <TargetFrameworks>net48;$(TargetFrameworks);</TargetFrameworks>
     </PropertyGroup>
 
+    <!-- workaround for https://github.com/dotnet/runtime/issues/49508 -->
+    <PropertyGroup Condition=" '$(OsxArm64)' == 'true'">
+        <TargetFrameworks>net6.0</TargetFrameworks>
+    </PropertyGroup>
+
     <PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
         <ToolCommandName>dotnet-gitversion</ToolCommandName>
         <PackageId>GitVersion.Tool</PackageId>