Added support for parallelized data-driven tests.

Fixed a couple of issues building with .Net 3.5.
Gallio · Aug 17, 2010 · cd4b668 · cd4b668
1 parent 2b9a0b7
commit cd4b668
Show file tree

Hide file tree

Showing 7 changed files with 206 additions and 143 deletions.
diff --git a/Build.bat b/Build.bat
@@ -13,8 +13,8 @@ if not defined MSBUILD_ARGS (
   exit /b 1
 )
 
-if not defined MSBUILD set MSBUILD=%SystemRoot%\Microsoft.Net\Framework\v4.0.30319\MSBuild.exe
-if not defined MSBUILD set MSBUILD=%SystemRoot%\Microsoft.Net\Framework\v3.5\MSBuild.exe
+call :FIND_MSBUILD %SystemRoot%\Microsoft.Net\Framework\v4.0.30319\MSBuild.exe
+call :FIND_MSBUILD %SystemRoot%\Microsoft.Net\Framework\v3.5\MSBuild.exe
 if not defined MSBUILD (
   echo Could not find path to MSBuild.exe.
   exit /b 1
@@ -42,3 +42,9 @@ if "%SANITIZE_TEMP:~-1%"=="\" set SANITIZE_TEMP=%SANITIZE_TEMP:~0,-1%
 set %~1=%SANITIZE_TEMP%
 set SANITIZE_TEMP=
 exit /b 0
+
+
+:FIND_MSBUILD
+if defined MSBUILD exit /b 0
+if exist "%~1" set MSBUILD=%~1
+exit /b 0
diff --git a/bin/Module.targets b/bin/Module.targets
@@ -129,7 +129,7 @@
     <AssemblyVersion Condition="'$(AssemblyVersion)'==''">0.0.0.0</AssemblyVersion>
     <FileVersion Condition="'$(FileVersion)'==''">0.0.0.0</FileVersion>
 
-    <DotNetFrameworkVersion Condition="'$(DotNetFrameworkVersion)'=='' and Exists('$(SystemRoot)\Microsoft.Net\Framework\v4.0.30319')">4.0</DotNetFrameworkVersion>
+    <DotNetFrameworkVersion Condition="'$(DotNetFrameworkVersion)'=='' and Exists('$(SystemRoot)\Microsoft.Net\Framework\v4.0.30319\MSBuild.exe')">4.0</DotNetFrameworkVersion>
     <DotNetFrameworkVersion Condition="'$(DotNetFrameworkVersion)'==''">3.5</DotNetFrameworkVersion>
 
     <ProjectVariant></ProjectVariant>

diff --git a/packages/Bundle Package.module b/packages/Bundle Package.module
@@ -133,9 +133,11 @@
       <Inherit>true</Inherit>
     </Module>
 
+    <!--
 	<Module Include="$(SourceDir)\Archimedes\Archimedes.module">
       <Inherit>true</Inherit>
 	</Module>
+    -->
 
 	<Module Include="$(SourceDir)\SDK\SDK.module">
       <Inherit>true</Inherit>

diff --git a/src/Extensions/ReSharper/Gallio.ReSharperRunner.Tests/Gallio.ReSharperRunner51.Tests.csproj b/src/Extensions/ReSharper/Gallio.ReSharperRunner.Tests/Gallio.ReSharperRunner51.Tests.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8CF2DDC1-824D-47bd-B626-3016F7207EAE}</ProjectGuid>
+    <ProjectGuid>{A268C6C4-5B94-49df-9AC0-FE9F65112A25}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gallio.ReSharperRunner.Tests</RootNamespace>
@@ -299,7 +299,7 @@
       <Name>MbUnit %28MbUnit\MbUnit%29</Name>
     </ProjectReference>
     <ProjectReference Include="..\Gallio.ReSharperRunner\Gallio.ReSharperRunner51.csproj">
-      <Project>{B5C0DE79-312A-475c-B2F9-2FF97DDF4D6D}</Project>
+      <Project>{E836E643-5FB8-4446-8B25-B577E822F0D1}</Project>
       <Name>Gallio.ReSharperRunner50</Name>
     </ProjectReference>
   </ItemGroup>
@@ -315,6 +315,7 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\ReSharper51.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/Extensions/ReSharper/Gallio.ReSharperRunner/Gallio.ReSharperRunner51.csproj b/src/Extensions/ReSharper/Gallio.ReSharperRunner/Gallio.ReSharperRunner51.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B5C0DE79-312A-475c-B2F9-2FF97DDF4D6D}</ProjectGuid>
+    <ProjectGuid>{E836E643-5FB8-4446-8B25-B577E822F0D1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gallio.ReSharperRunner</RootNamespace>
@@ -16,7 +16,8 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\v5.1\</OutputPath> 	<DefineConstants>TRACE;DEBUG;RESHARPER_51;RESHARPER_31_OR_NEWER;RESHARPER_40_OR_NEWER;RESHARPER_41_OR_NEWER;RESHARPER_45_OR_NEWER;RESHARPER_50_OR_NEWER;RESHARPER_51_OR_NEWER</DefineConstants>
+    <OutputPath>bin\v5.1\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;RESHARPER_51;RESHARPER_31_OR_NEWER;RESHARPER_40_OR_NEWER;RESHARPER_41_OR_NEWER;RESHARPER_45_OR_NEWER;RESHARPER_50_OR_NEWER;RESHARPER_51_OR_NEWER</DefineConstants>
     <DocumentationFile>bin\v5.1\Gallio.ReSharperRunner51.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591,1685</NoWarn>
@@ -46,61 +47,61 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\PublicAssemblies\EnvDTE.dll</HintPath>
     </Reference>
-    <Reference Include="JetBrains.Platform.ReSharper.ActionManagement, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+    <Reference Include="JetBrains.Platform.ReSharper.ActionManagement, Version=5.1.1727.12, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.ActionManagement.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.ActionManagement.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.ActivityTracking, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.ActivityTracking.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.ActivityTracking.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.DocumentManager, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.DocumentManager.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.DocumentManager.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.DocumentModel, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.DocumentModel.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.DocumentModel.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.IDE, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.IDE.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.IDE.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.Interop.WinApi, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Interop.WinApi.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Interop.WinApi.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.Metadata, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Metadata.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.ProjectModel, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.ProjectModel.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.ProjectModel.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.Shell, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Shell.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Shell.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.TextControl, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.TextControl.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.TextControl.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.UI, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.UI.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.UI.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.Util, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Util.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.Util.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.Platform.ReSharper.VSIntegration, Version=4.0.783.45, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.VSIntegration.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.Platform.ReSharper.VSIntegration.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.Daemon, Version=3.1.584.3, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.Daemon.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.Daemon.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.Feature.Services, Version=4.5.1153.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -115,15 +116,15 @@
     </Reference>
     <Reference Include="JetBrains.ReSharper.Psi.CSharp, Version=3.1.584.3, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.Psi.CSharp.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.Psi.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.TaskRunnerFramework, Version=3.0.517.8, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.TaskRunnerFramework.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.TaskRunnerFramework.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.UnitTestExplorer, Version=3.0.517.8, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-	  <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.UnitTestExplorer.dll</HintPath>
+      <HintPath>..\libs\ReSharper\v5.1\JetBrains.ReSharper.UnitTestExplorer.dll</HintPath>
     </Reference>
     <Reference Include="JetBrains.ReSharper.UnitTestFramework, Version=5.0.1526.25, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -237,6 +238,7 @@
     <None Include="Reflection\Known Limitations and Workarounds.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\ReSharper51.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/Extensions/ReSharper/ReSharper.sln b/src/Extensions/ReSharper/ReSharper.sln
@@ -53,9 +53,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ReSharperRunner45.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ReSharperRunner50.Tests", "Gallio.ReSharperRunner.Tests\Gallio.ReSharperRunner50.Tests.csproj", "{CFC4B4EC-4E57-461A-B6CB-33F8C0DF9238}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ReSharperRunner51", "Gallio.ReSharperRunner\Gallio.ReSharperRunner51.csproj", "{B5C0DE79-312A-475C-B2F9-2FF97DDF4D6D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ReSharperRunner51.vs2010", "Gallio.ReSharperRunner\Gallio.ReSharperRunner51.csproj", "{E836E643-5FB8-4446-8B25-B577E822F0D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ReSharperRunner51.Tests", "Gallio.ReSharperRunner.Tests\Gallio.ReSharperRunner51.Tests.csproj", "{8CF2DDC1-824D-47BD-B626-3016F7207EAE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gallio.ReSharperRunner51.Tests.vs2010", "Gallio.ReSharperRunner.Tests\Gallio.ReSharperRunner51.Tests.csproj", "{A268C6C4-5B94-49DF-9AC0-FE9F65112A25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -155,14 +155,14 @@ Global
 		{CFC4B4EC-4E57-461A-B6CB-33F8C0DF9238}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CFC4B4EC-4E57-461A-B6CB-33F8C0DF9238}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CFC4B4EC-4E57-461A-B6CB-33F8C0DF9238}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5C0DE79-312A-475C-B2F9-2FF97DDF4D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5C0DE79-312A-475C-B2F9-2FF97DDF4D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5C0DE79-312A-475C-B2F9-2FF97DDF4D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5C0DE79-312A-475C-B2F9-2FF97DDF4D6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CF2DDC1-824D-47BD-B626-3016F7207EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CF2DDC1-824D-47BD-B626-3016F7207EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CF2DDC1-824D-47BD-B626-3016F7207EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CF2DDC1-824D-47BD-B626-3016F7207EAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E836E643-5FB8-4446-8B25-B577E822F0D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E836E643-5FB8-4446-8B25-B577E822F0D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E836E643-5FB8-4446-8B25-B577E822F0D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E836E643-5FB8-4446-8B25-B577E822F0D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A268C6C4-5B94-49DF-9AC0-FE9F65112A25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A268C6C4-5B94-49DF-9AC0-FE9F65112A25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A268C6C4-5B94-49DF-9AC0-FE9F65112A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A268C6C4-5B94-49DF-9AC0-FE9F65112A25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -191,7 +191,7 @@ Global
 		{BA294887-CBB1-4BAC-A9D6-009459AFE519} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
 		{4D4C9967-94B4-4102-81C0-069245469B4E} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
 		{CFC4B4EC-4E57-461A-B6CB-33F8C0DF9238} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
-		{B5C0DE79-312A-475C-B2F9-2FF97DDF4D6D} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
-		{8CF2DDC1-824D-47BD-B626-3016F7207EAE} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
+		{E836E643-5FB8-4446-8B25-B577E822F0D1} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
+		{A268C6C4-5B94-49DF-9AC0-FE9F65112A25} = {7388C03C-D1A4-432B-B6FA-364F8143D382}
 	EndGlobalSection
 EndGlobal