Merge branch 'master' into issue-1348

Author: Frode Nilsen

.artifactignore

@@ -1,7 +1,7 @@
 **/*
 
 !artifacts/*/bin/netcoreapp2.1
-!artifacts/*/bin/netcoreapp3.0
+!artifacts/*/bin/netcoreapp3.1
 !artifacts/*/build-artifact
 !artifacts/*/nuget
 

.gitignore

@@ -114,20 +114,12 @@ GitVersion.CommandLine/*/
 releaseArtifacts
 /ILMergeTemp
 .dotnet
-.cake
 artifacts
 src/Docker/**/content
-src/GitVersionVsixTask/node_modules/
-src/GitVersionVsixTask/*.d.ts
-src/GitVersionVsixTask/*.js
-src/GitVersionVsixTask/tests/*.js
-src/GitVersionVsixTask/GitVersionTask
-src/GitVersionVsixTask/*.vsix
-src/GitVersionVsixTask/.taskkey
-!src/GitVersionVsixTask/GitVersionTask/task.json
 
 src/GitVersionRubyGem/*.gem
 src/GitVersionRubyGem/bin/lib
 src/GitVersionRubyGem/bin/GitVersion.exe
 src/GitVersionRubyGem/bin/LibGit2Sharp.dll.config
 
+!**/*.cake

README.md

@@ -28,7 +28,7 @@ works out the [semantic version][semver] of the commit being built.
 
 ## Compatibility
 
-GitVersion works Windows, Linux, and Mac.
+GitVersion works on Windows, Linux, and Mac.
 
 Tip: If you get `System.TypeInitializationException: The type initializer for
 'LibGit2Sharp.Core.NativeMethods' threw an exception. --->

azure-pipelines.yml

@@ -9,7 +9,7 @@ stages:
         'Windows':
           VM_IMAGE: 'windows-latest'
         'Linux':
-          VM_IMAGE: 'ubuntu-16.04'
+          VM_IMAGE: 'ubuntu-latest'
         'macOS':
           VM_IMAGE: 'macOS-latest'
     pool:
@@ -25,7 +25,7 @@ stages:
         'Windows':
           VM_IMAGE: 'windows-latest'
         'Linux':
-          VM_IMAGE: 'ubuntu-16.04'
+          VM_IMAGE: 'ubuntu-latest'
         'macOS':
           VM_IMAGE: 'macOS-latest'
     pool:
@@ -44,11 +44,11 @@ stages:
   - template: build/stages/artifacts-test.yml
     parameters:
       name: Linux
-      vmImage: 'ubuntu-16.04'
-  - template: build/stages/artifacts-test.yml
-    parameters:
-      name: Windows
-      vmImage: 'windows-latest'
+      vmImage: 'ubuntu-latest'
+#   - template: build/stages/artifacts-test.yml
+#     parameters:
+#       name: Windows
+#       vmImage: 'windows-latest'
 
 - stage: Docker
   dependsOn: Artifact_Test
@@ -58,11 +58,11 @@ stages:
   - template: build/stages/docker.yml
     parameters:
       name: Linux
-      vmImage: 'ubuntu-16.04'
-  - template: build/stages/docker.yml
-    parameters:
-      name: Windows
-      vmImage: 'windows-latest'
+      vmImage: 'ubuntu-latest'
+#   - template: build/stages/docker.yml
+#     parameters:
+#       name: Windows
+#       vmImage: 'windows-latest'
 
 - stage: Publish
   dependsOn: Artifact_Test

build.cake

@@ -24,7 +24,6 @@
 // Install .NET Core Global tools.
 #tool "dotnet:?package=Codecov.Tool&version=1.7.2"
 #tool "dotnet:?package=GitReleaseManager.Tool&version=0.9.0"
-#tool "dotnet:?package=GitVersion.Tool&version=5.1.2"
 
 // Load other scripts.
 #load "./build/utils/parameters.cake"
@@ -107,7 +106,6 @@ Teardown<BuildParameters>((context, parameters) =>
 //////////////////////////////////////////////////////////////////////
 
 Task("Pack")
-    .IsDependentOn("Pack-Vsix")
     .IsDependentOn("Pack-Gem")
     .IsDependentOn("Pack-Nuget")
     .IsDependentOn("Pack-Chocolatey")
@@ -141,7 +139,6 @@ Task("Publish")
     .IsDependentOn("Publish-AzurePipeline")
     .IsDependentOn("Publish-NuGet")
     .IsDependentOn("Publish-Chocolatey")
-    .IsDependentOn("Publish-Vsix")
     .IsDependentOn("Publish-Gem")
     .Finally(() =>
 {

build.config

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

build/artifacts-test.cake

@@ -6,7 +6,6 @@ Task("Artifacts-Prepare")
     .IsDependentOnWhen("Pack-Nuget", singleStageRun)
     .Does<BuildParameters>((parameters) =>
 {
-    RunGitVersionOnCI(parameters);
 });
 
 Task("Artifacts-DotnetTool-Test")
@@ -20,8 +19,11 @@ Task("Artifacts-DotnetTool-Test")
 
     foreach(var dockerImage in parameters.Docker.Images)
     {
-        var cmd = $"dotnet tool install GitVersion.Tool --version {version} --tool-path {rootPrefix}/gitversion --add-source {rootPrefix}/nuget | out-null; ";
+        var cmd = $"$result = dotnet tool install GitVersion.Tool --version {version} --tool-path {rootPrefix}/gitversion --add-source {rootPrefix}/nuget | out-null; ";
+        cmd += "if($LASTEXITCODE -eq 0) { ";
         cmd += $"{rootPrefix}/gitversion/dotnet-gitversion {rootPrefix}/repo /showvariable FullSemver;";
+        cmd += "} else { echo $result }";
+
 
         DockerTestArtifact(dockerImage, parameters, cmd);
     }
@@ -39,8 +41,10 @@ Task("Artifacts-MsBuild-Test")
     foreach(var dockerImage in parameters.Docker.Images)
     {
         var (os, distro, targetframework) = dockerImage;
-        var cmd = $"dotnet build {rootPrefix}/repo/test --source {rootPrefix}/nuget --source https://api.nuget.org/v3/index.json -p:GitVersionTaskVersion={version} -p:TargetFramework={targetframework} | out-null; ";
+        var cmd = $"$result = dotnet build {rootPrefix}/repo/test --source {rootPrefix}/nuget --source https://api.nuget.org/v3/index.json -p:GitVersionTaskVersion={version} -p:TargetFramework={targetframework} *>&1; ";
+        cmd += "if($LASTEXITCODE -eq 0) { ";
         cmd += $"dotnet {rootPrefix}/repo/test/build/corefx/{targetframework}/TestRepo.dll;";
+        cmd += "} else { echo $result }";
 
         DockerTestArtifact(dockerImage, parameters, cmd);
     }

build/docker.cake

@@ -18,7 +18,6 @@ Task("Docker-Test")
     .IsDependentOn("Docker-Build")
     .Does<BuildParameters>((parameters) =>
 {
-    RunGitVersionOnCI(parameters);
     var settings = GetDockerRunSettings(parameters);
 
     foreach(var dockerImage in parameters.Docker.Images)

build/pack.cake

@@ -7,9 +7,6 @@ Task("Clean")
 
     CleanDirectories("./src/**/bin/" + parameters.Configuration);
     CleanDirectories("./src/**/obj");
-    CleanDirectories("./src/GitVersionVsixTask/scripts/**");
-
-    DeleteFiles("src/GitVersionVsixTask/*.vsix");
     DeleteFiles("src/GitVersionRubyGem/*.gem");
 
     CleanDirectories(parameters.Paths.Directories.ToClean);
@@ -20,21 +17,11 @@ Task("Build")
     .Does<BuildParameters>((parameters) =>
 {
     Build(parameters);
+    PublishGitVersionToArtifacts(parameters);
 
     RunGitVersionOnCI(parameters);
 });
 
-Task("Build-Vsix")
-    .IsDependentOn("Build")
-    .Does<BuildParameters>((parameters) =>
-{
-    var workDir = "./src/GitVersionVsixTask";
-    // build typescript code
-    NpmSet(new NpmSetSettings             { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, Key = "progress", Value = "false" });
-    NpmInstall(new NpmInstallSettings     { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent });
-    NpmRunScript(new NpmRunScriptSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, ScriptName = "build" });
-});
-
 #endregion
 
 #region Pack
@@ -49,7 +36,7 @@ Task("Pack-Prepare")
 
         var settings = new DotNetCorePublishSettings
         {
-            Framework = parameters.CoreFxVersion30,
+            Framework = parameters.CoreFxVersion31,
             Runtime = runtimeName,
             NoRestore = false,
             Configuration = parameters.Configuration,
@@ -66,24 +53,7 @@ Task("Pack-Prepare")
         DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", settings);
     }
 
-    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
-
-    // publish Framework-dependent deployment
-    foreach(var framework in frameworks)
-    {
-        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 };
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion472 };
 
     // MsBuild Task
     foreach(var framework in frameworks)
@@ -117,37 +87,6 @@ Task("Pack-Prepare")
     CopyFiles(sourceFiles, portableDir);
 });
 
-Task("Pack-Vsix")
-    .IsDependentOn("Build-Vsix")
-    .Does<BuildParameters>((parameters) =>
-{
-    var workDir = "./src/GitVersionVsixTask";
-    var idSuffix    = parameters.IsStableRelease() ? "" : "-preview";
-    var titleSuffix = parameters.IsStableRelease() ? "" : " (Preview)";
-    var visibility  = parameters.IsStableRelease() ? "Public" : "Preview";
-    var taskId      = parameters.IsStableRelease() ? "bab30d5c-39f3-49b0-a7db-9a5da6676eaa" : "dd065e3b-6aef-46af-845c-520195836b35";
-
-    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.json"), "$idSuffix$", idSuffix);
-    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.json"), "$titleSuffix$", titleSuffix);
-    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.json"), "$visibility$", visibility);
-    ReplaceTextInFile(new FilePath(workDir + "/GitVersionTask/task.json"), "$titleSuffix$", titleSuffix);
-
-    // update version number
-    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.json"), "$version$", parameters.Version.VsixVersion);
-    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"),
-        WorkingDirectory = workDir,
-        OutputPath = parameters.Paths.Directories.BuildArtifact
-    };
-
-    settings.ManifestGlobs = new List<string>(){ "vss-extension.json" };
-    TfxExtensionCreate(settings);
-});
-
 Task("Pack-Gem")
     .IsDependentOn("Pack-Prepare")
     .Does<BuildParameters>((parameters) =>

build/publish.cake

@@ -81,44 +81,6 @@ Task("Publish-AzurePipeline")
     publishingError = true;
 });
 
-Task("Publish-Vsix")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishVsix,       "Publish-Vsix was disabled.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Vsix works only on Windows agents.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Vsix works only on AzurePipeline.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Vsix works only for releases.")
-    .IsDependentOnWhen("Pack-Vsix", singleStageRun)
-    .Does<BuildParameters>((parameters) =>
-{
-    var token = parameters.Credentials.Tfx.Token;
-    if(string.IsNullOrEmpty(token)) {
-        throw new InvalidOperationException("Could not resolve Tfx token.");
-    }
-
-    var workDir = "./src/GitVersionVsixTask";
-    var settings = new TfxExtensionPublishSettings
-    {
-        ToolPath = workDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
-        AuthType = TfxAuthType.Pat,
-        Token = token,
-        ArgumentCustomization = args => args.Render() + " --no-wait-validation"
-    };
-
-    NpmSet(new NpmSetSettings             { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent, Key = "progress", Value = "false" });
-    NpmInstall(new NpmInstallSettings     { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent });
-
-    var vsixFilePath = parameters.Paths.Files.VsixOutputFilePath;
-    if (!FileExists(vsixFilePath)) {
-        vsixFilePath = GetFiles(parameters.Paths.Directories.BuildArtifact + "/*.vsix").First();
-    }
-    TfxExtensionPublish(vsixFilePath, settings);
-})
-.OnError(exception =>
-{
-    Information("Publish-Vsix Task failed, but continuing with next Task...");
-    Error(exception.Dump());
-    publishingError = true;
-});
-
 Task("Publish-Gem")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishGem,        "Publish-Gem was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Gem works only on Windows agents.")

build/stages/artifacts-test.yml

@@ -19,4 +19,4 @@ jobs:
       path: $(Build.SourcesDirectory)
       artifact: storage
   - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Artifacts-Test --docker_distro=$(DISTRO) --docker_dotnetversion=$(DOTNET_VERSION)
-    displayName: 'Docker Test Artifacts'
+    displayName: '[Docker Test Artifacts]'

build/stages/build.yml

@@ -1,13 +1,13 @@
 steps:
-- template: common-steps.yml
+- template: common-build-steps.yml
 - task: UseRubyVersion@0
   condition: ne( variables['Agent.OS'], 'Darwin' )
   displayName: 'Use .Ruby >= 2.5'
   inputs:
     versionSpec: '>= 2.5'
     addToPath: true
 - script: dotnet cake build.cake --bootstrap && dotnet cake build.cake --target=Pack
-  displayName: 'Cake build & pack'
+  displayName: '[Cake build & pack]'
 - publish: $(System.DefaultWorkingDirectory)
   displayName: 'Upload pipeline artifacts'
   condition: and(succeeded(), eq( variables['Agent.OS'], 'Windows_NT' ))

build/stages/common-build-steps.yml

@@ -0,0 +1,35 @@
+steps:
+- task: Cache@2
+  inputs:
+    key: 'tools | "$(Agent.OS)" | build.cake'
+    path: tools
+  displayName: Cache Cake tools
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 2.1'
+  inputs:
+    packageType: sdk
+    version: 2.1.802
+- task: UseDotNet@2
+  displayName: 'Use .NET Core sdk 3.1'
+  inputs:
+    packageType: sdk
+    version: 3.1.100
+- task: Bash@3
+  displayName: 'Env Vars'
+  inputs:
+    targetType: 'inline'
+    script: 'env | sort'
+- task: CmdLine@2
+  condition: eq( variables['Agent.OS'], 'Darwin' )
+  displayName: 'Use mono'
+  inputs:
+    script: |
+      SYMLINK=6.4.0
+      MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$SYMLINK
+      echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
+      echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
+      echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
+      sudo rm /Library/Frameworks/Mono.framework/Versions/Current
+      sudo ln -s $MONOPREFIX /Library/Frameworks/Mono.framework/Versions/Current
+- script: dotnet tool install --global Cake.Tool
+  displayName: 'Install Cake tool'