diff options
| author | Bob Arnson <bob@firegiant.com> | 2023-02-09 18:13:30 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2023-02-09 20:45:37 -0500 |
| commit | 15218b98004e5966bb8b8135c319e1a02978f4c8 (patch) | |
| tree | c7604ac91d89b2a38de1283e7d5884e765318fae | |
| parent | cdb457d593cb09a88e73cdcd9538a66e62610cf1 (diff) | |
| download | wix-15218b98004e5966bb8b8135c319e1a02978f4c8.tar.gz wix-15218b98004e5966bb8b8135c319e1a02978f4c8.tar.bz2 wix-15218b98004e5966bb8b8135c319e1a02978f4c8.zip | |
Fetch latest .cubs & suppress ICE103...
...for merge module validations, because mergemod.cub has a CA DLL that
doesn't export ICE103.
Fixes https://github.com/wixtoolset/issues/issues/6567.
| -rw-r--r-- | src/wix/WixToolset.Core.Native/cubes/darice.cub | bin | 692224 -> 692224 bytes | |||
| -rw-r--r-- | src/wix/WixToolset.Core.Native/cubes/mergemod.cub | bin | 501248 -> 499712 bytes | |||
| -rw-r--r-- | src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs | 10 | ||||
| -rw-r--r-- | src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs | 8 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/wix/WixToolset.Core.Native/cubes/darice.cub b/src/wix/WixToolset.Core.Native/cubes/darice.cub index c9f29f3a..b07d228b 100644 --- a/src/wix/WixToolset.Core.Native/cubes/darice.cub +++ b/src/wix/WixToolset.Core.Native/cubes/darice.cub | |||
| Binary files differ | |||
diff --git a/src/wix/WixToolset.Core.Native/cubes/mergemod.cub b/src/wix/WixToolset.Core.Native/cubes/mergemod.cub index 2042a99e..3913d873 100644 --- a/src/wix/WixToolset.Core.Native/cubes/mergemod.cub +++ b/src/wix/WixToolset.Core.Native/cubes/mergemod.cub | |||
| Binary files differ | |||
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs index 6996dc44..86212c99 100644 --- a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs +++ b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs | |||
| @@ -26,10 +26,16 @@ namespace WixToolset.Core.WindowsInstaller.Validate | |||
| 26 | this.DatabasePath = databasePath; | 26 | this.DatabasePath = databasePath; |
| 27 | this.CubeFiles = cubeFiles; | 27 | this.CubeFiles = cubeFiles; |
| 28 | this.Ices = ices; | 28 | this.Ices = ices; |
| 29 | this.SuppressedIces = suppressedIces == null ? WellKnownSuppressedIces : suppressedIces.Union(WellKnownSuppressedIces); | ||
| 30 | |||
| 31 | this.IntermediateFolder = intermediateFolder; | 29 | this.IntermediateFolder = intermediateFolder; |
| 32 | this.OutputSourceLineNumber = new SourceLineNumber(databasePath); | 30 | this.OutputSourceLineNumber = new SourceLineNumber(databasePath); |
| 31 | this.SuppressedIces = suppressedIces == null ? WellKnownSuppressedIces : suppressedIces.Union(WellKnownSuppressedIces); | ||
| 32 | |||
| 33 | // Suppress ICE103 for merge modules because the custom action DLL in mergemod.cub is borked. | ||
| 34 | // See https://github.com/wixtoolset/issues/issues/6567. | ||
| 35 | if (Path.GetExtension(this.DatabasePath) == ".msm") | ||
| 36 | { | ||
| 37 | this.SuppressedIces = this.SuppressedIces.Union(new[] { "ICE103" }); | ||
| 38 | } | ||
| 33 | } | 39 | } |
| 34 | 40 | ||
| 35 | public IEnumerable<ITrackedFile> TrackedFiles { get; private set; } | 41 | public IEnumerable<ITrackedFile> TrackedFiles { get; private set; } |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs index 156990cc..8c5c23da 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs | |||
| @@ -20,7 +20,6 @@ namespace WixToolsetTest.CoreIntegration | |||
| 20 | // These tests are still interesting (and complex) enough to keep | 20 | // These tests are still interesting (and complex) enough to keep |
| 21 | // around for manual testing. Uncomment or define the following | 21 | // around for manual testing. Uncomment or define the following |
| 22 | // line to do so. | 22 | // line to do so. |
| 23 | #if DISABLE_VALIDATION_TESTS_DUE_TO_WINDOWS_INSTALLER_INCONSISTENCIES | ||
| 24 | public class ValidationFixture | 23 | public class ValidationFixture |
| 25 | { | 24 | { |
| 26 | [Fact] | 25 | [Fact] |
| @@ -213,7 +212,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 213 | 212 | ||
| 214 | File.WriteAllLines(Path.Combine(testLogsFolder, "validate.txt"), validationResult.Messages.Select(m => m.ToString())); | 213 | File.WriteAllLines(Path.Combine(testLogsFolder, "validate.txt"), validationResult.Messages.Select(m => m.ToString())); |
| 215 | 214 | ||
| 216 | Assert.Equal(1, validationResult.ExitCode); | 215 | Assert.Equal(1076, validationResult.ExitCode); |
| 217 | 216 | ||
| 218 | var messages = validationResult.Messages.Select(m => m.ToString()).ToArray(); | 217 | var messages = validationResult.Messages.Select(m => m.ToString()).ToArray(); |
| 219 | WixAssert.CompareLineByLine(new[] | 218 | WixAssert.CompareLineByLine(new[] |
| @@ -302,7 +301,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 302 | msiPath | 301 | msiPath |
| 303 | }); | 302 | }); |
| 304 | 303 | ||
| 305 | Assert.Equal(1, validationResult.ExitCode); | 304 | Assert.Equal(1076, validationResult.ExitCode); |
| 306 | 305 | ||
| 307 | var messages = validationResult.Messages.Select(m => m.ToString()).ToArray(); | 306 | var messages = validationResult.Messages.Select(m => m.ToString()).ToArray(); |
| 308 | WixAssert.CompareLineByLine(new[] | 307 | WixAssert.CompareLineByLine(new[] |
| @@ -342,7 +341,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 342 | msiPath | 341 | msiPath |
| 343 | }); | 342 | }); |
| 344 | 343 | ||
| 345 | Assert.Equal(1, validationResult.ExitCode); | 344 | Assert.Equal(1076, validationResult.ExitCode); |
| 346 | 345 | ||
| 347 | var messages = validationResult.Messages.Select(m => m.ToString()).ToArray(); | 346 | var messages = validationResult.Messages.Select(m => m.ToString()).ToArray(); |
| 348 | WixAssert.CompareLineByLine(new[] | 347 | WixAssert.CompareLineByLine(new[] |
| @@ -423,5 +422,4 @@ namespace WixToolsetTest.CoreIntegration | |||
| 423 | } | 422 | } |
| 424 | } | 423 | } |
| 425 | } | 424 | } |
| 426 | #endif | ||
| 427 | } | 425 | } |