diff options
author | Rob Mensching <rob@firegiant.com> | 2022-02-07 21:28:07 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-02-08 09:42:04 -0800 |
commit | 24e8f28dc9bea0a72a82abc6cafebe2364c94ef1 (patch) | |
tree | d4fedc72d9e24e9ea347ce703b930804227845a6 /src/test | |
parent | 6f97699cc2bbcd5395590a77df43583103f71e54 (diff) | |
download | wix-24e8f28dc9bea0a72a82abc6cafebe2364c94ef1.tar.gz wix-24e8f28dc9bea0a72a82abc6cafebe2364c94ef1.tar.bz2 wix-24e8f28dc9bea0a72a82abc6cafebe2364c94ef1.zip |
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.
Diffstat (limited to 'src/test')
4 files changed, 4 insertions, 3 deletions
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 @@ | |||
7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> | 7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> |
8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> | 8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> |
9 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | 9 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> |
10 | <SuppressValidation>true</SuppressValidation> | ||
10 | <ForTestingUseOnlyWixextPath>$(BaseOutputPath)$(Configuration)\netstandard2.0\ForTestingUseOnly.wixext.dll</ForTestingUseOnlyWixextPath> | 11 | <ForTestingUseOnlyWixextPath>$(BaseOutputPath)$(Configuration)\netstandard2.0\ForTestingUseOnly.wixext.dll</ForTestingUseOnlyWixextPath> |
11 | </PropertyGroup> | 12 | </PropertyGroup> |
12 | </Project> | 13 | </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 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Package Name='~WebApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='00000000-0000-0000-0000-000000000000'> | 2 | <Package Name='~WebApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'> |
3 | 3 | ||
4 | <StandardDirectory Id='ProgramFiles6432Folder'> | 4 | <StandardDirectory Id='ProgramFiles6432Folder'> |
5 | <Directory Id='ApplicationFolder' Name='~Web App'> | 5 | <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 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='00000000-0000-0000-0000-000000000000'> | 2 | <Package Name='!(loc.PackageName)' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'> |
3 | 3 | ||
4 | <StandardDirectory Id='ProgramFiles6432Folder'> | 4 | <StandardDirectory Id='ProgramFiles6432Folder'> |
5 | <Directory Id='ApplicationFolder' Name='Test App'> | 5 | <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 @@ | |||
1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 1 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
2 | <Package Name='WixprojPackageVcxprojWindowsApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='00000000-0000-0000-0000-000000000000'> | 2 | <Package Name='WixprojPackageVcxprojWindowsApp' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'> |
3 | 3 | ||
4 | <StandardDirectory Id='ProgramFilesFolder'> | 4 | <StandardDirectory Id='ProgramFilesFolder'> |
5 | <Directory Id='Application32Folder' Name='Test App (32-bit)' /> | 5 | <Directory Id='Application32Folder' Name='Test App (32-bit)' /> |