(build) generate zip for windows instead of tar.gz

Author: arturcic

.github/workflows/ci.yml

@@ -108,6 +108,14 @@ jobs:
     -
       name: 'Upload native packages'
       uses: actions/[email protected]
+      if: matrix.os == 'windows-latest'
+      with:
+        name: native-${{ runner.os }}
+        path: ${{ github.workspace }}/artifacts/packages/native/*.zip
+    -
+      name: 'Upload native packages'
+      uses: actions/[email protected]
+      if: matrix.os != 'windows-latest'
       with:
         name: native-${{ runner.os }}
         path: ${{ github.workspace }}/artifacts/packages/native/*.tar.gz

build/.run/Package GZip.run.xml renamed to build/.run/Package Archive.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Package GZip" type="DotNetProject" factoryName=".NET Project" folderName="Package">
+  <configuration default="false" name="Package Archive" type="DotNetProject" factoryName=".NET Project" folderName="Package">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=PackageGZip" />
+    <option name="PROGRAM_PARAMETERS" value="--target=PackageArchive" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>

build/build/Tasks/Package.cs

@@ -4,7 +4,7 @@ namespace Build.Tasks;
 [TaskDescription("Creates the packages (nuget, chocolatey or tar.gz)")]
 [IsDependentOn(typeof(PackageChocolatey))]
 [IsDependentOn(typeof(PackageNuget))]
-[IsDependentOn(typeof(PackageGZip))]
+[IsDependentOn(typeof(PackageArchive))]
 public class Package : FrostingTask<BuildContext>
 {
 }

build/build/Tasks/Package/PackageArchive.cs

@@ -0,0 +1,46 @@
+using Cake.Compression;
+using Common.Utilities;
+
+namespace Build.Tasks;
+
+[TaskName(nameof(PackageArchive))]
+[TaskDescription("Creates the tar.gz or zip packages")]
+[IsDependentOn(typeof(PackagePrepare))]
+public class PackageArchive : FrostingTask<BuildContext>
+{
+    public override void Run(BuildContext context)
+    {
+        context.EnsureDirectoryExists(Paths.Native);
+
+        var platform = context.Environment.Platform.Family;
+        var runtimes = context.NativeRuntimes[platform];
+
+        foreach (var runtime in runtimes)
+        {
+            var sourceDir = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
+            var targetDir = Paths.Native;
+            context.EnsureDirectoryExists(targetDir);
+
+            var archive = GetArchiveOutputPath(context, runtime, platform, targetDir);
+            var filePaths = context.GetFiles($"{sourceDir}/**/*");
+            switch (platform)
+            {
+                case PlatformFamily.Windows:
+                    context.ZipCompress(sourceDir, archive, filePaths);
+                    break;
+                default:
+                    context.GZipCompress(sourceDir, archive, filePaths);
+                    break;
+            }
+
+            context.Information($"Created {archive}");
+        }
+        base.Run(context);
+    }
+    private static FilePath GetArchiveOutputPath(BuildContextBase context, string runtime, PlatformFamily platform, DirectoryPath targetDir)
+    {
+        var ext = platform == PlatformFamily.Windows ? "zip" : "tar.gz";
+        var fileName = $"gitversion-{runtime}-{context.Version?.SemVersion}.{ext}".ToLower();
+        return targetDir.CombineWithFilePath(fileName);
+    }
+}

build/build/Tasks/Package/PackageGZip.cs

@@ -23,17 +23,16 @@ private static void PackageWithCli(BuildContext context)
             Configuration = context.MsBuildConfiguration,
             OutputDirectory = Paths.Nuget,
             MSBuildSettings = context.MsBuildSettings,
-            ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true")
         };
 
         // GitVersion.MsBuild, global tool & core
-        context.DotNetCorePack("./src/GitVersion.App/GitVersion.App.csproj", settings);
+        context.DotNetCorePack("./src/GitVersion.Core", settings);
+
+        settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
+        context.DotNetCorePack("./src/GitVersion.App", settings);
 
         settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");
         context.DotNetCorePack("./src/GitVersion.MsBuild", settings);
-
-        settings.ArgumentCustomization = null;
-        context.DotNetCorePack("./src/GitVersion.Core", settings);
     }
     private static void PackageUsingNuspec(BuildContextBase context)
     {

build/build/Tasks/Package/PackageNuget.cs

@@ -33,10 +33,10 @@ public override void Run(BuildContext context)
             throw new InvalidOperationException("Could not resolve GitHub Token.");
         }
 
-        var tarGzFiles = context.GetFiles(Paths.Native + "/*.tar.gz").Select(x => x.ToString()).ToList();
-        context.Information("zip count: " + tarGzFiles.Count);
+        var archives = context.GetFiles(Paths.Native + "/*.{tar.gz,zip}").Select(x => x.ToString()).ToList();
+        context.Information("Archives count: " + archives.Count);
 
-        var assets = string.Join(",", tarGzFiles);
+        var assets = string.Join(",", archives);
 
         var milestone = context.Version?.Milestone;