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

Commit 12e3fb6

Browse files
robmenrobmen
committed
Reference v3.11 (or newer) in error messages
Improve the error message to explicitly call out v3.11 since new targets are required for MSBuild15 to work correctly. Also, make redirects imports consistent with project template imports so error messages are consistent. Fixes wixtoolset/issues#5564
1 parent eb7a786 commit 12e3fb6

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

‎src/Templates/v3/Projects/CustomActionCS/CustomAction.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
<Import Project="$(WixCATargetsPath)" Condition=" '$(WixCATargetsPath)' != '' " />
5454
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets" Condition=" '$(WixCATargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets') " />
5555
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
56-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
56+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
5757
</Target>
5858
</Project>

‎src/Templates/v3/Projects/CustomActionVB/CustomAction.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ $endif$
6161
<Import Project="$(WixCATargetsPath)" Condition=" '$(WixCATargetsPath)' != '' " />
6262
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets" Condition=" '$(WixCATargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.CA.targets') " />
6363
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
64-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
64+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
6565
</Target>
6666
</Project>

‎src/Templates/v3/Projects/WixBundleProject/BundleProject.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
3131
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
3232
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
33-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
33+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
3434
</Target>
3535
<!--
3636
$loc_WIXPROJ_TOMODIFY_LINE1$

‎src/Templates/v3/Projects/WixLibrary/setuplibrary.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
2525
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
2626
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
27-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
27+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
2828
</Target>
2929
<!--
3030
$loc_WIXPROJ_TOMODIFY_LINE1$

‎src/Templates/v3/Projects/WixMergeModule/MergeModule.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
2525
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
2626
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
27-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
27+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
2828
</Target>
2929
<!--
3030
$loc_WIXPROJ_TOMODIFY_LINE1$

‎src/Templates/v3/Projects/WixProject/SetupProject.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
2525
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
2626
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
27-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
27+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
2828
</Target>
2929
<!--
3030
$loc_WIXPROJ_TOMODIFY_LINE1$

‎src/Votive2017/redirects/v3/wix.ca.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<Import Project="$(WixMSBuildFolder)wix.ca.targets" Condition=" Exists('$(WixMSBuildFolder)wix.ca.targets') " />
9-
<Target Name="EnsureActualWixToolsetInstalled" Condition=" !Exists('$(WixMSBuildFolder)wix.ca.targets') ">
9+
<Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
1010
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.ca.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
1111
</Target>
1212
</Project>

‎src/Votive2017/redirects/v3/wix.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<Import Project="$(WixMSBuildFolder)wix.targets" Condition=" Exists('$(WixMSBuildFolder)wix.targets') " />
9-
<Target Name="EnsureActualWixToolsetInstalled" Condition=" !Exists('$(WixMSBuildFolder)wix.targets') ">
10-
<Error Text="The WiX Toolset v3 build tools must be installed to build this project. Could not find wix.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3, see http://wixtoolset.org/releases/" />
9+
<Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
10+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. Could not find wix.targets at '$(WixMSBuildFolder)'. To download WiX Toolset v3.11 (or newer), see http://wixtoolset.org/releases/" />
1111
</Target>
1212
</Project>

‎src/Votive2017/redirects/v4/wix.ca.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<Import Project="$(WixInstallFolder)sdk\wix.ca.targets" Condition=" Exists('$(WixInstallFolder)sdk\wix.ca.targets') " />
9-
<Target Name="EnsureActualWixToolsetInstalled" Condition=" !Exists('$(WixInstallFolder)sdk\wix.ca.targets') ">
9+
<Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixCATargetsImported)' != 'true' ">
1010
<Error Text="The WiX Toolset v4 build tools must be installed to build this project. Could not find wix.ca.targets at '$(WixInstallFolder)sdk\'. To download WiX Toolset v4, see http://wixtoolset.org/releases/" />
1111
</Target>
1212
</Project>

‎src/Votive2017/redirects/v4/wix.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<Import Project="$(WixInstallFolder)bin\wix.targets" Condition=" Exists('$(WixInstallFolder)bin\wix.targets') " />
9-
<Target Name="EnsureActualWixToolsetInstalled" Condition=" !Exists('$(WixInstallFolder)bin\wix.targets') ">
9+
<Target Name="EnsureActualWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
1010
<Error Text="The WiX Toolset v4 build tools must be installed to build this project. Could not find wix.targets at '$(WixInstallFolder)'. To download WiX Toolset v4, see http://wixtoolset.org/releases/" />
1111
</Target>
1212
</Project>

0 commit comments

Comments
 (0)