Tweak to make Visual Studio being stupid about references.

Author: bclothier

Rubberduck.Deployment.Build/Rubberduck.Deployment.Build.csproj

@@ -8,10 +8,7 @@
     <AssemblyName>Rubberduck.Deployment.Build</AssemblyName>
   </PropertyGroup>
   <Import Project="..\RubberduckBaseMetaProject.csproj" />
-  <UsingTask
-    TaskName="GetMSBuildBitness"
-    TaskFactory="CodeTaskFactory"
-    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
+  <UsingTask TaskName="GetMSBuildBitness" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <Bitness ParameterType="System.String" Output="true" />
     </ParameterGroup>
@@ -42,19 +39,24 @@ else
       <HintPath>VisualStudioSetup\Microsoft.VisualStudio.Setup.Configuration.Interop.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <Target Name="PreBuildTask" BeforeTargets="PreBuildEvent">
+  <Target Name="BeforeBuild">
     <GetMSBuildBitness>
       <Output PropertyName="MSBuildBitness" TaskParameter="Bitness" />
     </GetMSBuildBitness>
+	  <Message Text="Resolved MSBuild Bitness: $(MSBuildBitness)" Importance="high" />
+    <ItemGroup>
+      <Reference Remove="olewoo" />
+      <Reference Remove="olewoo_interop" />
+    </ItemGroup>
+    <ItemGroup Condition="'x64'=='$(MSBuildBitness)'">
+      <Reference Include="OleWoo\x64\olewoo.dll" />
+      <Reference Include="OleWoo\x64\olewoo_interop.dll" />
+    </ItemGroup>
+    <ItemGroup Condition="'x32'=='$(MSBuildBitness)'">
+      <Reference Include="OleWoo\x32\olewoo.dll" />
+      <Reference Include="OleWoo\x32\olewoo_interop.dll" />
+    </ItemGroup>
   </Target>
-  <ItemGroup>
-    <Reference Include="olewoo">
-      <HintPath>OleWoo\$(MSBuildBitness)\olewoo.dll</HintPath>
-    </Reference>
-    <Reference Include="olewoo_interop">
-      <HintPath>OleWoo\$(MSBuildBitness)\olewoo_interop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="OleWoo\x64\" />
     <Folder Include="OleWoo\x32\" />