diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-01-13 13:12:22 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-01-13 13:57:33 -0800 |
| commit | 842f9728ab64f11fc8be30d927c732d8728d0fdc (patch) | |
| tree | d5a2c48568f2cac817aa9af65130bd06c02545d7 /src | |
| parent | 4f761ebde9e935d43233aeea1e4cfc81a655e902 (diff) | |
| download | wix-842f9728ab64f11fc8be30d927c732d8728d0fdc.tar.gz wix-842f9728ab64f11fc8be30d927c732d8728d0fdc.tar.bz2 wix-842f9728ab64f11fc8be30d927c732d8728d0fdc.zip | |
Support ImportBefore/ImportAfter to wix.targets
Diffstat (limited to 'src')
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.props | 10 | ||||
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.targets | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props index 4e73e51f..487574a3 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.props +++ b/src/wix/WixToolset.Sdk/tools/wix.props | |||
| @@ -8,6 +8,11 @@ | |||
| 8 | <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion> | 8 | <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <ImportGroup> | ||
| 12 | <Import Project="$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportBefore\*" Condition="'$(ImportUserLocationsByWildcardBeforeWixToolsetProps)' != 'false' and Exists('$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportBefore')" /> | ||
| 13 | <Import Project="$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportBefore\*" Condition="'$(ImportByWildcardBeforeWixToolsetProps)' != 'false' and Exists('$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportBefore')" /> | ||
| 14 | </ImportGroup> | ||
| 15 | |||
| 11 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> | 16 | <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> |
| 12 | 17 | ||
| 13 | <PropertyGroup> | 18 | <PropertyGroup> |
| @@ -52,4 +57,9 @@ | |||
| 52 | <CopyToOutputDirectory>Never</CopyToOutputDirectory> | 57 | <CopyToOutputDirectory>Never</CopyToOutputDirectory> |
| 53 | </None> | 58 | </None> |
| 54 | </ItemDefinitionGroup> | 59 | </ItemDefinitionGroup> |
| 60 | |||
| 61 | <ImportGroup> | ||
| 62 | <Import Project="$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportAfter\*" Condition="'$(ImportUserLocationsByWildcardAfterWixToolsetProps)' != 'false' and Exists('$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportAfter')" /> | ||
| 63 | <Import Project="$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportAfter\*" Condition="'$(ImportByWildcardAfterWixToolsetProps)' != 'false' and Exists('$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.props\ImportAfter')" /> | ||
| 64 | </ImportGroup> | ||
| 55 | </Project> | 65 | </Project> |
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets index bd27d1a5..8f96be8c 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.targets +++ b/src/wix/WixToolset.Sdk/tools/wix.targets | |||
| @@ -8,6 +8,11 @@ | |||
| 8 | 8 | ||
| 9 | <Import Project="wix.props" Condition=" '$(WixPropsImported)' != 'true' " /> | 9 | <Import Project="wix.props" Condition=" '$(WixPropsImported)' != 'true' " /> |
| 10 | 10 | ||
| 11 | <ImportGroup> | ||
| 12 | <Import Project="$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportBefore\*" Condition="'$(ImportUserLocationsByWildcardBeforeWixToolsetTargets)' != 'false' and Exists('$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportBefore')" /> | ||
| 13 | <Import Project="$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportBefore\*" Condition="'$(ImportByWildcardBeforeWixToolsetTargets)' != 'false' and Exists('$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportBefore')" /> | ||
| 14 | </ImportGroup> | ||
| 15 | |||
| 11 | <!-- | 16 | <!-- |
| 12 | *********************************************************************************************** | 17 | *********************************************************************************************** |
| 13 | *********************************************************************************************** | 18 | *********************************************************************************************** |
| @@ -939,4 +944,9 @@ | |||
| 939 | <DefaultItemExcludes Condition=" '$(BaseIntermediateOutputPath)' != '' ">$(DefaultItemExcludes);$(BaseIntermediateOutputPath)**</DefaultItemExcludes> | 944 | <DefaultItemExcludes Condition=" '$(BaseIntermediateOutputPath)' != '' ">$(DefaultItemExcludes);$(BaseIntermediateOutputPath)**</DefaultItemExcludes> |
| 940 | <DefaultExcludesInProjectFolder>$(DefaultItemExcludesInProjectFolder);**/.*/**</DefaultExcludesInProjectFolder> | 945 | <DefaultExcludesInProjectFolder>$(DefaultItemExcludesInProjectFolder);**/.*/**</DefaultExcludesInProjectFolder> |
| 941 | </PropertyGroup> | 946 | </PropertyGroup> |
| 947 | |||
| 948 | <ImportGroup> | ||
| 949 | <Import Project="$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportAfter\*" Condition="'$(ImportUserLocationsByWildcardAfterWixToolsetTargets)' != 'false' and Exists('$(MSBuildUserExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportAfter')" /> | ||
| 950 | <Import Project="$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportAfter\*" Condition="'$(ImportByWildcardAfterWixToolsetTargets)' != 'false' and Exists('$(MSBuildExtensionsPath)\WixToolset\$(WixToolsetMajorMinorVersion)\Imports\WixToolset.targets\ImportAfter')" /> | ||
| 951 | </ImportGroup> | ||
| 942 | </Project> | 952 | </Project> |