diff --git a/.gitignore b/.gitignore index 35ef4a02..f0595cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ [Bb]in/ [Oo]bj/ -[Ww]orking/ +[Ww]orking*/ Build/runbuild.txt Doc/doc.shfbproj_* TestResults/ diff --git a/Build/build.ps1 b/Build/build.ps1 index 3e5e2203..c211ded9 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -8,6 +8,7 @@ $buildDocumentation = $false $buildNuGet = $true $treatWarningsAsErrors = $false + $workingName = "Working" $baseDir = resolve-path .. $buildDir = "$baseDir\Build" @@ -15,7 +16,7 @@ $toolsDir = "$baseDir\Tools" $docDir = "$baseDir\Doc" $releaseDir = "$baseDir\Release" - $workingDir = "$baseDir\Working" + $workingDir = "$baseDir\$workingName" $builds = @( @{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"; Sign=$true}, @{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+aspnetcore50"; Framework="net-4.0"; Sign=$true}, @@ -38,7 +39,7 @@ task Clean { if (Test-Path -path $workingDir) { - Write-Output "Deleting Working Directory" + Write-Output "Deleting Working Directory $workingDir" del $workingDir -Recurse -Force }