Commit 012962c

@@ -69,7 +69,6 @@
     <None Include="config\AssemblyInfo.cs.template" />
     <None Include="local.properties.xml.template" />
     <None Include="project.build" />
-    <None Include="project.test.build" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="local.properties.xml" />

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
   <project name="gorilla.commons">	
-	<property name="nant.settings.currentframework" value="net-4.0" />
 	<property name="project.name" value="${project::get-name()}" />
 
 	<property name="base.dir" value="${directory::get-parent-directory(project::get-base-directory())}" />
@@ -11,9 +10,6 @@
 	<property name="build.config.dir" value="${build.dir}\config" />
 	<property name="build.compile.dir" value="${build.dir}\compile" />
 	
-	<property name="app.output" value="${project.name}.dll" />
-	
-	<include buildfile="project.test.build" />
 	<include buildfile="local.properties.xml" />
 		
 	<target name="clean">
@@ -37,4 +33,14 @@
 		</copy>
 	</target>
 	
+	<target name="run.test" depends="compile">
+  	<property name="xunit.cons.exe" value="${base.dir}/thirdparty/mspec/mspec.exe" />
+		<exec program="${xunit.cons.exe}" workingdir="${build.compile.dir}" commandline="${xunit.arguments}" />
+	</target>
+
+	<target name="test">
+		<property name="xunit.arguments" value="-t --html ${build.compile.dir} ${build.compile.dir}/specs.dll" />
+		<call target="run.test" />
+	</target>
+    
 </project>

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="project.test">
-	<property name="test.output" value="${project.name}.test.dll" />
-	<property name="xunit.cons.exe" value="${build.tools.dir}\gallio\gallio.echo.exe" />
-
-	<fileset id="test.references.fileset">
-		<include name="${build.lib.dir}\**\*.dll" />
-		<exclude name="${build.lib.dir}\app\sql.server.compact\**\*.dll" />
-		<include name="${build.lib.dir}\app\sql.server.compact\**\System.Data.SqlServerCe.dll" />
-	</fileset>
-
-	<target name="test.compile" depends="init, test.copy.dependencies">
-		<csc output="${build.compile.dir}\${test.output}" target="library" debug="${debug}">
-			<sources basedir="${product.dir}">
-				<include name="**\*.cs" />
-			</sources>
-			<references refid="test.references.fileset"/>
-		</csc>
-	</target>
-
-	<target name="test.copy.dependencies">
-		<copy todir="${build.compile.dir}" flatten="true">
-			<fileset basedir="${build.lib.dir}">
-				<include name="\**\*.dll" />
-			</fileset>
-		</copy>
-		<copy todir="${build.compile.dir}" flatten="false">
-			<fileset basedir="${build.resources.dir}">
-				<include name="\**\*.*" />
-			</fileset>
-		</copy>
-		<property name="target" value="${log4net.config}" />
-		<call target="expand.template.file" />
-		<copy file="${log4net.config}" tofile="${build.compile.dir}\log4net.config.xml" />
-	</target>
-
-	<target name="run.test" depends="test.compile">
-		<exec
-			program="${xunit.cons.exe}"
-      workingdir="${build.compile.dir}"
-			commandline="${xunit.arguments}" />
-	</target>
-
-	<target name="test">
-		<property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:text /rd:${build.compile.dir}" />
-		<call target="run.test" />
-	</target>
-
-	<target name="test.html">
-		<property name="xunit.arguments" value="${build.compile.dir}/${test.output} /sr /rt:html /rd:${build.compile.dir}" />
-		<call target="run.test" />
-	</target>
-
-</project>

@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>gorilla.commons.testing</RootNamespace>
-    <AssemblyName>gorilla.commons.testing</AssemblyName>
+    <AssemblyName>specs</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>

@@ -25,7 +25,6 @@ Global
 		{AA5EEED9-4531-45F7-AFCD-AD9717D2E405}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B8505B10-85C7-45F4-B039-D364DD556D7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B8505B10-85C7-45F4-B039-D364DD556D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8505B10-85C7-45F4-B039-D364DD556D7D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD8FD29E-7424-415C-9BA3-7D9F6ECBA161}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD8FD29E-7424-415C-9BA3-7D9F6ECBA161}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD8FD29E-7424-415C-9BA3-7D9F6ECBA161}.Release|Any CPU.ActiveCfg = Release|Any CPU