From 24e8f28dc9bea0a72a82abc6cafebe2364c94ef1 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 7 Feb 2022 21:28:07 -0800
Subject: Make validation independent of the build command

In MSBuild this adds a new WindowsInstallerValidation target that
automatically runs validation after a successful build. From the
command-line the "wix msi" command gets a "validate" subcommand that
will validate an MSI or MSM file.
---
 src/test/burn/Directory.wixproj.props                                   | 1 +
 .../wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs  | 2 +-
 src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs       | 2 +-
 .../wix/TestData/WixprojPackageVcxprojWindowsAppMultiArch/Package.wxs   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/test')

diff --git a/src/test/burn/Directory.wixproj.props b/src/test/burn/Directory.wixproj.props
index af5ef196..21ab5107 100644
--- a/src/test/burn/Directory.wixproj.props
+++ b/src/test/burn/Directory.wixproj.props
@@ -7,6 +7,7 @@
     <DefaultCompressionLevel>None</DefaultCompressionLevel>
     <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
     <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
+    <SuppressValidation>true</SuppressValidation>
     <ForTestingUseOnlyWixextPath>$(BaseOutputPath)$(Configuration)\netstandard2.0\ForTestingUseOnly.wixext.dll</ForTestingUseOnlyWixextPath>
   </PropertyGroup>
 </Project>
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs
index c228bb33..cbc8cae1 100644
--- a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs
+++ b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/Package.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name='~WebApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='00000000-0000-0000-0000-000000000000'>
+  <Package Name='~WebApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
 
     <StandardDirectory Id='ProgramFiles6432Folder'>
       <Directory Id='ApplicationFolder' Name='~Web App'>
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs
index c0370683..fe849608 100644
--- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs
+++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsApp/Package.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='00000000-0000-0000-0000-000000000000'>
+  <Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
 
     <StandardDirectory Id='ProgramFiles6432Folder'>
       <Directory Id='ApplicationFolder' Name='Test App'>
diff --git a/src/test/wix/TestData/WixprojPackageVcxprojWindowsAppMultiArch/Package.wxs b/src/test/wix/TestData/WixprojPackageVcxprojWindowsAppMultiArch/Package.wxs
index 9d3df756..ad95dac3 100644
--- a/src/test/wix/TestData/WixprojPackageVcxprojWindowsAppMultiArch/Package.wxs
+++ b/src/test/wix/TestData/WixprojPackageVcxprojWindowsAppMultiArch/Package.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name='WixprojPackageVcxprojWindowsApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='00000000-0000-0000-0000-000000000000'>
+  <Package Name='WixprojPackageVcxprojWindowsApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
 
     <StandardDirectory Id='ProgramFilesFolder'>
       <Directory Id='Application32Folder' Name='Test App (32-bit)' />
-- 
cgit v1.2.3-55-g6feb