Refine build order in light of MSBuild ProjectReference protocol changes

wixtoolset · Sep 17, 2019 · 2c19a69 · 2c19a69
1 parent 14fa226
commit 2c19a69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/ext/DifxAppExtension/difxapp.proj b/src/ext/DifxAppExtension/difxapp.proj
@@ -4,6 +4,12 @@
 
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <ItemGroup>
+    <ProjectReference Include="wixlib\DIFxAppExtension.wixproj">
+      <Properties>Platform=x86</Properties>
+    </ProjectReference>
+    <ProjectReference Include="wixlib\DIFxAppExtension.wixproj">
+      <Properties>Platform=x64</Properties>
+    </ProjectReference>
     <ProjectReference Include="wixext\WixDifxAppExtension.csproj" />
   </ItemGroup>
 

diff --git a/src/ext/UtilExtension/util.proj b/src/ext/UtilExtension/util.proj
@@ -4,8 +4,8 @@
 
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <ItemGroup>
-    <ProjectReference Include="wixext\WixUtilExtension.csproj" />
     <ProjectReference Include="wixlib\UtilExtension.wixproj" />
+    <ProjectReference Include="wixext\WixUtilExtension.csproj" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\Traversal.targets" />

diff --git a/src/ext/VSExtension/vs.proj b/src/ext/VSExtension/vs.proj
@@ -5,8 +5,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <ItemGroup>
     <ProjectReference Include="ca\vsca.vcxproj" />
-    <ProjectReference Include="wixext\WixVSExtension.csproj" />
     <ProjectReference Include="wixlib\VSExtension.wixproj" />
+    <ProjectReference Include="wixext\WixVSExtension.csproj" />
 
     <ProjectReference Include="wixext\WixVSExtension.MSBuild12\WixVSExtension.MSBuild12.csproj" Condition=" '$(VS2013Available)'=='true' " />
     <ProjectReference Include="wixext\WixVSExtension.MSBuild14\WixVSExtension.MSBuild14.csproj" Condition=" '$(VS2015Available)'=='true' " />

diff --git a/src/ext/ext.proj b/src/ext/ext.proj
@@ -11,6 +11,8 @@
       <BuildInParallel>false</BuildInParallel>
     </ProjectReference>
 
+    <ProjectReference Include="UtilExtension\util.proj" />
+
     <ProjectReference Include="BalExtension\bal.proj" />
     <ProjectReference Include="ComPlusExtension\complus.proj" />
     <ProjectReference Include="DependencyExtension\dependency.proj" />
@@ -27,7 +29,6 @@
     <ProjectReference Include="SqlExtension\sql.proj" />
     <ProjectReference Include="TagExtension\tag.proj" />
     <ProjectReference Include="UIExtension\ui.proj" />
-    <ProjectReference Include="UtilExtension\util.proj" />
     <ProjectReference Include="VSExtension\vs.proj" />
   </ItemGroup>