From 39f0ed9d21ca262b7843389b0057968f301b435e Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Mon, 5 Aug 2013 16:11:37 -0700 Subject: [PATCH] updated test package to use the same libs as the update package. --- Marr.Data/Marr.Data.csproj | 3 --- Marr.Data/packages.config | 4 ---- build.ps1 | 18 ++++++++++-------- 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 Marr.Data/packages.config diff --git a/Marr.Data/Marr.Data.csproj b/Marr.Data/Marr.Data.csproj index 47c9ed99c..f7e58cb01 100644 --- a/Marr.Data/Marr.Data.csproj +++ b/Marr.Data/Marr.Data.csproj @@ -131,9 +131,6 @@ - - - diff --git a/Marr.Data/packages.config b/Marr.Data/packages.config deleted file mode 100644 index 548cda57c..000000000 --- a/Marr.Data/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 83338d66d..cda2ea9b2 100644 --- a/build.ps1 +++ b/build.ps1 @@ -54,14 +54,14 @@ Function CleanFolder($path) Function AddJsonNet() { - Copy-Item .\packages\Newtonsoft.Json.5.*\lib\net35\*.* -Destination $outputFolder -Verbose + Copy-Item .\packages\Newtonsoft.Json.5.*\lib\net35\*.* -Destination $outputFolder } Function PackageTests() { Write-Host Packaging Tests - if(Test-Path $testPackageFolder) + if(Test-Path $testPackageFolder) { Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue } @@ -71,10 +71,13 @@ Function PackageTests() Copy-Item -Recurse ($_.FullName + "\*") $testPackageFolder -ErrorAction Ignore } + CleanFolder $testPackageFolder - get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname} + Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force + Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force + get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname} } Function Nunit() @@ -83,12 +86,11 @@ Function Nunit() get-childitem $testPackageFolder -File -Filter *test.dll | foreach ($_) { $testFiles = $testFiles + $_.FullName + " " - } - $nunitExe = '.\Libraries\nunit\nunit-console-x86.exe ' + $testFiles + ' /process:multiple /noxml' - Invoke-Expression $nunitExe - CheckExitCode + $nunitExe = '.\Libraries\nunit\nunit-console-x86.exe ' + $testFiles + ' /process:multiple /noxml' + Invoke-Expression $nunitExe + CheckExitCode } Function RunGrunt() @@ -111,7 +113,7 @@ Function CheckExitCode() } Build -RunGrunt +#RunGrunt PackageTests if($runTests)