using the latest LTS for dotnet

use the cakebuild powershell bootstrapper
remove FixForMono as now cake support running with mono

Author: arturcic

.travis.yml

@@ -1,7 +1,7 @@
 language: csharp
 sudo: required
 dist: trusty
-dotnet: 2.1.500
+dotnet: 2.1.503
 mono:
   - latest
 os:

azure-pipelines.yml

@@ -1,37 +1,21 @@
+variables:
+  DOTNET_SDK_VERSION: '2.1.503'
+  DOTNET_PACKAGE_TYPE: 'sdk'
+  RUBY_VERSION: '2.5'
+
 jobs:
-- job: macOS
-  pool:
+- template: build/tmpl/jobs.yml
+  parameters:
+    name: macOS
     vmImage: 'macOS 10.13'
-  steps:
-  - task: DotNetCoreInstaller@0
-    displayName: 'Use .NET Core sdk 2.1.500'
-    inputs:
-      version: 2.1.500
-  - powershell: ./build.ps1 -script build.cake -target Default
-    displayName: 'Cake build'
-- job: Linux
-  pool:
+    installRuby: 'false'
+
+- template: build/tmpl/jobs.yml
+  parameters:
+    name: Linux
     vmImage: 'Ubuntu 16.04'
-  steps:
-  - task: DotNetCoreInstaller@0
-    displayName: 'Use .NET Core sdk 2.1.500'
-    inputs:
-      version: 2.1.500
-  - task: UseRubyVersion@0
-    inputs:
-      addToPath: true # Optional
-  - powershell: ./build.ps1 -script build.cake -target Default
-    displayName: 'Cake build'
-- job: Windows
-  pool:
+
+- template: build/tmpl/jobs.yml
+  parameters:
+    name: Windows
     vmImage: 'VS2017-Win2016'
-  steps:
-  - task: DotNetCoreInstaller@0
-    displayName: 'Use .NET Core sdk 2.1.500'
-    inputs:
-      version: 2.1.500
-  - task: UseRubyVersion@0
-    inputs:
-      addToPath: true # Optional
-  - powershell: ./build.ps1 -script build.cake -target Default
-    displayName: 'Cake build'

build.cake

@@ -1,3 +1,5 @@
+// Install modules
+#module nuget:?package=Cake.DotNetTool.Module&version=0.1.0
 
 // Install addins.
 #addin "nuget:?package=Cake.Gitter&version=0.9.0"
@@ -17,6 +19,10 @@
 #tool "nuget:?package=GitReleaseNotes&version=0.7.1"
 #tool "nuget:?package=ILRepack&version=2.0.16"
 #tool "nuget:?package=Codecov&version=1.1.0"
+#tool "nuget:?package=nuget.commandline&version=4.9.2"
+
+// Install .NET Core Global tools.
+#tool "dotnet:?package=GitReleaseManager.Tool&version=0.8.0"
 
 // Load other scripts.
 #load "./build/parameters.cake"
@@ -184,7 +190,6 @@ Task("Test")
         nunitSettings.Agents = 1;
     }
 
-    FixForMono(nunitSettings, "nunit3-console.exe");
     NUnit3(testAssemblies, nunitSettings);
 });
 
@@ -323,7 +328,6 @@ Task("Pack-Nuget")
                         .ToArray()
             };
 
-            FixForMono(nugetSettings, "nuget.exe");
             NuGetPack(package.NuspecPath, nugetSettings);
         }
     }
@@ -516,7 +520,7 @@ Task("Publish-AzurePipeline")
 
     if (FileExists(parameters.Paths.Files.TestCoverageOutputFilePath)) {
         var data = new TFBuildPublishTestResultsData {
-            TestResultsFiles = new[] { parameters.Paths.Files.TestCoverageOutputFilePath.ToString() },
+            TestResultsFiles = new[] { parameters.Paths.Files.TestCoverageOutputFilePath },
             TestRunner = TFTestRunnerType.NUnit
         };
         TFBuild.Commands.PublishTestResults(data);
@@ -533,7 +537,7 @@ Task("Publish-Tfs")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishTfs,   "Publish-Tfs was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,  "Publish-Tfs works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-Tfs works only on AppVeyor.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(), "Publish-Tfs works only for releases.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(),   "Publish-Tfs works only for releases.")
     .IsDependentOn("Pack-Tfs")
     .Does<BuildParameters>((parameters) =>
 {

build.config

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+CAKE_VERSION=0.32.1
+DOTNET_VERSION=2.1.503

build.ps1

@@ -45,45 +45,62 @@ Param(
 )
 
 Write-Host "Preparing to run build script..."
+$DotNetInstallerUri = 'https://dot.net/v1/dotnet-install.ps1';
+$DotNetUnixInstallerUri = 'https://dot.net/v1/dotnet-install.sh'
+$DotNetChannel = 'LTS'
+$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 
-if ($PSEdition -eq "Desktop") { $IsWindows = $true }
-
-$CakeVersion = "0.31.0"
-
-$DotNetChannel = "Current";
-$DotNetInstaller = if ($IsWindows) { "dotnet-install.ps1" } else { "dotnet-install.sh" }
-$DotNetInstallerUri = "https://dot.net/v1/$DotNetInstaller";
-$DotNetVersion = (Get-Content ./src/global.json | ConvertFrom-Json).sdk.version;
-
-$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+[string] $CakeVersion = ''
+[string] $DotNetVersion= ''
+foreach($line in Get-Content "$PSScriptRoot\build.config")
+{
+  if ($line -like 'CAKE_VERSION=*') {
+      $CakeVersion = $line.SubString(13)
+  }
+  elseif ($line -like 'DOTNET_VERSION=*') {
+      $DotNetVersion =$line.SubString(15)
+  }
+}
 
-$PathSplitter = if ($IsWindows) { ';' } else { ':' }
 
-# SSL FIX
-[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
+if ([string]::IsNullOrEmpty($CakeVersion) -or [string]::IsNullOrEmpty($DotNetVersion)) {
+    'Failed to parse Cake / .NET Core SDK Version'
+    exit 1
+}
 
 # Make sure tools folder exists
-$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 $ToolPath = Join-Path $PSScriptRoot "tools"
 if (!(Test-Path $ToolPath)) {
     Write-Verbose "Creating tools directory..."
-    New-Item -Path $ToolPath -Type directory | out-null
+    New-Item -Path $ToolPath -Type Directory -Force | out-null
 }
 
+# SSL FIX
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
+
 ###########################################################################
 # INSTALL .NET CORE CLI
 ###########################################################################
-function Remove-PathVariable([string]$VariableToRemove) {
+
+Function Remove-PathVariable([string]$VariableToRemove)
+{
+    $SplitChar = ';'
+    if ($IsMacOS -or $IsLinux) {
+        $SplitChar = ':'
+    }
+
     $path = [Environment]::GetEnvironmentVariable("PATH", "User")
-    if ($path -ne $null) {
-        $newItems = $path.Split($PathSplitter, [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join($PathSplitter, $newItems), "User")
+    if ($path -ne $null)
+    {
+        $newItems = $path.Split($SplitChar, [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
+        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join($SplitChar, $newItems), "User")
     }
 
     $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
-    if ($path -ne $null) {
-        $newItems = $path.Split($PathSplitter, [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join($PathSplitter, $newItems), "Process")
+    if ($path -ne $null)
+    {
+        $newItems = $path.Split($SplitChar, [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
+        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join($SplitChar, $newItems), "Process")
     }
 }
 
@@ -95,55 +112,59 @@ if (Get-Command dotnet -ErrorAction SilentlyContinue) {
 
 if($FoundDotNetCliVersion -ne $DotNetVersion) {
     $InstallPath = Join-Path $PSScriptRoot ".dotnet"
-
     if (!(Test-Path $InstallPath)) {
-        New-Item -ItemType Directory $InstallPath | Out-Null;
+        New-Item -Path $InstallPath -ItemType Directory -Force | Out-Null;
     }
 
-    [string] $InstalledDotNetVersion = Get-ChildItem -Path ./.dotnet -File `
-                                        | Where-Object { $_.Name -eq 'dotnet' -or $_.Name -eq 'dotnet.exe' } `
-                                        | ForEach-Object { &$_.FullName --version }
-
-    if ($InstalledDotNetVersion -ne $DotNetVersion)
-    {
-        (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath/$DotNetInstaller");
-        $Cmd = "$InstallPath/$DotNetInstaller -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath -NoPath"
-        if (!$IsWindows) { $Cmd = "bash $Cmd" }
-        Invoke-Expression "& $Cmd"
+    if ($IsMacOS -or $IsLinux) {
+        (New-Object System.Net.WebClient).DownloadFile($DotNetUnixInstallerUri, "$InstallPath\dotnet-install.sh");
+        & bash $InstallPath\dotnet-install.sh --version "$DotNetVersion" --install-dir "$InstallPath" --channel "$DotNetChannel" --no-path
+    }
+    else {
+        (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1");
+        & $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath;
     }
 
-    # Ensure the installed .NET Core CLI is always used but putting it on the front of the path.
     Remove-PathVariable "$InstallPath"
-    $env:PATH = "$InstallPath$PathSplitter$env:PATH"
-    $env:DOTNET_ROOT="$InstallPath"
+    $env:PATH = "$InstallPath;$env:PATH"
 }
 
-# Temporarily skip verification of addins.
-$env:CAKE_SETTINGS_SKIPVERIFICATION='true'
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-###########################################################################
-# INSTALL NUGET
-###########################################################################
-
-# Make sure nuget.exe exists.
-$NugetPath = Join-Path $ToolPath "nuget.exe"
-if (!(Test-Path $NugetPath)) {
-    Write-Host "Downloading NuGet.exe..."
-    (New-Object System.Net.WebClient).DownloadFile($NugetUrl, $NugetPath);
-}
 
 ###########################################################################
 # INSTALL CAKE
 ###########################################################################
 
 # Make sure Cake has been installed.
-Write-Host "Installing Cake..."
-$CakeInstallPath = Join-Path $PSScriptRoot ".cake"
-if (!(Test-Path $CakeInstallPath)) {
-    New-Item -ItemType Directory $CakeInstallPath | Out-Null;
-    Invoke-Expression "& dotnet tool install Cake.Tool --version $CakeVersion --tool-path $CakeInstallPath"
+[string] $CakeExePath = ''
+[string] $CakeInstalledVersion = Get-Command dotnet-cake -ErrorAction SilentlyContinue  | % {&$_.Source --version}
+
+if ($CakeInstalledVersion -eq $CakeVersion) {
+    # Cake found locally
+    $CakeExePath = (Get-Command dotnet-cake).Source
+}
+else {
+    $CakePath = Join-Path $ToolPath ".store\cake.tool\$CakeVersion"
+    $CakeExePath = (Get-ChildItem -Path $ToolPath -Filter "dotnet-cake*" -File| ForEach-Object FullName | Select-Object -First 1)
+
+
+    if ((!(Test-Path -Path $CakePath -PathType Container)) -or (!(Test-Path $CakeExePath -PathType Leaf))) {
+
+        if ((![string]::IsNullOrEmpty($CakeExePath)) -and (Test-Path $CakeExePath -PathType Leaf))
+        {
+            & dotnet tool uninstall --tool-path $ToolPath Cake.Tool
+        }
+
+        & dotnet tool install --tool-path $ToolPath --version $CakeVersion Cake.Tool
+        if ($LASTEXITCODE -ne 0)
+        {
+            'Failed to install cake'
+            exit 1
+        }
+        $CakeExePath = (Get-ChildItem -Path $ToolPath -Filter "dotnet-cake*" -File| ForEach-Object FullName | Select-Object -First 1)
+    }
 }
 
 # ###########################################################################
@@ -162,8 +183,11 @@ $Arguments = @{
 # Start Cake
 Write-Host "Running build script..."
 
-$Cmd = "$CakeInstallPath/dotnet-cake $Script $Arguments"
-Invoke-Expression "& $Cmd"
+& "$CakeExePath" $Script --bootstrap
+if ($LASTEXITCODE -eq 0)
+{
+    & "$CakeExePath" $Script $Arguments
+}
 
 if ($env:APPVEYOR) {
     $host.SetShouldExit($LASTEXITCODE)

build/tmpl/jobs.yml

@@ -0,0 +1,21 @@
+parameters:
+  name: ''  # defaults for any parameters that aren't specified
+  vmImage: ''
+  installRuby: 'true'
+jobs:
+- job: ${{ parameters.name }}
+  pool:
+    vmImage: ${{ parameters.vmImage }}
+  steps:
+  - task: DotNetCoreInstaller@0
+    displayName: 'Use .NET Core sdk $(DOTNET_SDK_VERSION)'
+    inputs:
+      version: $(DOTNET_SDK_VERSION)
+      packageType: $(DOTNET_PACKAGE_TYPE)
+  - ${{ if eq(parameters.installRuby, 'true') }}:
+    - task: UseRubyVersion@0
+      inputs:
+        versionSpec: $(RUBY_VERSION)
+        addToPath: true # Optional
+  - powershell: ./build.ps1 -script build.cake -target Default
+    displayName: 'Cake build'

build/utils.cake

@@ -8,16 +8,6 @@ FilePath FindToolInPath(string tool)
     return paths.Select(path => new DirectoryPath(path).CombineWithFilePath(tool)).FirstOrDefault(filePath => FileExists(filePath.FullPath));
 }
 
-void FixForMono(Cake.Core.Tooling.ToolSettings toolSettings, string toolExe)
-{
-    if (IsRunningOnUnix())
-    {
-        var toolPath = Context.Tools.Resolve(toolExe);
-        toolSettings.ToolPath = FindToolInPath("mono");
-        toolSettings.ArgumentCustomization = args => toolPath.FullPath + " " + args.Render();
-    }
-}
-
 DirectoryPath HomePath()
 {
     return IsRunningOnWindows()
@@ -107,7 +97,6 @@ void ILRepackGitVersionExe(bool includeLibGit2Sharp, DirectoryPath target, Direc
         settings.Libs = new List<DirectoryPath> { libFolder };
     }
 
-    FixForMono(settings, "ILRepack.exe");
     ILRepack(outFilePath, targetPath, sourceFiles, settings);
 
     CopyFileToDirectory("./LICENSE", ilMergeDir);

src/GitVersion.sln.DotSettings

@@ -549,6 +549,7 @@ II.2.12 <HandlesEvent />
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

src/GitVersionTfsTask/package-lock.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "2.1.500"
+        "version": "2.1.503"
     }
 }