Skip to content

Commit

Permalink
Correctly order the VS and Util extension traversal projects
Browse files Browse the repository at this point in the history
  • Loading branch information
robmen committed May 3, 2018
1 parent fc1f4b9 commit 95cc836
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/ext/UtilExtension/util.proj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/ext/VSExtension/vs.proj
Original file line number Diff line number Diff line change
Expand Up @@ -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' " />
Expand Down

0 comments on commit 95cc836

Please sign in to comment.