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

Commit d25311d

Browse files
barnsonbarnson
authored
Merge pull request #2 from robmen/v311-prerc-fixes
V311 prerc fixes
2 parents f4ad96b + e642e2b commit d25311d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+41349
-19
lines changed

‎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
</ItemGroup>
3131
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
3232
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
33-
<Error Text="The WiX Toolset 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 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
</ItemGroup>
2525
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
2626
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
27-
<Error Text="The WiX Toolset 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 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
</ItemGroup>
2525
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
2626
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
27-
<Error Text="The WiX Toolset 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 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
</ItemGroup>
2525
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
2626
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
27-
<Error Text="The WiX Toolset 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 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/v4/Projects/CustomActionCS/CustomAction.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Content Include="CustomAction.config" />
5252
</ItemGroup>
5353
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54-
<Import Project="$(WixCATargetsPath)" Exists('$(WixCATargetsPath)') " />
54+
<Import Project="$(WixCATargetsPath)" Condition=" Exists('$(WixCATargetsPath)') " />
5555
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixCATargetsPath)') ">
5656
<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
5757
</Target>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ $endif$
5959
<Content Include="CustomAction.config" />
6060
</ItemGroup>
6161
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
62-
<Import Project="$(WixCATargetsPath)" Exists('$(WixCATargetsPath)') " />
62+
<Import Project="$(WixCATargetsPath)" Condition=" Exists('$(WixCATargetsPath)') " />
6363
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixCATargetsPath)') ">
6464
<Error Text="The WiX Toolset build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
6565
</Target>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,7 +28,7 @@
2728
<Name>WixBalExtension</Name>
2829
</WixExtension>
2930
</ItemGroup>
30-
<Import Project="$(WixTargetsPath)" Exists('$(WixTargetsPath)') " />
31+
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
3132
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
3233
<Error Text="The WiX Toolset v4 build tools must be installed to build this project. To download the WiX Toolset v4, see http://wixtoolset.org/releases/" />
3334
</Target>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,7 +22,7 @@
2122
<ItemGroup>
2223
<Compile Include="Library.wxs" />
2324
</ItemGroup>
24-
<Import Project="$(WixTargetsPath)" Exists('$(WixTargetsPath)') " />
25+
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
2526
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
2627
<Error Text="The WiX Toolset v4 build tools must be installed to build this project. To download the WiX Toolset v4, see http://wixtoolset.org/releases/" />
2728
</Target>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,7 +22,7 @@
2122
<ItemGroup>
2223
<Compile Include="MergeModule.wxs" />
2324
</ItemGroup>
24-
<Import Project="$(WixTargetsPath)" Exists('$(WixTargetsPath)') " />
25+
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
2526
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
2627
<Error Text="The WiX Toolset v4 build tools must be installed to build this project. To download the WiX Toolset v4, see http://wixtoolset.org/releases/" />
2728
</Target>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
34
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,7 +22,7 @@
2122
<ItemGroup>
2223
<Compile Include="Product.wxs" />
2324
</ItemGroup>
24-
<Import Project="$(WixTargetsPath)" Exists('$(WixTargetsPath)') " />
25+
<Import Project="$(WixTargetsPath)" Condition=" Exists('$(WixTargetsPath)') " />
2526
<Target Name="EnsureWixToolsetInstalled" Condition=" !Exists('$(WixTargetsPath)') ">
2627
<Error Text="The WiX Toolset v4 build tools must be installed to build this project. To download the WiX Toolset v4, see http://wixtoolset.org/releases/" />
2728
</Target>

0 commit comments

Comments
 (0)