Skip to content

Commit

Permalink
Merge branch 'release/5.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
GeertvanHorrik committed Apr 12, 2021
2 parents 5da5116 + d010125 commit c145e62
Show file tree
Hide file tree
Showing 40 changed files with 1,139 additions and 1,364 deletions.
1 change: 1 addition & 0 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Parameters["UseVisualStudioPrerelease"] = "false";
Parameters["SkipComponentsThatAreNotDeployable"] = "false";
Parameters["BuildCostura"] = "true";
Parameters["DeployCostura"] = "false";
Parameters["NuGet_NoDependencies"] = "false";

// Note: the rest of the variables should be coming from the build server,
// see `/deployment/cake/*-variables.cake` for customization options
Expand Down
240 changes: 9 additions & 231 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,235 +1,13 @@
##########################################################################
# This is the Cake bootstrapper script for PowerShell.
# This file was downloaded from https://github.com/cake-build/resources
# Feel free to change this file to fit your needs.
##########################################################################
$ErrorActionPreference = 'Stop'

<#
Set-Location -LiteralPath $PSScriptRoot

.SYNOPSIS
This is a Powershell script to bootstrap a Cake build.
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1'
$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1'
$env:DOTNET_NOLOGO = '1'

.DESCRIPTION
This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
and execute your Cake build script with the parameters you provide.
dotnet tool restore
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

.PARAMETER Script
The build script to execute.
.PARAMETER Target
The build script target to run.
.PARAMETER Configuration
The build configuration to use.
.PARAMETER Verbosity
Specifies the amount of information to be displayed.
.PARAMETER ShowDescription
Shows description about tasks.
.PARAMETER DryRun
Performs a dry run.
.PARAMETER Experimental
Uses the nightly builds of the Roslyn script engine.
.PARAMETER Mono
Uses the Mono Compiler rather than the Roslyn script engine.
.PARAMETER SkipToolPackageRestore
Skips restoring of packages.
.PARAMETER ScriptArgs
Remaining arguments are added here.
.LINK
https://cakebuild.net
#>

[CmdletBinding()]
Param(
[string]$Script = "build.cake",
[string]$Target,
[string]$Configuration,
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
[string]$Verbosity,
[switch]$ShowDescription,
[Alias("WhatIf", "Noop")]
[switch]$DryRun,
[switch]$Experimental,
[switch]$Mono,
[switch]$SkipToolPackageRestore,
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
[string[]]$ScriptArgs
)

[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
function MD5HashFile([string] $filePath)
{
if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
{
return $null
}

[System.IO.Stream] $file = $null;
[System.Security.Cryptography.MD5] $md5 = $null;
try
{
$md5 = [System.Security.Cryptography.MD5]::Create()
$file = [System.IO.File]::OpenRead($filePath)
return [System.BitConverter]::ToString($md5.ComputeHash($file))
}
finally
{
if ($file -ne $null)
{
$file.Dispose()
}
}
}

function GetProxyEnabledWebClient
{
$wc = New-Object System.Net.WebClient
$proxy = [System.Net.WebRequest]::GetSystemWebProxy()
$proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
$wc.Proxy = $proxy
return $wc
}

Write-Host "Preparing to run build script..."

if(!$PSScriptRoot){
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
}

$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"

# Make sure tools folder exists
if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
Write-Verbose -Message "Creating tools directory..."
New-Item -Path $TOOLS_DIR -Type directory | out-null
}

# Make sure that packages.config exist.
if (!(Test-Path $PACKAGES_CONFIG)) {
Write-Verbose -Message "Downloading packages.config..."
try {
$wc = GetProxyEnabledWebClient
$wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
Throw "Could not download packages.config."
}
}

# Try find NuGet.exe in path if not exists
if (!(Test-Path $NUGET_EXE)) {
Write-Verbose -Message "Trying to find nuget.exe in PATH..."
$existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
$NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
$NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
}
}

# Try download NuGet.exe if not exists
if (!(Test-Path $NUGET_EXE)) {
Write-Verbose -Message "Downloading NuGet.exe..."
try {
$wc = GetProxyEnabledWebClient
$wc.DownloadFile($NUGET_URL, $NUGET_EXE)
} catch {
Throw "Could not download NuGet.exe."
}
}

# Save nuget.exe path to environment to be available to child processed
$ENV:NUGET_EXE = $NUGET_EXE

# Restore tools from NuGet?
if(-Not $SkipToolPackageRestore.IsPresent) {
Push-Location
Set-Location $TOOLS_DIR

# Check for changes in packages.config and remove installed tools if true.
[string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
Write-Verbose -Message "Missing or changed package.config hash..."
Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
Remove-Item -Recurse
}

Write-Verbose -Message "Restoring tools from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""

if ($LASTEXITCODE -ne 0) {
Throw "An error occurred while restoring NuGet tools."
}
else
{
$md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
}
Write-Verbose -Message ($NuGetOutput | out-string)

Pop-Location
}

# Restore addins from NuGet
if (Test-Path $ADDINS_PACKAGES_CONFIG) {
Push-Location
Set-Location $ADDINS_DIR

Write-Verbose -Message "Restoring addins from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""

if ($LASTEXITCODE -ne 0) {
Throw "An error occurred while restoring NuGet addins."
}

Write-Verbose -Message ($NuGetOutput | out-string)

Pop-Location
}

# Restore modules from NuGet
if (Test-Path $MODULES_PACKAGES_CONFIG) {
Push-Location
Set-Location $MODULES_DIR

Write-Verbose -Message "Restoring modules from NuGet..."
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""

if ($LASTEXITCODE -ne 0) {
Throw "An error occurred while restoring NuGet modules."
}

Write-Verbose -Message ($NuGetOutput | out-string)

Pop-Location
}

# Make sure that Cake has been installed.
if (!(Test-Path $CAKE_EXE)) {
Throw "Could not find Cake.exe at $CAKE_EXE"
}



# Build Cake arguments
$cakeArguments = @("$Script");
if ($Target) { $cakeArguments += "-target=$Target" }
if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
if ($ShowDescription) { $cakeArguments += "-showdescription" }
if ($DryRun) { $cakeArguments += "-dryrun" }
if ($Experimental) { $cakeArguments += "-experimental" }
if ($Mono) { $cakeArguments += "-mono" }
$cakeArguments += $ScriptArgs

# Start Cake
Write-Host "Running build script..."
&$CAKE_EXE $cakeArguments
exit $LASTEXITCODE
dotnet cake @args
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
14 changes: 11 additions & 3 deletions deployment/cake/generic-variables.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#l "buildserver.cake"

#tool "nuget:?package=GitVersion.CommandLine&version=5.6.6"
#tool "nuget:?package=GitVersion.CommandLine&version=5.6.8"

//-------------------------------------------------------------

Expand Down Expand Up @@ -207,14 +207,19 @@ public class NuGetContext : BuildContextBase
public string Executable { get; set; }
public string LocalPackagesDirectory { get; set; }

public bool RestoreUsingNuGet { get; set; }
public bool RestoreUsingDotNetRestore { get; set; }
public bool NoDependencies { get; set; }

protected override void ValidateContext()
{

}

protected override void LogStateInfoForContext()
{

CakeContext.Information($"Restore using NuGet: '{RestoreUsingNuGet}'");
CakeContext.Information($"Restore using dotnet restore: '{RestoreUsingDotNetRestore}'");
}
}

Expand Down Expand Up @@ -395,7 +400,10 @@ private GeneralContext InitializeGeneralContext(BuildContext buildContext, IBuil
{
PackageSources = buildContext.BuildServer.GetVariable("NuGetPackageSources", showValue: true),
Executable = "./tools/nuget.exe",
LocalPackagesDirectory = "c:\\source\\_packages"
LocalPackagesDirectory = "c:\\source\\_packages",
RestoreUsingNuGet = buildContext.BuildServer.GetVariableAsBool("NuGet_RestoreUsingNuGet", false, showValue: true),
RestoreUsingDotNetRestore = buildContext.BuildServer.GetVariableAsBool("NuGet_RestoreUsingDotNetRestore", true, showValue: true),
NoDependencies = buildContext.BuildServer.GetVariableAsBool("NuGet_NoDependencies", true, showValue: true)
};

var solutionName = buildContext.BuildServer.GetVariable("SolutionName", showValue: true);
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/github-pages-tasks.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#l "github-pages-variables.cake"

#addin "nuget:?package=Cake.Git&version=1.0.0"
#addin "nuget:?package=Cake.Git&version=1.0.1"

//-------------------------------------------------------------

Expand Down
6 changes: 6 additions & 0 deletions deployment/cake/installers-squirrel.cake
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ public class SquirrelInstaller : IInstaller
.Replace($"{projectName}_{channel}-", string.Empty)
.Replace($"-full.nupkg", string.Empty);

// Exception for full releases, they don't contain the channel name
if (channel == "stable")
{
releaseVersion = releaseVersion.Replace($"{projectName}-", string.Empty);
}

var release = new DeploymentRelease
{
Name = releaseVersion,
Expand Down
14 changes: 13 additions & 1 deletion deployment/cake/lib-msbuild.cake
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ private static void RunMsBuild(BuildContext buildContext, string projectName, st
//
// IMPORTANT NOTE --- READ <=============================================

var totalStopwatch = Stopwatch.StartNew();
var buildStopwatch = Stopwatch.StartNew();

// Enforce additional logging for issues
var action = "build";
//var logPath = System.IO.Path.Combine(buildContext.General.OutputRootDirectory, string.Format(@"MsBuild_{0}_{1}_log.binlog", projectName, action));
Expand All @@ -172,9 +175,13 @@ private static void RunMsBuild(BuildContext buildContext, string projectName, st
}

buildContext.CakeContext.Information(string.Empty);
buildContext.CakeContext.Information($"Done building project, investigating potential issues using '{logPath}'");
buildContext.CakeContext.Information($"Done building project, took '{buildStopwatch.Elapsed}'");
buildContext.CakeContext.Information(string.Empty);
buildContext.CakeContext.Information($"Investigating potential issues using '{logPath}'");
buildContext.CakeContext.Information(string.Empty);

var investigationStopwatch = Stopwatch.StartNew();

var issuesContext = buildContext.CakeContext.MsBuildIssuesFromFilePath(logPath, buildContext.CakeContext.MsBuildXmlFileLoggerFormat());
//var issuesContext = buildContext.CakeContext.MsBuildIssuesFromFilePath(logPath, buildContext.CakeContext.MsBuildBinaryLogFileFormat());

Expand Down Expand Up @@ -216,6 +223,11 @@ private static void RunMsBuild(BuildContext buildContext, string projectName, st
}
}

buildContext.CakeContext.Information(string.Empty);
buildContext.CakeContext.Information($"Done investigating project, took '{investigationStopwatch.Elapsed}'");
buildContext.CakeContext.Information($"Total msbuild (build + investigation) took '{totalStopwatch.Elapsed}'");
buildContext.CakeContext.Information(string.Empty);

if (failBuild)
{
buildContext.CakeContext.Information(string.Empty);
Expand Down
15 changes: 13 additions & 2 deletions deployment/cake/lib-nuget.cake
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ private static void RestoreNuGetPackages(BuildContext buildContext, Cake.Core.IO

private static void RestoreNuGetPackagesUsingNuGet(BuildContext buildContext, Cake.Core.IO.FilePath solutionOrProjectFileName, List<string> sources)
{
if (!buildContext.General.NuGet.RestoreUsingNuGet)
{
return;
}

buildContext.CakeContext.LogSeparator("Restoring packages for '{0}' using 'NuGet'", solutionOrProjectFileName);

try
Expand Down Expand Up @@ -94,6 +99,11 @@ private static void RestoreNuGetPackagesUsingNuGet(BuildContext buildContext, Ca

private static void RestoreNuGetPackagesUsingDotnetRestore(BuildContext buildContext, Cake.Core.IO.FilePath solutionOrProjectFileName, List<string> sources, List<string> runtimeIdentifiers)
{
if (!buildContext.General.NuGet.RestoreUsingDotNetRestore)
{
return;
}

buildContext.CakeContext.LogSeparator("Restoring packages for '{0}' using 'dotnet restore'", solutionOrProjectFileName);

var projectFileContents = System.IO.File.ReadAllText(solutionOrProjectFileName.FullPath)?.ToLower();
Expand Down Expand Up @@ -133,13 +143,14 @@ private static void RestoreNuGetPackagesUsingDotnetRestore(BuildContext buildCon
ForceEvaluate = false,
IgnoreFailedSources = true,
NoCache = false,
NoDependencies = false, // use true to speed up things
NoDependencies = buildContext.General.NuGet.NoDependencies, // use true to speed up things
Verbosity = DotNetCoreVerbosity.Normal
};

if (!string.IsNullOrWhiteSpace(runtimeIdentifier))
{
// This is a explicit supported runtime identifier, force re-evaluation
buildContext.CakeContext.Information("Project restore uses explicit runtime identifier, forcing re-evaluation");

restoreSettings.Force = true;
restoreSettings.ForceEvaluate = true;
restoreSettings.Runtime = runtimeIdentifier;
Expand Down
2 changes: 1 addition & 1 deletion deployment/cake/lib-octopusdeploy.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#tool "nuget:?package=OctopusTools&version=7.4.3116"
#tool "nuget:?package=OctopusTools&version=7.4.3160"

public class OctopusDeployIntegration : IntegrationBase
{
Expand Down

0 comments on commit c145e62

Please sign in to comment.