ag/cpython-bin-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Wix to v3.11

Browse Source
This commit is contained in:
Steve Dower
2017-09-04 14:00:39 -07:00
committed by Steve Dower
parent dfc13f5681
commit 2431f7ee3f
125 changed files with 230 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wix2010.targets
View File

@@ -8,8 +8,8 @@
InitialTargets="_CheckForInvalidConfigurationAndPlatform;
_CheckRequiredProperties">
<PropertyGroup>
<WixInstallPath Condition=" '$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath>
<WixInstallPath Condition=" '$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.10@InstallRoot)</WixInstallPath>
<WixInstallPath Condition=" '$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.11@InstallRoot)</WixInstallPath>
<WixInstallPath Condition=" '$(WixInstallPath)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.11@InstallRoot)</WixInstallPath>
</PropertyGroup>
<!--
@@ -2436,6 +2436,7 @@
ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
AdditionalOptions="$(LinkerAdditionalOptions)"
AllowIdenticalRows="$(AllowIdenticalRows)"
AllowDuplicateDirectoryIds="$(AllowDuplicateDirectoryIds)"
AllowUnresolvedReferences="$(AllowUnresolvedReferences)"
AdditionalCub="$(AdditionalCub)"
BackwardsCompatibleGuidGeneration="$(BackwardsCompatibleGuidGeneration)"
@@ -3053,7 +3054,7 @@
<!--
==================================================================================================
GetNativeManifest & GetCopyToOutputDirectoryItems
GetNativeManifest, GetCopyToOutputDirectoryItems, GetTargetFrameworkProperties
Some project types expect these targets to be defined when they take a project reference. They
are normally defined in Microsoft.Common.targets but we don't include that targets so we define
@@ -3062,6 +3063,7 @@
-->
<Target Name="GetNativeManifest"/>
<Target Name="GetCopyToOutputDirectoryItems" />
<Target Name="GetTargetFrameworkProperties" />
<!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. -->
<Import Project="$(CustomAfterWixTargets)" Condition=" '$(CustomAfterWixTargets)' != '' and Exists('$(CustomAfterWixTargets)')" />