Feature/netcore3.0

build.cake

@@ -3,6 +3,7 @@
 
 // Install addins.
 #addin "nuget:?package=Cake.Codecov&version=0.7.0"
+#addin "nuget:?package=Cake.Compression&version=0.2.4"
 #addin "nuget:?package=Cake.Coverlet&version=2.3.4"
 #addin "nuget:?package=Cake.Docker&version=0.10.1"
 #addin "nuget:?package=Cake.Gem&version=0.8.1"
@@ -13,11 +14,11 @@
 #addin "nuget:?package=Cake.Tfx&version=0.9.1"
 
 #addin "nuget:?package=Newtonsoft.Json&version=12.0.2"
+#addin "nuget:?package=SharpZipLib&version=1.2.0"
 #addin "nuget:?package=xunit.assert&version=2.4.1"
 
 // Install tools.
 #tool "nuget:?package=NUnit.ConsoleRunner&version=3.10.0"
-#tool "nuget:?package=ILRepack&version=2.0.18"
 #tool "nuget:?package=nuget.commandline&version=5.2.0"
 
 // Install .NET Core Global tools.

build.config

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 CAKE_VERSION=0.35
-DOTNET_VERSION=2.2.401
+DOTNET_VERSION=2.1.802,3.0.100

build/docker.cake

@@ -3,7 +3,7 @@ singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
 Task("Docker-Build")
     .WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker can be built only on Windows or Linux agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Docker-Build works only on AzurePipeline.")
-    .IsDependentOnWhen("Copy-Files", singleStageRun)
+    .IsDependentOnWhen("Pack-Prepare", singleStageRun)
     .Does<BuildParameters>((parameters) =>
 {
     foreach(var dockerImage in parameters.Docker.Images)

build/pack.cake

@@ -38,7 +38,7 @@ Task("Test")
     .IsDependentOn("Build")
     .Does<BuildParameters>((parameters) =>
 {
-    var frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion };
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
     var testResultsPath = parameters.Paths.Directories.TestResultsOutput;
 
     foreach(var framework in frameworks)
@@ -71,7 +71,7 @@ Task("Test")
                     CoverletOutputName = $"{projectName}.coverage.xml"
                 };
 
-                if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion))
+                if (IsRunningOnUnix() && string.Equals(framework, parameters.FullFxVersion472))
                 {
                     settings.Filter = "TestCategory!=NoMono";
                 }
@@ -119,70 +119,83 @@ Task("Test")
 #endregion
 
 #region Pack
-
-Task("Copy-Files")
+Task("Pack-Prepare")
     .IsDependentOn("Test")
     .Does<BuildParameters>((parameters) =>
 {
-    // .NET Core
-    var coreFxDir = parameters.Paths.Directories.ArtifactsBinCoreFx21.Combine("tools");
-    DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", new DotNetCorePublishSettings
+    // publish single file for all native runtimes (self contained)
+    foreach(var runtime in parameters.NativeRuntimes)
     {
-        Framework = parameters.CoreFxVersion21,
-        NoRestore = false,
-        Configuration = parameters.Configuration,
-        OutputDirectory = coreFxDir,
-        MSBuildSettings = parameters.MSBuildSettings
-    });
+        var runtimeName = runtime.Value;
 
-    // Copy license & Copy GitVersion.XML (since publish does not do this anymore)
-    CopyFileToDirectory("./LICENSE", coreFxDir);
-    CopyFileToDirectory($"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion21}/GitVersion.xml", coreFxDir);
+        var settings = new DotNetCorePublishSettings
+        {
+            Framework = parameters.CoreFxVersion30,
+            Runtime = runtimeName,
+            NoRestore = false,
+            Configuration = parameters.Configuration,
+            OutputDirectory = parameters.Paths.Directories.Native.Combine(runtimeName),
+            MSBuildSettings = parameters.MSBuildSettings,
+        };
 
-    // .NET Framework
-    DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", new DotNetCorePublishSettings
-    {
-        Framework = parameters.FullFxVersion,
-        NoBuild = true,
-        NoRestore = false,
-        Configuration = parameters.Configuration,
-        OutputDirectory = parameters.Paths.Directories.ArtifactsBinFullFx,
-        MSBuildSettings = parameters.MSBuildSettings
-    });
+        settings.ArgumentCustomization =
+            arg => arg
+            .Append("/p:PublishSingleFile=true")
+            .Append("/p:PublishTrimmed=true")
+            .Append("/p:IncludeSymbolsInSingleFile=true");
+
+        DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
+    }
+
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
 
-    DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
+    // publish Framework-dependent deployment
+    foreach(var framework in frameworks)
     {
-        Framework = parameters.FullFxVersion,
-        NoBuild = true,
-        NoRestore = true,
-        Configuration = parameters.Configuration,
-        MSBuildSettings = parameters.MSBuildSettings
-    });
+        var settings = new DotNetCorePublishSettings
+        {
+            Framework = framework,
+            NoRestore = false,
+            Configuration = parameters.Configuration,
+            OutputDirectory = parameters.Paths.Directories.ArtifactsBin.Combine(framework),
+            MSBuildSettings = parameters.MSBuildSettings,
+        };
+
+        DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
+    }
+
+    frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion472 };
 
-    // .NET Core
-    DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
+    // MsBuild Task
+    foreach(var framework in frameworks)
     {
-        Framework = parameters.CoreFxVersion21,
-        NoBuild = true,
-        NoRestore = true,
-        Configuration = parameters.Configuration,
-        MSBuildSettings = parameters.MSBuildSettings
-    });
-    var ilMergeDir = parameters.Paths.Directories.ArtifactsBinFullFxILMerge;
-    var portableDir = parameters.Paths.Directories.ArtifactsBinFullFxPortable.Combine("tools");
-    var cmdlineDir = parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");
-
-    // Portable
-    PublishILRepackedGitVersionExe(true, ilMergeDir, portableDir, parameters);
-    // Commandline
-    PublishILRepackedGitVersionExe(false, ilMergeDir, cmdlineDir, parameters);
-
-    // Ruby Gem
-    var gemPath = new DirectoryPath("./src/GitVersionRubyGem/bin");
-    EnsureDirectoryExists(gemPath);
-    CopyFileToDirectory(portableDir + "/" + "LibGit2Sharp.dll.config", gemPath);
-    CopyFileToDirectory(portableDir + "/" + "GitVersion.exe", gemPath);
-    CopyDirectory(portableDir.Combine("lib"), gemPath.Combine("lib"));
+        DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
+        {
+            Framework = framework,
+            Configuration = parameters.Configuration,
+            MSBuildSettings = parameters.MSBuildSettings
+        });
+    }
+
+    var sourceDir = parameters.Paths.Directories.Native.Combine(parameters.NativeRuntimes[PlatformFamily.Windows]);
+    var sourceFiles = GetFiles(sourceDir + "/*.*");
+
+    // RubyGem
+    var gemDir = new DirectoryPath("./src/GitVersionRubyGem/bin");
+    EnsureDirectoryExists(gemDir);
+    CopyFiles(sourceFiles, gemDir);
+
+    // Cmdline and Portable
+    var cmdlineDir = parameters.Paths.Directories.ArtifactsBinCmdline.Combine("tools");
+    var portableDir = parameters.Paths.Directories.ArtifactsBinPortable.Combine("tools");
+
+    EnsureDirectoryExists(cmdlineDir);
+    EnsureDirectoryExists(portableDir);
+
+    CopyFiles(sourceFiles, cmdlineDir);
+
+    sourceFiles += GetFiles("./nuspec/*.ps1") + GetFiles("./nuspec/*.txt");
+    CopyFiles(sourceFiles, portableDir);
 });
 
 Task("Pack-Vsix")
@@ -204,7 +217,6 @@ Task("Pack-Vsix")
     UpdateTaskVersion(new FilePath(workDir + "/GitVersionTask/task.json"), taskId, parameters.Version.GitVersion);
 
     // build and pack
-
     var settings = new TfxExtensionCreateSettings
     {
         ToolPath = workDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
@@ -217,7 +229,7 @@ Task("Pack-Vsix")
 });
 
 Task("Pack-Gem")
-    .IsDependentOn("Copy-Files")
+    .IsDependentOn("Pack-Prepare")
     .Does<BuildParameters>((parameters) =>
 {
     var workDir = "./src/GitVersionRubyGem";
@@ -237,7 +249,7 @@ Task("Pack-Gem")
 });
 
 Task("Pack-Nuget")
-    .IsDependentOn("Copy-Files")
+    .IsDependentOn("Pack-Prepare")
     .Does<BuildParameters>((parameters) =>
 {
     foreach(var package in parameters.Packages.Nuget)
@@ -263,8 +275,6 @@ Task("Pack-Nuget")
     {
         Configuration = parameters.Configuration,
         OutputDirectory = parameters.Paths.Directories.NugetRoot,
-        NoBuild = true,
-        NoRestore = true,
         MSBuildSettings = parameters.MSBuildSettings
     };
 
@@ -278,41 +288,38 @@ Task("Pack-Nuget")
 Task("Pack-Chocolatey")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Pack-Chocolatey works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsMainBranch, "Pack-Chocolatey works only for main branch.")
-    .IsDependentOn("Copy-Files")
+    .IsDependentOn("Pack-Prepare")
     .Does<BuildParameters>((parameters) =>
 {
     foreach(var package in parameters.Packages.Chocolatey)
     {
         if (FileExists(package.NuspecPath)) {
             var artifactPath = MakeAbsolute(parameters.PackagesBuildMap[package.Id]).FullPath;
 
-            var files = GetFiles(artifactPath + "/**/*.*")
-                        .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") });
-            var txtFiles = (GetFiles("./nuspec/*.txt") + GetFiles("./nuspec/*.ps1"))
-                        .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.GetFilename().ToString() });
-
-            ChocolateyPack(package.NuspecPath, new ChocolateyPackSettings {
+            var chocolateySettings = new ChocolateyPackSettings
+            {
                 Verbose = true,
                 Version = parameters.Version.SemVersion,
                 OutputDirectory = parameters.Paths.Directories.NugetRoot,
-                Files = files.Concat(txtFiles).ToArray()
-            });
+                Files = GetFiles(artifactPath + "/**/*.*")
+                        .Select(file => new ChocolateyNuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
+                        .ToArray()
+            };
+            ChocolateyPack(package.NuspecPath, chocolateySettings);
         }
     }
 });
 
 Task("Zip-Files")
-    .IsDependentOn("Copy-Files")
+    .IsDependentOn("Pack-Prepare")
     .Does<BuildParameters>((parameters) =>
 {
-    // .NET Framework
-    var cmdlineDir = parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");
-    var fullFxFiles = GetFiles(cmdlineDir.FullPath + "/**/*");
-    Zip(cmdlineDir, parameters.Paths.Files.ZipArtifactPathDesktop, fullFxFiles);
-
-    // .NET Core
-    var coreFxDir = parameters.Paths.Directories.ArtifactsBinCoreFx21.Combine("tools");
-    var coreclrFiles = GetFiles(coreFxDir.FullPath + "/**/*");
-    Zip(coreFxDir, parameters.Paths.Files.ZipArtifactPathCoreClr, coreclrFiles);
+    foreach(var runtime in parameters.NativeRuntimes)
+    {
+        var sourceDir = parameters.Paths.Directories.Native.Combine(runtime.Value);
+        var fileName = $"gitversion-{runtime.Key}-{parameters.Version.SemVersion}.tar.gz".ToLower();
+        var tarFile = parameters.Paths.Directories.Artifacts.CombineWithFilePath(fileName);
+        GZipCompress(sourceDir, tarFile);
+    }
 });
 #endregion

build/publish.cake

@@ -22,8 +22,12 @@ Task("Release-Notes")
         TargetCommitish   = "master"
     });
 
-    GitReleaseManagerAddAssets(token, repoOwner, repository, parameters.Version.Milestone, parameters.Paths.Files.ZipArtifactPathDesktop.ToString());
-    GitReleaseManagerAddAssets(token, repoOwner, repository, parameters.Version.Milestone, parameters.Paths.Files.ZipArtifactPathCoreClr.ToString());
+    var zipFiles = GetFiles(parameters.Paths.Directories.Artifacts + "/*.tar.gz");
+    foreach(var zipFile in zipFiles)
+    {
+        GitReleaseManagerAddAssets(token, repoOwner, repository, parameters.Version.Milestone, zipFile.ToString());
+    }
+
     GitReleaseManagerClose(token, repoOwner, repository, parameters.Version.Milestone);
 
 }).ReportError(exception =>

build/stages/common-steps.yml

@@ -1,10 +1,14 @@
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET Core sdk'
+  displayName: 'Use .NET Core sdk 2.1'
   inputs:
     packageType: sdk
-    version: 2.2.401
-    installationPath: $(Agent.ToolsDirectory)/dotnet
+    version: 2.1.802
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 3.0'
+  inputs:
+    packageType: sdk
+    version: 3.0.100
 - task: Bash@3
   displayName: 'Env Vars'
   inputs:

build/utils/docker.cake

@@ -28,9 +28,7 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
     var (os, distro, targetframework) = dockerImage;
     var workDir = DirectoryPath.FromString($"./src/Docker");
 
-    var sourceDir = targetframework.StartsWith("netcoreapp")
-        ? parameters.Paths.Directories.ArtifactsBinCoreFx21.Combine("tools")
-        : parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");
+    var sourceDir = parameters.Paths.Directories.ArtifactsBin.Combine(targetframework);
 
     CopyDirectory(sourceDir, workDir.Combine("content"));
 
@@ -102,6 +100,11 @@ void DockerTestArtifact(DockerImage dockerImage, BuildParameters parameters, str
     Information("Docker tag: {0}", tag);
     Information("Docker cmd: {0}", cmd);
 
+    if (os == "windows" && targetframework == parameters.CoreFxVersion30)
+    {
+        cmd = "-Command " + cmd; // powershell 7 needs a -Command parameter
+    }
+
     DockerTestRun(settings, parameters, tag, "pwsh", cmd);
 }
 

build/utils/parameters.cake

@@ -10,8 +10,9 @@ public class BuildParameters
 
     public const string MainRepoOwner = "gittools";
     public const string MainRepoName = "GitVersion";
-    public string CoreFxVersion21 { get; private set; } = "netcoreapp2.1";
-    public string FullFxVersion { get; private set; } = "net472";
+    public string CoreFxVersion21 { get; private set; }  = "netcoreapp2.1";
+    public string CoreFxVersion30 { get; private set; }  = "netcoreapp3.0";
+    public string FullFxVersion472 { get; private set; } = "net472";
 
     public string DockerDistro { get; private set; }
     public string DockerDotnetVersion { get; private set; }
@@ -51,6 +52,7 @@ public class BuildParameters
     public BuildArtifacts Artifacts { get; private set; }
     public DockerImages Docker { get; private set; }
     public Dictionary<string, DirectoryPath> PackagesBuildMap { get; private set; }
+    public Dictionary<PlatformFamily, string> NativeRuntimes { get; private set; }
 
     public bool IsStableRelease() => !IsLocalBuild && IsMainRepo && IsMainBranch && !IsPullRequest && IsTagged;
     public bool IsPreRelease()    => !IsLocalBuild && IsMainRepo && IsMainBranch && !IsPullRequest && !IsTagged;
@@ -125,17 +127,22 @@ public class BuildParameters
 
         var files = Paths.Files;
 
-        var buildArtifacts = context.GetFiles(Paths.Directories.BuildArtifact + "/*.*");
-        buildArtifacts += files.ZipArtifactPathDesktop;
-        buildArtifacts += files.ZipArtifactPathCoreClr;
+        var buildArtifacts = context.GetFiles(Paths.Directories.BuildArtifact + "/*.*") + context.GetFiles(Paths.Directories.Artifacts + "/*.tar.gz");
         buildArtifacts += files.ReleaseNotesOutputFilePath;
 
         Artifacts = BuildArtifacts.GetArtifacts(buildArtifacts.ToArray());
 
         PackagesBuildMap = new Dictionary<string, DirectoryPath>
         {
-            ["GitVersion.CommandLine"] = Paths.Directories.ArtifactsBinFullFxCmdline,
-            ["GitVersion.Portable"] = Paths.Directories.ArtifactsBinFullFxPortable,
+            ["GitVersion.CommandLine"] = Paths.Directories.ArtifactsBinCmdline,
+            ["GitVersion.Portable"] = Paths.Directories.ArtifactsBinPortable,
+        };
+
+        NativeRuntimes = new Dictionary<PlatformFamily, string>
+        {
+            [PlatformFamily.Windows] = "win-x64",
+            [PlatformFamily.Linux]   = "linux-x64",
+            [PlatformFamily.OSX]     = "osx-x64",
         };
 
         Credentials = BuildCredentials.GetCredentials(context);