diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bd7f20b9423..030173cb6ee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -45,12 +45,12 @@ jobs: #- powershell: .\build\Install-WindowsSdkISO.ps1 19041 # displayName: Insider SDK - - powershell: .\build\build.ps1 -target=Build + - powershell: .\build\build.ps1 -Target Build displayName: Build ### Unit Tests ### - - powershell: .\build\build.ps1 -target=Test + - powershell: .\build\build.ps1 -Target Test displayName: Test - task: PublishTestResults@2 @@ -62,7 +62,7 @@ jobs: ### UI Integration Tests ### - - powershell: .\build\build.ps1 -target=UITest + - powershell: .\build\build.ps1 -Target UITest displayName: UI Integration Tests - task: PublishPipelineArtifact@1 @@ -81,7 +81,7 @@ jobs: ### Package ### - - powershell: .\build\build.ps1 -target=Package + - powershell: .\build\build.ps1 -Target Package displayName: Package - task: PowerShell@2 @@ -123,7 +123,7 @@ jobs: - script: nbgv cloud displayName: Set Version - - powershell: .\build\build.ps1 -target=SmokeTest + - powershell: .\build\build.ps1 -Target SmokeTest displayName: SmokeTest - task: CopyFiles@2 diff --git a/build/StyleXaml.bat b/build/StyleXaml.bat index b03dcbd2aed..3ebd1ccde66 100644 --- a/build/StyleXaml.bat +++ b/build/StyleXaml.bat @@ -1,3 +1,3 @@ @ECHO OFF -PowerShell.exe -file "%~dp0build.ps1" -target=StyleXaml +PowerShell.exe -file "%~dp0build.ps1" -Target StyleXaml PAUSE \ No newline at end of file diff --git a/build/UpdateHeaders.bat b/build/UpdateHeaders.bat index 166ea21217a..55872778b6e 100644 --- a/build/UpdateHeaders.bat +++ b/build/UpdateHeaders.bat @@ -1,3 +1,3 @@ @ECHO OFF -PowerShell.exe -file "%~dp0build.ps1" -target=UpdateHeaders +PowerShell.exe -file "%~dp0build.ps1" -Target UpdateHeaders PAUSE \ No newline at end of file diff --git a/build/build.cake b/build/build.cake index 14c3649c144..82be1b88c10 100644 --- a/build/build.cake +++ b/build/build.cake @@ -1,10 +1,10 @@ -#module nuget:?package=Cake.LongPath.Module&version=0.7.0 +#module nuget:?package=Cake.LongPath.Module&version=1.0.1 -#addin nuget:?package=Cake.FileHelpers&version=3.2.1 -#addin nuget:?package=Cake.Powershell&version=0.4.8 -#addin nuget:?package=Cake.GitVersioning&version=3.3.37 +#addin nuget:?package=Cake.FileHelpers&version=4.0.1 +#addin nuget:?package=Cake.Powershell&version=1.0.1 +#addin nuget:?package=Cake.GitVersioning&version=3.4.220 -#tool nuget:?package=MSTest.TestAdapter&version=2.1.0 +#tool nuget:?package=MSTest.TestAdapter&version=2.2.5 #tool nuget:?package=vswhere&version=2.8.4 using System; @@ -94,7 +94,7 @@ void VerifyHeaders(bool Replace) if(!Replace && hasMissing) { - throw new Exception("Please run UpdateHeaders.bat or '.\\build.ps1 -target=UpdateHeaders' and commit the changes."); + throw new Exception("Please run UpdateHeaders.bat or '.\\build.ps1 -Target UpdateHeaders' and commit the changes."); } } @@ -259,7 +259,7 @@ Task("Test") { Configuration = "Release", NoBuild = true, - Logger = "trx;LogFilePrefix=VsTestResults", + Loggers = new[] { "trx;LogFilePrefix=VsTestResults" }, Verbosity = DotNetCoreVerbosity.Normal, ArgumentCustomization = arg => arg.Append($"-s {baseDir}/.runsettings"), }; @@ -306,7 +306,7 @@ Task("MSTestUITest") { Configuration = "Release", NoBuild = true, - Logger = "trx;LogFilePrefix=VsTestResults", + Loggers = new[] { "trx;LogFilePrefix=VsTestResults" }, Verbosity = DotNetCoreVerbosity.Normal }; DotNetCoreTest(file.FullPath, testSettings); diff --git a/build/build.ps1 b/build/build.ps1 index deed10851c4..18078054a26 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -13,19 +13,18 @@ This is a Powershell script to bootstrap a Cake build. This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) and execute your Cake build script with the parameters you provide. +.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 Experimental -Tells Cake to use the latest Roslyn release. -.PARAMETER WhatIf -Performs a dry run of the build script. -No tasks will be executed. -.PARAMETER Mono -Tells Cake to use the Mono scripting engine. +.PARAMETER ShowDescription +Shows description about tasks. +.PARAMETER DryRun +Performs a dry run. .PARAMETER SkipToolPackageRestore Skips restoring of packages. .PARAMETER ScriptArgs @@ -38,18 +37,41 @@ https://cakebuild.net [CmdletBinding()] Param( - [string]$Target = "Default", + [string]$Script, + [string]$Target, + [string]$Configuration, [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity = "Verbose", - [switch]$Experimental, - [Alias("DryRun","Noop")] - [switch]$WhatIf, - [switch]$Mono, + [string]$Verbosity, + [switch]$ShowDescription, + [Alias("WhatIf", "Noop")] + [switch]$DryRun, [switch]$SkipToolPackageRestore, [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] [string[]]$ScriptArgs ) +# This is an automatic variable in PowerShell Core, but not in Windows PowerShell 5.x +if (-not (Test-Path variable:global:IsCoreCLR)) { + $IsCoreCLR = $false +} + +# Attempt to set highest encryption available for SecurityProtocol. +# PowerShell will not set this by default (until maybe .NET 4.6.x). This +# will typically produce a message for PowerShell v2 (just an info +# message though) +try { + # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) + # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't + # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is + # installed (.NET 4.5 is an in-place upgrade). + # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. + if (-not $IsCoreCLR) { + [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 + } + } catch { + Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' + } + [Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null function MD5HashFile([string] $filePath) { @@ -72,58 +94,60 @@ function MD5HashFile([string] $filePath) { $file.Dispose() } + + if ($md5 -ne $null) + { + $md5.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 } +if(!$Script){ + $Script = Join-Path $PSScriptRoot "build.cake" +} $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" -$MODULES_DIR = Join-Path $PSScriptRoot "tools/modules" +$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" $MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" -$MODULES_PACKAGES_CONFIG_MD5 = Join-Path $MODULES_DIR "packages.config.md5sum" - -# Should we use mono? -$UseMono = ""; -if($Mono.IsPresent) { - Write-Verbose -Message "Using the Mono based scripting engine." - $UseMono = "-mono" -} -# Should we use the new Roslyn? -$UseExperimental = ""; -if($Experimental.IsPresent -and !($Mono.IsPresent)) { - Write-Verbose -Message "Using experimental version of Roslyn." - $UseExperimental = "-experimental" -} - -# Is this a dry run? -$UseDryRun = ""; -if($WhatIf.IsPresent) { - $UseDryRun = "-dryrun" -} +$env:CAKE_PATHS_TOOLS = $TOOLS_DIR +$env:CAKE_PATHS_ADDINS = $ADDINS_DIR +$env:CAKE_PATHS_MODULES = $MODULES_DIR # 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 + New-Item -Path $TOOLS_DIR -Type Directory | Out-Null } -# Fix to force PS to use TLS12 -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - # Make sure that packages.config exist. if (!(Test-Path $PACKAGES_CONFIG)) { Write-Verbose -Message "Downloading packages.config..." - try { (New-Object System.Net.WebClient).DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch { + try { + $wc = GetProxyEnabledWebClient + $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) + } catch { Throw "Could not download packages.config." } } @@ -143,14 +167,26 @@ if (!(Test-Path $NUGET_EXE)) { if (!(Test-Path $NUGET_EXE)) { Write-Verbose -Message "Downloading NuGet.exe..." try { - (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE) + $wc = GetProxyEnabledWebClient + $wc.DownloadFile($NUGET_URL, $NUGET_EXE) } catch { Throw "Could not download NuGet.exe." } } +# These are automatic variables in PowerShell Core, but not in Windows PowerShell 5.x +if (-not (Test-Path variable:global:ismacos)) { + $IsLinux = $false + $IsMacOS = $false +} + # Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE +$env:NUGET_EXE = $NUGET_EXE +$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { + "mono `"$NUGET_EXE`"" +} else { + "`"$NUGET_EXE`"" +} # Restore tools from NuGet? if(-Not $SkipToolPackageRestore.IsPresent) { @@ -158,15 +194,17 @@ if(-Not $SkipToolPackageRestore.IsPresent) { Set-Location $TOOLS_DIR # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG) + [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { + ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { Write-Verbose -Message "Missing or changed package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,nuget.exe + Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | + Remove-Item -Recurse -Force } Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" + + $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" if ($LASTEXITCODE -ne 0) { Throw "An error occurred while restoring NuGet tools." @@ -175,58 +213,75 @@ if(-Not $SkipToolPackageRestore.IsPresent) { { $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" } - Write-Verbose -Message ($NuGetOutput | out-string) + 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" -} +# 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 "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" + + if ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet addins." + } -# Make sure modules folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $MODULES_DIR)) { - Write-Verbose -Message "Creating tools/modules directory..." - New-Item -Path $MODULES_DIR -Type directory | out-null + Write-Verbose -Message ($NuGetOutput | Out-String) + + Pop-Location } -# Restore modules from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { +# Restore modules from NuGet +if (Test-Path $MODULES_PACKAGES_CONFIG) { Push-Location Set-Location $MODULES_DIR - # Check for changes in modules packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($MODULES_PACKAGES_CONFIG) - if((!(Test-Path $MODULES_PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $MODULES_PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed modules package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,packages.config.md5sum,nuget.exe - } - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" + $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" if ($LASTEXITCODE -ne 0) { Throw "An error occurred while restoring NuGet modules." } - else - { - $md5Hash | Out-File $MODULES_PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | out-string) + + Write-Verbose -Message ($NuGetOutput | Out-String) + Pop-Location } -# Start Cake -$path = Split-Path -Parent $MyInvocation.MyCommand.Definition -$Script = "$path/build.cake" +# Make sure that Cake has been installed. +if (!(Test-Path $CAKE_EXE)) { + Throw "Could not find Cake.exe at $CAKE_EXE" +} -Write-Host "Bootstrapping Cake..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" --bootstrap" -if ($LASTEXITCODE -ne 0) { - throw "An error occurred while bootstrapping Cake." +$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { + "mono `"$CAKE_EXE`"" +} else { + "`"$CAKE_EXE`"" } + # Build an array (not a string) of Cake arguments to be joined later +$cakeArguments = @() +if ($Script) { $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" } +$cakeArguments += $ScriptArgs + +# Start Cake Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE \ No newline at end of file +Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" +$cakeExitCode = $LASTEXITCODE + +# Clean up environment variables that were created earlier in this bootstrapper +$env:CAKE_PATHS_TOOLS = $null +$env:CAKE_PATHS_ADDINS = $null +$env:CAKE_PATHS_MODULES = $null + +# Return exit code +exit $cakeExitCode diff --git a/build/tools/packages.config b/build/tools/packages.config index c0ec5b2ffbe..4dc0269f530 100644 --- a/build/tools/packages.config +++ b/build/tools/packages.config @@ -1,3 +1,3 @@ - + \ No newline at end of file