From f3daa1b430e5cbbc7610ebb5b356b7ac3ddb775e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 3 May 2018 13:22:46 -0700
Subject: [PATCH] Correctly order the VS and Util extension traversal projects

---
 src/ext/UtilExtension/util.proj | 2 +-
 src/ext/VSExtension/vs.proj     | 2 +-
 src/ext/ext.proj                | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ext/UtilExtension/util.proj b/src/ext/UtilExtension/util.proj
index 488857cd5..0462f654c 100644
--- 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
index 2612e88a5..553ccdbf5 100644
--- 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
index 72c766c89..16679ccff 100644
--- 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>