Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit 2c19a69

Browse files
committed
Refine build order in light of MSBuild ProjectReference protocol changes
1 parent 14fa226 commit 2c19a69

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

src/ext/DifxAppExtension/difxapp.proj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
66
<ItemGroup>
7+
<ProjectReference Include="wixlib\DIFxAppExtension.wixproj">
8+
<Properties>Platform=x86</Properties>
9+
</ProjectReference>
10+
<ProjectReference Include="wixlib\DIFxAppExtension.wixproj">
11+
<Properties>Platform=x64</Properties>
12+
</ProjectReference>
713
<ProjectReference Include="wixext\WixDifxAppExtension.csproj" />
814
</ItemGroup>
915

src/ext/UtilExtension/util.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
66
<ItemGroup>
7-
<ProjectReference Include="wixext\WixUtilExtension.csproj" />
87
<ProjectReference Include="wixlib\UtilExtension.wixproj" />
8+
<ProjectReference Include="wixext\WixUtilExtension.csproj" />
99
</ItemGroup>
1010

1111
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\Traversal.targets" />

src/ext/VSExtension/vs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
66
<ItemGroup>
77
<ProjectReference Include="ca\vsca.vcxproj" />
8-
<ProjectReference Include="wixext\WixVSExtension.csproj" />
98
<ProjectReference Include="wixlib\VSExtension.wixproj" />
9+
<ProjectReference Include="wixext\WixVSExtension.csproj" />
1010

1111
<ProjectReference Include="wixext\WixVSExtension.MSBuild12\WixVSExtension.MSBuild12.csproj" Condition=" '$(VS2013Available)'=='true' " />
1212
<ProjectReference Include="wixext\WixVSExtension.MSBuild14\WixVSExtension.MSBuild14.csproj" Condition=" '$(VS2015Available)'=='true' " />

src/ext/ext.proj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<BuildInParallel>false</BuildInParallel>
1212
</ProjectReference>
1313

14+
<ProjectReference Include="UtilExtension\util.proj" />
15+
1416
<ProjectReference Include="BalExtension\bal.proj" />
1517
<ProjectReference Include="ComPlusExtension\complus.proj" />
1618
<ProjectReference Include="DependencyExtension\dependency.proj" />
@@ -27,7 +29,6 @@
2729
<ProjectReference Include="SqlExtension\sql.proj" />
2830
<ProjectReference Include="TagExtension\tag.proj" />
2931
<ProjectReference Include="UIExtension\ui.proj" />
30-
<ProjectReference Include="UtilExtension\util.proj" />
3132
<ProjectReference Include="VSExtension\vs.proj" />
3233
</ItemGroup>
3334

0 commit comments

Comments
 (0)