mirror of
https://github.com/Radarr/Radarr
synced 2024-12-26 17:59:14 +00:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
cbf8106672
4 changed files with 19 additions and 9 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -148,8 +148,9 @@ _temp_*/**/*
|
|||
Thumbs.db
|
||||
|
||||
# AppVeyor
|
||||
/tools-cake/
|
||||
/tools/cake/
|
||||
/_artifacts/
|
||||
|
||||
# Cake
|
||||
/tools/Addins/*
|
||||
/tools/Addins/*
|
||||
packages.config.md5sum
|
|
@ -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";
|
||||
|
|
|
@ -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..."
|
||||
|
@ -181,4 +186,4 @@ 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
|
||||
exit $LASTEXITCODE
|
||||
|
|
4
tools/packages.config
Normal file
4
tools/packages.config
Normal file
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Cake" version="0.25.0" />
|
||||
</packages>
|
Loading…
Reference in a new issue