updated test package to use the same libs as the update package.

pull/4/head
kay.one 11 years ago
parent d64bb56575
commit 39f0ed9d21

@ -131,9 +131,6 @@
<Compile Include="Reflection\ReflectionHelper.cs" /> <Compile Include="Reflection\ReflectionHelper.cs" />
<Compile Include="SqlModesEnum.cs" /> <Compile Include="SqlModesEnum.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="fasterflect" version="2.1.3" targetFramework="net40" />
</packages>

@ -54,14 +54,14 @@ Function CleanFolder($path)
Function AddJsonNet() 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() Function PackageTests()
{ {
Write-Host Packaging Tests Write-Host Packaging Tests
if(Test-Path $testPackageFolder) if(Test-Path $testPackageFolder)
{ {
Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
} }
@ -71,10 +71,13 @@ Function PackageTests()
Copy-Item -Recurse ($_.FullName + "\*") $testPackageFolder -ErrorAction Ignore Copy-Item -Recurse ($_.FullName + "\*") $testPackageFolder -ErrorAction Ignore
} }
CleanFolder $testPackageFolder 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() Function Nunit()
@ -83,12 +86,11 @@ Function Nunit()
get-childitem $testPackageFolder -File -Filter *test.dll | foreach ($_) { get-childitem $testPackageFolder -File -Filter *test.dll | foreach ($_) {
$testFiles = $testFiles + $_.FullName + " " $testFiles = $testFiles + $_.FullName + " "
} }
$nunitExe = '.\Libraries\nunit\nunit-console-x86.exe ' + $testFiles + ' /process:multiple /noxml' $nunitExe = '.\Libraries\nunit\nunit-console-x86.exe ' + $testFiles + ' /process:multiple /noxml'
Invoke-Expression $nunitExe Invoke-Expression $nunitExe
CheckExitCode CheckExitCode
} }
Function RunGrunt() Function RunGrunt()
@ -111,7 +113,7 @@ Function CheckExitCode()
} }
Build Build
RunGrunt #RunGrunt
PackageTests PackageTests
if($runTests) if($runTests)

Loading…
Cancel
Save