Merge pull request #111 from mousetraps/i19

#19 Test discovery is not working when default processor architecture is
microsoft · May 14, 2015 · 44bd6d6 · 44bd6d6
2 parents 4253772 + 00e226e
commit 44bd6d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Nodejs/NodejsTools.sln b/Nodejs/NodejsTools.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nodejs", "Product\Nodejs\Nodejs.csproj", "{32EC5259-98DA-40CA-9E2D-1B1B2E966F88}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -262,10 +262,10 @@ Global
 		{95494195-DCA4-4633-B78B-2087836C11D0}.Debug|x86.Build.0 = Debug|x86
 		{95494195-DCA4-4633-B78B-2087836C11D0}.Release|x86.ActiveCfg = Release|x86
 		{95494195-DCA4-4633-B78B-2087836C11D0}.Release|x86.Build.0 = Release|x86
-		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.ActiveCfg = Debug|x86
-		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.Build.0 = Debug|x86
-		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.ActiveCfg = Release|x86
-		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.Build.0 = Release|x86
+		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Debug|x86.Build.0 = Debug|Any CPU
+		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.ActiveCfg = Release|Any CPU
+		{5085DF35-3A32-4894-835E-E5A3956D4F57}.Release|x86.Build.0 = Release|Any CPU
 		{3FC57837-519D-4980-A8E8-DC5879DDA002}.Debug|x86.ActiveCfg = Debug|x86
 		{3FC57837-519D-4980-A8E8-DC5879DDA002}.Debug|x86.Build.0 = Debug|x86
 		{3FC57837-519D-4980-A8E8-DC5879DDA002}.Release|x86.ActiveCfg = Release|x86

diff --git a/Nodejs/Product/TestAdapter/TestAdapter.csproj b/Nodejs/Product/TestAdapter/TestAdapter.csproj
@@ -35,7 +35,7 @@
   <Import Project="..\ProjectBefore.settings" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20305</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -51,9 +51,6 @@
     <SccProvider>SAK</SccProvider>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);NO_WINDOWS</DefineConstants>
   </PropertyGroup>