From 59a176f03b1527433c22fa18f0b4ce9fe32eec4d Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 27 Feb 2018 22:43:16 -0500 Subject: [PATCH 01/11] 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 02/11] 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 From d11b565eda629970f8ade99fa8c9db33bcd4b1e6 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Thu, 1 Mar 2018 22:37:30 +0100 Subject: [PATCH 03/11] Fixed: NLog causing a crash under mono 5.10 Fixes #2585 --- src/LogentriesNLog/LogentriesNLog.csproj | 2 +- src/LogentriesNLog/packages.config | 2 +- src/NzbDrone.Api/NzbDrone.Api.csproj | 3 --- src/NzbDrone.Api/packages.config | 2 +- src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj | 2 +- src/NzbDrone.App.Test/packages.config | 2 +- .../NzbDrone.Automation.Test.csproj | 3 --- src/NzbDrone.Automation.Test/packages.config | 2 +- src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj | 2 +- src/NzbDrone.Common.Test/packages.config | 2 +- src/NzbDrone.Common/NzbDrone.Common.csproj | 2 +- src/NzbDrone.Common/packages.config | 2 +- src/NzbDrone.Console/NzbDrone.Console.csproj | 2 +- src/NzbDrone.Console/packages.config | 2 +- src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj | 2 +- src/NzbDrone.Core.Test/packages.config | 2 +- src/NzbDrone.Core/NzbDrone.Core.csproj | 2 +- src/NzbDrone.Core/packages.config | 2 +- src/NzbDrone.Host/NzbDrone.Host.csproj | 2 +- src/NzbDrone.Host/packages.config | 2 +- .../NzbDrone.Integration.Test.csproj | 2 +- src/NzbDrone.Integration.Test/packages.config | 2 +- src/NzbDrone.Mono/NzbDrone.Mono.csproj | 6 ------ src/NzbDrone.Mono/packages.config | 2 +- src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj | 3 --- src/NzbDrone.Test.Common/packages.config | 2 +- src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj | 2 +- src/NzbDrone.Update.Test/packages.config | 2 +- src/NzbDrone.Update/NzbDrone.Update.csproj | 2 +- src/NzbDrone.Update/packages.config | 2 +- src/NzbDrone.Windows/NzbDrone.Windows.csproj | 2 +- src/NzbDrone.Windows/packages.config | 2 +- src/NzbDrone/NzbDrone.csproj | 2 +- src/NzbDrone/packages.config | 2 +- 34 files changed, 30 insertions(+), 45 deletions(-) diff --git a/src/LogentriesNLog/LogentriesNLog.csproj b/src/LogentriesNLog/LogentriesNLog.csproj index 5996ca202..b55be97c8 100644 --- a/src/LogentriesNLog/LogentriesNLog.csproj +++ b/src/LogentriesNLog/LogentriesNLog.csproj @@ -52,7 +52,7 @@ - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/LogentriesNLog/packages.config b/src/LogentriesNLog/packages.config index 44135561f..f12e916fd 100644 --- a/src/LogentriesNLog/packages.config +++ b/src/LogentriesNLog/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index b9b0f0506..0dcc0d29c 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -72,9 +72,6 @@ False ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - ..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll True diff --git a/src/NzbDrone.Api/packages.config b/src/NzbDrone.Api/packages.config index 23373871c..b09eedb6b 100644 --- a/src/NzbDrone.Api/packages.config +++ b/src/NzbDrone.Api/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index eb6c1bebb..b34934479 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -50,7 +50,7 @@ True - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.App.Test/packages.config b/src/NzbDrone.App.Test/packages.config index f12ad74d1..6f97f16ce 100644 --- a/src/NzbDrone.App.Test/packages.config +++ b/src/NzbDrone.App.Test/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj index 63f9c8280..f7f852a92 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -46,9 +46,6 @@ ..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll True - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll True diff --git a/src/NzbDrone.Automation.Test/packages.config b/src/NzbDrone.Automation.Test/packages.config index 1e183b82d..b0b219840 100644 --- a/src/NzbDrone.Automation.Test/packages.config +++ b/src/NzbDrone.Automation.Test/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index 188dad035..0b0f84241 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -46,7 +46,7 @@ True - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Common.Test/packages.config b/src/NzbDrone.Common.Test/packages.config index 805d86b0b..7fd9e8863 100644 --- a/src/NzbDrone.Common.Test/packages.config +++ b/src/NzbDrone.Common.Test/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index de89b4059..2c4bb51e4 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -44,7 +44,7 @@ ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll diff --git a/src/NzbDrone.Common/packages.config b/src/NzbDrone.Common/packages.config index 6bda9797d..f62b46729 100644 --- a/src/NzbDrone.Common/packages.config +++ b/src/NzbDrone.Common/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 8a5abdbfc..255f18a80 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -76,7 +76,7 @@ ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Console/packages.config b/src/NzbDrone.Console/packages.config index 5f3ede259..d94fed8f8 100644 --- a/src/NzbDrone.Console/packages.config +++ b/src/NzbDrone.Console/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index df5b4d375..3a1ec006b 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -85,7 +85,7 @@ ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Core.Test/packages.config b/src/NzbDrone.Core.Test/packages.config index 164b69a3f..2105ac9e7 100644 --- a/src/NzbDrone.Core.Test/packages.config +++ b/src/NzbDrone.Core.Test/packages.config @@ -10,7 +10,7 @@ - + diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index f733517e7..0cf0c2e61 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -81,7 +81,7 @@ ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\OAuth.1.0.3\lib\net40\OAuth.dll diff --git a/src/NzbDrone.Core/packages.config b/src/NzbDrone.Core/packages.config index a8050c0ca..ac2480694 100644 --- a/src/NzbDrone.Core/packages.config +++ b/src/NzbDrone.Core/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index de791d870..ec8c4eadc 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -85,7 +85,7 @@ ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll diff --git a/src/NzbDrone.Host/packages.config b/src/NzbDrone.Host/packages.config index 35fe8a180..f668afa4d 100644 --- a/src/NzbDrone.Host/packages.config +++ b/src/NzbDrone.Host/packages.config @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index cdb4734d4..4f095280b 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -77,7 +77,7 @@ ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll - ..\packages\NLog.4.4.12\lib\net40\NLog.dll + ..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll ..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll diff --git a/src/NzbDrone.Integration.Test/packages.config b/src/NzbDrone.Integration.Test/packages.config index 2555551c3..a798498c0 100644 --- a/src/NzbDrone.Integration.Test/packages.config +++ b/src/NzbDrone.Integration.Test/packages.config @@ -10,7 +10,7 @@ - + diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 3de5073b7..4af0c27e0 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -51,9 +51,6 @@ MinimumRecommendedRules.ruleset - - ..\packages\NLog.4.4.12\lib\net40\NLog.dll - @@ -82,9 +79,6 @@ NzbDrone.Common - - -