added unit tests to build script

.gitignore

@@ -7,4 +7,5 @@ build
 binaries
 release
 Upgradelog*
-_Upgrade*
+_Upgrade*
+TestResult.xml

default.ps1

@@ -21,6 +21,8 @@ $script:ilmergeTargetFramework = ""
 $script:msBuildTargetFramework = ""	
 $ilMergeKey = "$srcDir\NServiceBus.snk"
 $script:packageVersion = "1.0.0"
+$nunitexec = "packages\NUnit.Runners.lite.2.6.0.12051\nunit-console.exe"
+$script:nunitTargetFramework = "/framework=4.0";
 
 include $toolsDir\psake\buildutils.ps1
 
@@ -35,7 +37,7 @@ task Init -depends Clean {
 }
 
 task InstallDependentPackages {
-	cd "$sourceDir\packages"
+	cd "$baseDir\packages"
 	$files =  dir -Exclude *.config
 	cd $baseDir
 	$installDependentPackages = $DownloadDependentPackages;
@@ -70,7 +72,7 @@ task InitEnvironment{
 
 			$script:msBuildTargetFramework ="/p:TargetFrameworkVersion=v4.0 /ToolsVersion:4.0"
 
-			#$script:nunitTargetFramework = "/framework=4.0";
+			$script:nunitTargetFramework = "/framework=4.0";
 
 			$script:isEnvironmentInitialized = $true
 		}
@@ -83,17 +85,19 @@ task CompileMain -depends InstallDependentPackages, InitEnvironment, Init {
 	exec { &$script:msBuild $solutionFile /p:OutDir="$buildBase\" }
 
 	Copy-Item "$buildBase\OAuth2Provider.dll" $binariesDir
-
-#	$assemblies = @()
-#	$assemblies  +=  dir $buildBase\*.dll -Exclude **Tests.dll
-
-#	& $ilMergeTool /lib:$baseDir /t:library /out:"$binariesDir\OAuth2Provider.dll" /targetplatform:$script:ilmergeTargetFramework /log:"$buildBase\MergeLog.txt" $assemblies
-#	$mergeLogContent = Get-Content "$buildBase\MergeLog.txt"
-#	echo "------------------------------Merge Log-----------------------"
-#	echo $mergeLogContent
  }
+
+ task TestMain -depends CompileMain {
+
+	if((Test-Path -Path $buildBase\test-reports) -eq $false){
+		Create-Directory $buildBase\test-reports 
+	}
+	$testAssemblies = @()
+	$testAssemblies +=  dir $buildBase\*Tests.dll
+	exec {&$nunitexec $testAssemblies $script:nunitTargetFramework}
+}
 
-task PrepareRelease -depends CompileMain {
+task PrepareRelease -depends CompileMain, TestMain {
 
 	if((Test-Path $releaseRoot) -eq $true){
 		Delete-Directory $releaseRoot	

packages/repositories.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\src\OAuth2Provider\packages.config" />
+  <repository path="..\src\OAuth2Provider.Tests\packages.config" />
+  <repository path="..\samples\WebApiSample\packages.config" />
+  <repository path="..\samples\MVC3Sample\packages.config" />
+</repositories>

src/OAuth2Provider.Tests/packages.config

@@ -4,5 +4,6 @@
   <package id="CommonServiceLocator" version="1.0" />
   <package id="Moq" version="4.0.10827" />
   <package id="NUnit" version="2.6.0.12054" />
+  <package id="NUnit.Runners.Lite" version="2.6.0.12051" />
   <package id="Unity" version="2.1.505.0" />
 </packages>

src/OAuth2Provider/OAuth2Provider.csproj

@@ -118,7 +118,9 @@
     <Compile Include="Validation\ValidationResult.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.