diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-04 21:34:11 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-14 20:13:50 -0700 |
| commit | c1ce02b0c5534d2218ac9405cdc1b375b30d756c (patch) | |
| tree | b107e1bcda95916a31dec5691c9ef60df2bba03a | |
| parent | e2336c921976cb0c222f8b3e7d5be269f028e2cb (diff) | |
| download | wix-c1ce02b0c5534d2218ac9405cdc1b375b30d756c.tar.gz wix-c1ce02b0c5534d2218ac9405cdc1b375b30d756c.tar.bz2 wix-c1ce02b0c5534d2218ac9405cdc1b375b30d756c.zip | |
Only run WindowsInstallerValidation when WixBuild runs
Fixes 6853
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/wix.targets | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets index 9d820c9c..e2a02644 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.targets +++ b/src/wix/WixToolset.Sdk/tools/wix.targets | |||
| @@ -663,7 +663,9 @@ | |||
| 663 | 663 | ||
| 664 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" | 664 | RunAsSeparateProcess="$(RunWixToolsOutOfProc)" |
| 665 | ToolExe="$(WixToolExe)" | 665 | ToolExe="$(WixToolExe)" |
| 666 | ToolPath="$(WixToolDir)" /> | 666 | ToolPath="$(WixToolDir)"> |
| 667 | <Output TaskParameter="ExitCode" PropertyName="_WixBuildExitCode" /> | ||
| 668 | </WixBuild> | ||
| 667 | 669 | ||
| 668 | <ItemGroup> | 670 | <ItemGroup> |
| 669 | <_WixBuildOutputFile Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" /> | 671 | <_WixBuildOutputFile Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" /> |
| @@ -673,7 +675,7 @@ | |||
| 673 | <Target | 675 | <Target |
| 674 | Name="WindowsInstallerValidation" | 676 | Name="WindowsInstallerValidation" |
| 675 | DependsOnTargets="CoreCompile" | 677 | DependsOnTargets="CoreCompile" |
| 676 | Condition=" ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') and '$(SuppressValidation)'!='true' "> | 678 | Condition=" '$(_WixBuildExitCode)' != '' and '$(SuppressValidation)' != 'true' and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') "> |
| 677 | <WindowsInstallerValidation | 679 | <WindowsInstallerValidation |
| 678 | DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" | 680 | DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" |
| 679 | WixpdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" | 681 | WixpdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" |