Skip to content

Commit 08e54e1

Browse files
compnerdcompnerd
committed
WiX: drop dependency on votive
We would previously depend on votive to provide the versioned non-isolated installation of the `Wix.targets` project for the wix targets definitions. Instead update the wixproj files to scan both the non-isolated and the isolated installations to enable us to build without the votive dependency. This allows us to reduce another dependency on Visual Studio towards just the build tools.
1 parent eaa8215 commit 08e54e1

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎platforms/Windows/devtools.wixproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTarget="Build">
3-
<PropertyGroup>
4-
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<OutputName>devtools</OutputName>
95
<OutputType>Package</OutputType>
@@ -22,7 +18,11 @@
2218
<DefineSolutionProperties>false</DefineSolutionProperties>
2319
</PropertyGroup>
2420

25-
<Import Project="$(WixTargetsPath)" />
21+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
22+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
23+
<Target Name="EnsureWiXToolsetInstalled" Condition="">
24+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/." />
25+
</Target>
2626

2727
<PropertyGroup>
2828
<DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);</DefineConstants>

‎platforms/Windows/icu.wixproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3-
<PropertyGroup>
4-
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<OutputName>icu</OutputName>
95
<OutputType>Package</OutputType>
@@ -25,7 +21,11 @@
2521
<DefineSolutionProperties>false</DefineSolutionProperties>
2622
</PropertyGroup>
2723

28-
<Import Project="$(WixTargetsPath)" />
24+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
25+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
26+
<Target Name="EnsureWiXToolsetInstalled" Condition="">
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 https://wixtoolset.org/releases/." />
28+
</Target>
2929

3030
<PropertyGroup>
3131
<DefineConstants>ProductVersion=$(ProductVersion);ProductVersionMajor=$(ProductVersionMajor);ICU_ROOT=$(ICU_ROOT)</DefineConstants>

‎platforms/Windows/installer.wixproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3-
<PropertyGroup>
4-
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<OutputName>installer</OutputName>
95
<OutputType>Bundle</OutputType>
@@ -28,7 +24,11 @@
2824
<DefineSolutionProperties>false</DefineSolutionProperties>
2925
</PropertyGroup>
3026

31-
<Import Project="$(WixTargetsPath)" />
27+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
28+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
29+
<Target Name="EnsureWiXToolsetInstalled" Condition="">
30+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/." />
31+
</Target>
3232

3333
<PropertyGroup>
3434
<DefineConstants>ProductVersion=$(ProductVersion);RequiredChain=$(RequiredChain);OptionalChain=$(OptionalChain);MSI_LOCATION=$(MSI_LOCATION);</DefineConstants>

‎platforms/Windows/runtime.wixproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3-
<PropertyGroup>
4-
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<OutputName>runtime</OutputName>
95
<OutputType>Package</OutputType>
@@ -25,7 +21,11 @@
2521
<DefineSolutionProperties>false</DefineSolutionProperties>
2622
</PropertyGroup>
2723

28-
<Import Project="$(WixTargetsPath)" />
24+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
25+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
26+
<Target Name="EnsureWiXToolsetInstalled" Condition="">
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 https://wixtoolset.org/releases/." />
28+
</Target>
2929

3030
<PropertyGroup>
3131
<DefineConstants>ProductVersion=$(ProductVersion);SDK_ROOT=$(SDK_ROOT);$(INCLUDE_DEBUG_INFO)</DefineConstants>

‎platforms/Windows/sdk.wixproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3-
<PropertyGroup>
4-
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<OutputName>sdk</OutputName>
95
<OutputType>Package</OutputType>
@@ -25,7 +21,11 @@
2521
<DefineSolutionProperties>false</DefineSolutionProperties>
2622
</PropertyGroup>
2723

28-
<Import Project="$(WixTargetsPath)" />
24+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
25+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
26+
<Target Name="EnsureWiXToolsetInstalled" Condition="">
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 https://wixtoolset.org/releases/." />
28+
</Target>
2929

3030
<PropertyGroup>
3131
<DefineConstants>ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SWIFT_SOURCE_DIR=$(SWIFT_SOURCE_DIR);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;</DefineConstants>

‎platforms/Windows/toolchain.wixproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3-
<PropertyGroup>
4-
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
5-
</PropertyGroup>
6-
73
<PropertyGroup>
84
<OutputName>toolchain</OutputName>
95
<OutputType>Package</OutputType>
@@ -19,7 +15,11 @@
1915
<DefineSolutionProperties>false</DefineSolutionProperties>
2016
</PropertyGroup>
2117

22-
<Import Project="$(WixTargetsPath)" />
18+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
19+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
20+
<Target Name="EnsureWiXToolsetInstalled" Condition="">
21+
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/." />
22+
</Target>
2323

2424
<PropertyGroup>
2525
<DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;$(INCLUDE_DEBUG_INFO)</DefineConstants>

0 commit comments

Comments
 (0)