From 59a176f03b1527433c22fa18f0b4ce9fe32eec4d Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 27 Feb 2018 22:43:16 -0500 Subject: [PATCH 1/2] Fixed: Temp Workaround for Appveyor Cake Issue --- build-appveyor.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-appveyor.ps1 b/build-appveyor.ps1 index fd3bea746..7d90f7eb7 100644 --- a/build-appveyor.ps1 +++ b/build-appveyor.ps1 @@ -180,5 +180,5 @@ if (!(Test-Path $CAKE_EXE)) { # Start Cake Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE \ No newline at end of file +Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -settings_skipverification=true -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" +exit $LASTEXITCODE From 731c9acd94071152ed833b1eb9d2587b57898dd0 Mon Sep 17 00:00:00 2001 From: Qstick Date: Wed, 28 Feb 2018 23:08:18 -0500 Subject: [PATCH 2/2] Fixed: Pin cake and addin versions --- .gitignore | 5 +++-- build-appveyor.cake | 6 +++--- build-appveyor.ps1 | 13 +++++++++---- tools/packages.config | 4 ++++ 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 tools/packages.config diff --git a/.gitignore b/.gitignore index 67e398b33..aa234c2fe 100644 --- a/.gitignore +++ b/.gitignore @@ -148,8 +148,9 @@ _temp_*/**/* Thumbs.db # AppVeyor -/tools-cake/ +/tools/cake/ /_artifacts/ # Cake -/tools/Addins/* \ No newline at end of file +/tools/Addins/* +packages.config.md5sum \ No newline at end of file diff --git a/build-appveyor.cake b/build-appveyor.cake index 5fd95b0c6..ff4ef9617 100644 --- a/build-appveyor.cake +++ b/build-appveyor.cake @@ -1,6 +1,6 @@ -#addin "Cake.Npm" -#addin "SharpZipLib" -#addin "Cake.Compression" +#addin nuget:?package=Cake.Npm&version=0.12.1 +#addin nuget:?package=SharpZipLib&version=0.86.0 +#addin nuget:?package=Cake.Compression&version=0.1.4 // Build variables var outputFolder = "./_output"; diff --git a/build-appveyor.ps1 b/build-appveyor.ps1 index 7d90f7eb7..742cc6808 100644 --- a/build-appveyor.ps1 +++ b/build-appveyor.ps1 @@ -81,8 +81,8 @@ if(!$PSScriptRoot){ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent } -$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" +$TOOLS_DIR = Join-Path $PSScriptRoot "tools" +$NUGET_EXE = Join-Path $TOOLS_DIR "nuget/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" @@ -156,7 +156,12 @@ if(-Not $SkipToolPackageRestore.IsPresent) { if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or ($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 -Path $TOOLS_DIR -Recurse -Exclude packages.config | + Select -ExpandProperty FullName | + Where {$_ -notlike (Join-Path $TOOLS_DIR "pdb2mdb*")} | + Where {$_ -notlike (Join-Path $TOOLS_DIR "nuget*")} | + sort length -Descending | + Remove-Item -Recurse } Write-Verbose -Message "Restoring tools from NuGet..." @@ -180,5 +185,5 @@ if (!(Test-Path $CAKE_EXE)) { # Start Cake Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -settings_skipverification=true -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" +Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" exit $LASTEXITCODE diff --git a/tools/packages.config b/tools/packages.config new file mode 100644 index 000000000..36afb6f92 --- /dev/null +++ b/tools/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file