From c1ce02b0c5534d2218ac9405cdc1b375b30d756c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 4 Oct 2022 21:34:11 -0700
Subject: Only run WindowsInstallerValidation when WixBuild runs

Fixes 6853
---
 src/wix/WixToolset.Sdk/tools/wix.targets | 6 ++++--
 1 file 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 @@
 
         RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
         ToolExe="$(WixToolExe)"
-        ToolPath="$(WixToolDir)" />
+        ToolPath="$(WixToolDir)">
+        <Output TaskParameter="ExitCode" PropertyName="_WixBuildExitCode" />
+      </WixBuild>
 
     <ItemGroup>
       <_WixBuildOutputFile Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" />
@@ -673,7 +675,7 @@
   <Target
       Name="WindowsInstallerValidation"
       DependsOnTargets="CoreCompile" 
-      Condition=" ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') and '$(SuppressValidation)'!='true' ">
+      Condition=" '$(_WixBuildExitCode)' != '' and '$(SuppressValidation)' != 'true' and ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') ">
       <WindowsInstallerValidation
           DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"
           WixpdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
-- 
cgit v1.2.3-55-g6feb