diff --git a/.gitignore b/.gitignore
index 8e047736..e2e770c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.pidb
 *.StyleCop
 *.log
+*.*~
 GeneratedAssemblyInfo.cs
 StyleCop.Cache
 local.settings.include
diff --git a/NUnit.proj b/NUnit.proj
index 75fef219..3499bfef 100644
--- a/NUnit.proj
+++ b/NUnit.proj
@@ -102,8 +102,8 @@
 	<PropertyGroup Label="Properties for running tests">
 		<TestOptions Condition="'$(TestOptions)' == ''"></TestOptions>
 		<ManagedExeLauncher Condition="'$(Runtime)' == 'mono'">mono</ManagedExeLauncher>
-		<TestHarnessProgram>test-harness.exe</TestHarnessProgram>
-		<ConsoleRunnerProgram>nunit-console.exe</ConsoleRunnerProgram>
+		<TestHarnessProgram>$(FrameworkBuildDir)\test-harness.exe</TestHarnessProgram>
+		<ConsoleRunnerProgram>$(ConsoleBuildDir)\nunit-console.exe</ConsoleRunnerProgram>
 		<TestRunnerArgs>nunit.framework.tests.dll $(TestOptions)</TestRunnerArgs>
 		<HarnessSelfTestArgs>--selftest $(TestOptions)</HarnessSelfTestArgs>
 	</PropertyGroup>
@@ -245,7 +245,7 @@
 		<Error Condition="'$(Runtime)' == 'netcf' Or '$(Runtime)' == 'silverlight'"
 			Text="The full NUnit framework cannot be tested under $(Runtime)" />
 		<Exec WorkingDirectory="$(FrameworkBuildDir)" 
-			Command="$(ManagedExeLauncher) $(FrameworkBuildDir)\$(TestHarnessProgram) $(TestRunnerArgs)" />
+			Command="$(ManagedExeLauncher) $(TestHarnessProgram) $(TestRunnerArgs)" />
 	</Target>
 	
 	<Target Name="_NUnitLiteTest" Label="Test NUnitLite for the current config">
@@ -256,15 +256,17 @@
 	<Target Name="TestHarness" Label="Run the harness self-tests">
 		<Message Text="Testing test-harness $(Framework) - $(Configuration)" />
 		<Exec WorkingDirectory="$(FrameworkBuildDir)"
-			Command="$(ManagedExeLauncher) $(FrameworkBuildDir)\$(TestHarnessProgram) $(HarnessSelfTestArgs)" />
+			Command="$(ManagedExeLauncher) $(TestHarnessProgram) $(HarnessSelfTestArgs)" />
 	</Target>
 
 	<Target Name="TestEngine" Label ="Run the engine tests">
-		<Exec WorkingDirectory="$(EngineBuildDir)" Command="$(ManagedExeLauncher) $(ConsoleRunnerProgram) nunit.engine.tests.dll" />
+		<Exec WorkingDirectory="$(EngineBuildDir)"
+		  Command="$(ManagedExeLauncher) $(ConsoleRunnerProgram) nunit.engine.tests.dll" />
 	</Target>
 	
 	<Target Name="TestConsole" Label="Run the console tests">
-		<Exec WorkingDirectory="$(ConsoleBuildDir)" Command="$(ManagedExeLauncher) $(ConsoleRunnerProgram) nunit-console.tests.dll" />
+		<Exec WorkingDirectory="$(ConsoleBuildDir)"
+		  Command="$(ManagedExeLauncher) $(ConsoleRunnerProgram) nunit-console.tests.dll" />
 	</Target>
 	
 	<!-- *********************************************************************** -->
diff --git a/src/NUnitFramework/tests/nunit.framework.tests-2.0.csproj b/src/NUnitFramework/tests/nunit.framework.tests-2.0.csproj
index 8fdbb33d..0d936699 100644
--- a/src/NUnitFramework/tests/nunit.framework.tests-2.0.csproj
+++ b/src/NUnitFramework/tests/nunit.framework.tests-2.0.csproj
@@ -19,7 +19,6 @@
     <IntermediateOutputPath>obj\$(Configuration)\net-2.0\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-2.0\</OutputPath>
     <DefineConstants>TRACE;NET_2_0</DefineConstants>
@@ -27,6 +26,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
     </DocumentationFile>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
@@ -251,15 +251,15 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\framework\nunit.framework-2.0.csproj">
-      <Project>{12b66b03-90f1-4992-bd33-bdf3c69ae49e}</Project>
+      <Project>{12B66B03-90F1-4992-BD33-BDF3C69AE49E}</Project>
       <Name>nunit.framework-2.0</Name>
     </ProjectReference>
     <ProjectReference Include="..\mock-assembly\mock-nunit-assembly-2.0.csproj">
-      <Project>{2e368281-3ba8-4050-b05e-0e0e43f8f446}</Project>
+      <Project>{2E368281-3BA8-4050-B05E-0E0E43F8F446}</Project>
       <Name>mock-nunit-assembly-2.0</Name>
     </ProjectReference>
     <ProjectReference Include="..\testdata\nunit.testdata-2.0.csproj">
-      <Project>{15b64946-4989-4873-915c-3e181772fa03}</Project>
+      <Project>{15B64946-4989-4873-915C-3E181772FA03}</Project>
       <Name>nunit.testdata-2.0</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/NUnitFramework/tests/nunit.framework.tests-3.5.csproj b/src/NUnitFramework/tests/nunit.framework.tests-3.5.csproj
index ca806a5d..fcc428bf 100644
--- a/src/NUnitFramework/tests/nunit.framework.tests-3.5.csproj
+++ b/src/NUnitFramework/tests/nunit.framework.tests-3.5.csproj
@@ -19,7 +19,6 @@
     <IntermediateOutputPath>obj\$(Configuration)\net-3.5\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-3.5\</OutputPath>
     <DefineConstants>TRACE;NET_3_5</DefineConstants>
@@ -27,6 +26,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
     </DocumentationFile>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NET_3_5</DefineConstants>
diff --git a/src/NUnitFramework/tests/nunit.framework.tests-4.0.csproj b/src/NUnitFramework/tests/nunit.framework.tests-4.0.csproj
index 2cfb295d..bba3b890 100644
--- a/src/NUnitFramework/tests/nunit.framework.tests-4.0.csproj
+++ b/src/NUnitFramework/tests/nunit.framework.tests-4.0.csproj
@@ -18,7 +18,6 @@
     <IntermediateOutputPath>obj\$(Configuration)\net-4.0\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-4.0\</OutputPath>
     <DefineConstants>TRACE;NET_4_0</DefineConstants>
@@ -26,6 +25,7 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>
     </DocumentationFile>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NET_4_0</DefineConstants>
diff --git a/src/NUnitFramework/tests/nunit.framework.tests-4.5.csproj b/src/NUnitFramework/tests/nunit.framework.tests-4.5.csproj
index 0008d5d7..4f4aee0d 100644
--- a/src/NUnitFramework/tests/nunit.framework.tests-4.5.csproj
+++ b/src/NUnitFramework/tests/nunit.framework.tests-4.5.csproj
@@ -20,7 +20,6 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-4.5\</OutputPath>
     <DefineConstants>TRACE;NET_4_5</DefineConstants>
@@ -29,6 +28,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG;NET_4_5</DefineConstants>
diff --git a/src/NUnitFramework/tests/nunitlite.tests-2.0.csproj b/src/NUnitFramework/tests/nunitlite.tests-2.0.csproj
index f0d26d3f..610e555d 100644
--- a/src/NUnitFramework/tests/nunitlite.tests-2.0.csproj
+++ b/src/NUnitFramework/tests/nunitlite.tests-2.0.csproj
@@ -48,7 +48,6 @@
     <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-2.0\</OutputPath>
     <DefineConstants>TRACE;NET_2_0;NUNITLITE</DefineConstants>
@@ -57,6 +56,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -275,15 +275,15 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\framework\nunitlite-2.0.csproj">
-      <Project>{0bfa7f0a-bc15-40a5-863a-fa9b55ae2fd3}</Project>
+      <Project>{0BFA7F0A-BC15-40A5-863A-FA9B55AE2FD3}</Project>
       <Name>nunitlite-2.0</Name>
     </ProjectReference>
     <ProjectReference Include="..\mock-assembly\mock-nunitlite-assembly-2.0.csproj">
-      <Project>{7be679ef-3853-4e06-b4eb-c4c6808bc3f0}</Project>
+      <Project>{7BE679EF-3853-4E06-B4EB-C4C6808BC3F0}</Project>
       <Name>mock-nunitlite-assembly-2.0</Name>
     </ProjectReference>
     <ProjectReference Include="..\testdata\nunitlite.testdata-2.0.csproj">
-      <Project>{442dab16-3063-4fe3-90b6-c29c3d85360d}</Project>
+      <Project>{442DAB16-3063-4FE3-90B6-C29C3D85360D}</Project>
       <Name>nunitlite.testdata-2.0</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/NUnitFramework/tests/nunitlite.tests-3.5.csproj b/src/NUnitFramework/tests/nunitlite.tests-3.5.csproj
index 66b0ee7e..1ed85432 100644
--- a/src/NUnitFramework/tests/nunitlite.tests-3.5.csproj
+++ b/src/NUnitFramework/tests/nunitlite.tests-3.5.csproj
@@ -48,7 +48,6 @@
     <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-3.5\</OutputPath>
     <DefineConstants>TRACE;NET_3_5;NUNITLITE</DefineConstants>
@@ -57,6 +56,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/NUnitFramework/tests/nunitlite.tests-4.0.csproj b/src/NUnitFramework/tests/nunitlite.tests-4.0.csproj
index 189a7cd8..4fa035b4 100644
--- a/src/NUnitFramework/tests/nunitlite.tests-4.0.csproj
+++ b/src/NUnitFramework/tests/nunitlite.tests-4.0.csproj
@@ -47,7 +47,6 @@
     <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-4.0\</OutputPath>
     <DefineConstants>TRACE;NET_4_0;NUNITLITE</DefineConstants>
@@ -56,6 +55,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/NUnitFramework/tests/nunitlite.tests-4.5.csproj b/src/NUnitFramework/tests/nunitlite.tests-4.5.csproj
index 87d4b008..55ac5aab 100644
--- a/src/NUnitFramework/tests/nunitlite.tests-4.5.csproj
+++ b/src/NUnitFramework/tests/nunitlite.tests-4.5.csproj
@@ -50,7 +50,6 @@
     <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\net-4.5\</OutputPath>
     <DefineConstants>TRACE;NET_4_5;NUNITLITE</DefineConstants>
@@ -60,6 +59,7 @@
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <NoWarn>0414</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />