33 files changed, 711 insertions, 202 deletions

diff --git a/src/api/wix/WixToolset.Extensibility/Data/IBindContext.cs b/src/api/wix/WixToolset.Extensibility/Data/IBindContext.cs
index d0c65683..671da292 100644
--- a/src/api/wix/WixToolset.Extensibility/Data/IBindContext.cs
+++ b/src/api/wix/WixToolset.Extensibility/Data/IBindContext.cs
@@ -53,11 +53,6 @@ namespace WixToolset.Extensibility.Data
         IReadOnlyCollection<IFileSystemExtension> FileSystemExtensions { get; set; }
 
         /// <summary>
-        /// Set of ICEs to execute.
-        /// </summary>
-        IReadOnlyCollection<string> Ices { get; set; }
-
-        /// <summary>
         /// Intermedaite folder.
         /// </summary>
         string IntermediateFolder { get; set; }
@@ -98,16 +93,6 @@ namespace WixToolset.Extensibility.Data
         int? ResolvedLcid { get; set; }
 
         /// <summary>
-        /// Set of ICEs to skip.
-        /// </summary>
-        IReadOnlyCollection<string> SuppressIces { get; set; }
-
-        /// <summary>
-        /// Skip all ICEs.
-        /// </summary>
-        bool SuppressValidation { get; set; }
-
-        /// <summary>
         /// Skip creation of output.
         /// </summary>
         bool SuppressLayout { get; set; }
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)' />
diff --git a/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
new file mode 100644
index 00000000..ae708c0e
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/WindowsInstallerValidation.cs
@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.BuildTasks
+{
+    using Microsoft.Build.Framework;
+
+    /// <summary>
+    /// An MSBuild task to run WiX to detach bundle engine to be signed.
+    /// </summary>
+    public sealed partial class WindowsInstallerValidation : WixExeBaseTask
+    {
+        /// <summary>
+        /// Gets or sets the path to the database to validate.
+        /// </summary>
+        [Required]
+        public ITaskItem DatabaseFile { get; set; }
+
+        /// <summary>
+        /// Gets or sets the intermedidate folder to use.
+        /// </summary>
+        public ITaskItem IntermediateDirectory { get; set; }
+
+        /// <summary>
+        /// Gets or sets the paths to ICE CUBes to execute.
+        /// </summary>
+        public string[] CubeFiles { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ICEs to execute.
+        /// </summary>
+        public string[] Ices { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ICEs to suppress.
+        /// </summary>
+        public string[] SuppressIces { get; set; }
+
+        /// <summary>
+        /// Gets or sets the .wixpdb for the database.
+        /// </summary>
+        public ITaskItem WixpdbFile { get; set; }
+
+        protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
+        {
+            commandLineBuilder.AppendTextUnquoted("msi validate");
+
+            commandLineBuilder.AppendFileNameIfNotNull(this.DatabaseFile);
+            commandLineBuilder.AppendSwitchIfNotNull("-pdb ", this.WixpdbFile);
+            commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
+            commandLineBuilder.AppendArrayIfNotNull("-cub ", this.CubeFiles);
+            commandLineBuilder.AppendArrayIfNotNull("-ice ", this.Ices);
+            commandLineBuilder.AppendArrayIfNotNull("-sice ", this.SuppressIces);
+
+            base.BuildCommandLine(commandLineBuilder);
+
+            commandLineBuilder.AppendTextIfNotWhitespace(this.AdditionalOptions);
+        }
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index 2d35c391..11de0242 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -64,13 +64,8 @@ namespace WixToolset.BuildTasks
         public ITaskItem UnreferencedSymbolsFile { get; set; }
 
         public ITaskItem WixProjectFile { get; set; }
-        public string[] WixVariables { get; set; }
-
-        public bool SuppressValidation { get; set; }
 
-        public string[] SuppressIces { get; set; }
-
-        public string AdditionalCub { get; set; }
+        public string[] WixVariables { get; set; }
 
         protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)
         {
@@ -85,8 +80,6 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendArrayIfNotNull("-d ", this.DefineConstants);
             commandLineBuilder.AppendArrayIfNotNull("-I ", this.IncludeSearchPaths);
             commandLineBuilder.AppendExtensions(this.Extensions, this.ExtensionDirectory, this.ReferencePaths);
-            commandLineBuilder.AppendIfTrue("-sval", this.SuppressValidation);
-            commandLineBuilder.AppendArrayIfNotNull("-sice ", this.SuppressIces);
             commandLineBuilder.AppendSwitchIfNotNull("-usf ", this.UnreferencedSymbolsFile);
             commandLineBuilder.AppendSwitchIfNotNull("-cc ", this.CabinetCachePath);
             commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
diff --git a/src/wix/WixToolset.Core.Native/FileSystem.cs b/src/wix/WixToolset.Core.Native/FileSystem.cs
index d843a9e8..3dc336d6 100644
--- a/src/wix/WixToolset.Core.Native/FileSystem.cs
+++ b/src/wix/WixToolset.Core.Native/FileSystem.cs
@@ -62,14 +62,14 @@ namespace WixToolset.Core.Native
 
         private static void EnsureDirectoryWithoutFile(string path)
         {
-            File.Delete(path);
-
             var directory = Path.GetDirectoryName(path);
 
             if (!String.IsNullOrEmpty(directory))
             {
                 Directory.CreateDirectory(directory);
             }
+
+            File.Delete(path);
         }
 
         [DllImport("Kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index f2a8b9c6..ab471702 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -21,11 +21,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         // As outlined in RFC 4122, this is our namespace for generating name-based (version 3) UUIDs.
         internal static readonly Guid WixComponentGuidNamespace = new Guid("{3064E5C6-FB63-4FE9-AC49-E446A792EFA5}");
 
-        public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtension, string cubeFile) : this(context, backendExtension, null, cubeFile)
-        {
-        }
-
-        public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtension, IEnumerable<SubStorage> subStorages, string cubeFile)
+        public BindDatabaseCommand(IBindContext context, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtension, IEnumerable<SubStorage> subStorages = null)
         {
             this.ServiceProvider = context.ServiceProvider;
 
@@ -53,11 +49,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             this.SubStorages = subStorages;
 
-            this.SuppressValidation = context.SuppressValidation;
-            this.Ices = context.Ices;
-            this.SuppressedIces = context.SuppressIces;
-            this.CubeFiles = String.IsNullOrEmpty(cubeFile) ? null : new[] { cubeFile };
-
             this.BackendExtensions = backendExtension;
         }
 
@@ -109,12 +100,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private bool SuppressValidation { get; }
 
-        private IEnumerable<string> Ices { get; }
-
-        private IEnumerable<string> SuppressedIces { get; }
-
-        private IEnumerable<string> CubeFiles { get; }
-
         public IBindResult Execute()
         {
             if (!this.Intermediate.HasLevel(Data.IntermediateLevels.Linked) || !this.Intermediate.HasLevel(Data.IntermediateLevels.Resolved))
@@ -507,20 +492,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 return null;
             }
 
-            // Validate the output if there are CUBe files and we're not explicitly suppressing validation.
-            if (this.CubeFiles != null && !this.SuppressValidation)
-            {
-                var command = new ValidateDatabaseCommand(this.Messaging, this.WindowsInstallerBackendHelper, this.IntermediateFolder, data, this.OutputPath, this.CubeFiles, this.Ices, this.SuppressedIces);
-                command.Execute();
-
-                trackedFiles.AddRange(command.TrackedFiles);
-            }
-
-            if (this.Messaging.EncounteredError)
-            {
-                return null;
-            }
-
             // Process uncompressed files.
             if (!this.SuppressLayout && uncompressedFiles.Any())
             {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/ValidateSubcommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/ValidateSubcommand.cs
new file mode 100644
index 00000000..7d77aa30
--- /dev/null
+++ b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/ValidateSubcommand.cs
@@ -0,0 +1,131 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.WindowsInstaller.CommandLine
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using WixToolset.Core.WindowsInstaller.Validate;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility.Services;
+
+    internal class ValidateSubcommand : WindowsInstallerSubcommandBase
+    {
+        public ValidateSubcommand(IServiceProvider serviceProvider)
+        {
+            this.Messaging = serviceProvider.GetService<IMessaging>();
+        }
+
+        private IMessaging Messaging { get; }
+
+        private string DatabasePath { get; set; }
+
+        private string WixpdbPath { get; set; }
+
+        private string IntermediateFolder { get; set; }
+
+        private List<string> CubeFiles { get; } = new List<string>();
+
+        private List<string> Ices { get; } = new List<string>();
+
+        private List<string> SuppressIces { get; } = new List<string>();
+
+        public override Task<int> ExecuteAsync(CancellationToken cancellationToken)
+        {
+            WindowsInstallerData data = null;
+
+            if (String.IsNullOrEmpty(this.DatabasePath))
+            {
+                Console.Error.WriteLine("Input MSI or MSM database is required");
+                return Task.FromResult(-1);
+            }
+
+            if (this.CubeFiles.Count == 0)
+            {
+                var ext = Path.GetExtension(this.DatabasePath);
+                switch (ext.ToLowerInvariant())
+                {
+                    case ".msi":
+                        this.CubeFiles.Add("darice.cub");
+                        break;
+
+                    case ".msm":
+                        this.CubeFiles.Add("mergemod.cub");
+                        break;
+
+                    default:
+                        Console.Error.WriteLine("Unknown extension: {0}. Use the -cub switch to specify the path to the ICE CUBe file", ext);
+                        return Task.FromResult(-1);
+                }
+            }
+
+            if (String.IsNullOrEmpty(this.WixpdbPath))
+            {
+                this.WixpdbPath = Path.ChangeExtension(this.DatabasePath, ".wixpdb");
+            }
+
+            if (String.IsNullOrEmpty(this.IntermediateFolder))
+            {
+                this.IntermediateFolder = Path.GetTempPath();
+            }
+
+            if (File.Exists(this.WixpdbPath))
+            {
+                data = WindowsInstallerData.Load(this.WixpdbPath);
+            }
+
+            var command = new ValidateDatabaseCommand(this.Messaging, this.IntermediateFolder, this.DatabasePath, data, this.CubeFiles, this.Ices, this.SuppressIces);
+            command.Execute();
+
+            return Task.FromResult(this.Messaging.EncounteredError ? 1 : 0);
+        }
+
+        public override bool TryParseArgument(ICommandLineParser parser, string argument)
+        {
+            if (parser.IsSwitch(argument))
+            {
+                var parameter = argument.Substring(1);
+                switch (parameter.ToLowerInvariant())
+                {
+                    case "cub":
+                    {
+                        var value = parser.GetNextArgumentOrError(argument);
+                        this.CubeFiles.Add(value);
+                        return true;
+                    }
+
+                    case "ice":
+                    {
+                        var value = parser.GetNextArgumentOrError(argument);
+                        this.Ices.Add(value);
+                        return true;
+                    }
+
+                    case "intermediatefolder":
+                        this.IntermediateFolder = parser.GetNextArgumentAsDirectoryOrError(argument);
+                        return true;
+
+                    case "pdb":
+                        this.WixpdbPath = parser.GetNextArgumentAsFilePathOrError(argument);
+                        return true;
+
+                    case "sice":
+                    {
+                        var value = parser.GetNextArgumentOrError(argument);
+                        this.SuppressIces.Add(value);
+                        return true;
+                    }
+                }
+            }
+            else if (String.IsNullOrEmpty(this.DatabasePath))
+            {
+                this.DatabasePath = argument;
+                return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/WindowsInstallerCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/WindowsInstallerCommand.cs
index db178ddf..a0da7fa4 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/WindowsInstallerCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/WindowsInstallerCommand.cs
@@ -48,6 +48,10 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine
                     case "inscribe":
                         this.Subcommand = new InscribeSubcommand(this.ServiceProvider);
                         return true;
+
+                    case "validate":
+                        this.Subcommand = new ValidateSubcommand(this.ServiceProvider);
+                        return true;
                 }
 
                 return false;
@@ -68,6 +72,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine
             Console.WriteLine("Commands:");
             Console.WriteLine();
             Console.WriteLine("  inscribe          Updates MSI database with cabinet signature information.");
+            Console.WriteLine("  validate          Validates MSI database using standard or custom ICEs.");
         }
     }
 }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/wix/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 37de1904..33aa7a74 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -27,7 +27,7 @@ namespace WixToolset.Core.WindowsInstaller
             var dispose = true;
             try
             {
-                var command = new BindDatabaseCommand(context, backendExtensions, "darice.cub");
+                var command = new BindDatabaseCommand(context, backendExtensions);
                 result = command.Execute();
 
                 foreach (var extension in backendExtensions)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/wix/WixToolset.Core.WindowsInstaller/MsmBackend.cs
index 450bf888..02ea5f45 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/MsmBackend.cs
@@ -26,7 +26,7 @@ namespace WixToolset.Core.WindowsInstaller
             IBindResult result = null;
             try
             {
-                var command = new BindDatabaseCommand(context, backendExtensions, "mergemod.cub");
+                var command = new BindDatabaseCommand(context, backendExtensions);
                 result = command.Execute();
 
                 foreach (var extension in backendExtensions)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs
index 1ef9671b..d1f5eb99 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/MspBackend.cs
@@ -52,7 +52,7 @@ namespace WixToolset.Core.WindowsInstaller
             IBindResult result = null;
             try
             {
-                var command = new BindDatabaseCommand(context, backendExtensions, subStorages, null);
+                var command = new BindDatabaseCommand(context, backendExtensions, subStorages);
                 result = command.Execute();
 
                 foreach (var extension in backendExtensions)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ValidateDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
index cf1e21c2..fe2fd2c2 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ValidateDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Core.WindowsInstaller.Bind
+namespace WixToolset.Core.WindowsInstaller.Validate
 {
     using System;
     using System.Collections.Generic;
@@ -18,18 +18,17 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         // Set of ICEs that have equivalent-or-better checks in WiX.
         private static readonly string[] WellKnownSuppressedIces = new[] { "ICE08", "ICE33", "ICE47", "ICE66" };
 
-        public ValidateDatabaseCommand(IMessaging messaging, IBackendHelper backendHelper, string intermediateFolder, WindowsInstallerData data, string outputPath, IEnumerable<string> cubeFiles, IEnumerable<string> ices, IEnumerable<string> suppressedIces)
+        public ValidateDatabaseCommand(IMessaging messaging, string intermediateFolder, string databasePath, WindowsInstallerData data, IEnumerable<string> cubeFiles, IEnumerable<string> ices, IEnumerable<string> suppressedIces)
         {
             this.Messaging = messaging;
-            this.BackendHelper = backendHelper;
             this.Data = data;
-            this.OutputPath = outputPath;
+            this.DatabasePath = databasePath;
             this.CubeFiles = cubeFiles;
             this.Ices = ices;
             this.SuppressedIces = suppressedIces == null ? WellKnownSuppressedIces : suppressedIces.Union(WellKnownSuppressedIces);
 
             this.IntermediateFolder = intermediateFolder;
-            this.OutputSourceLineNumber = new SourceLineNumber(outputPath);
+            this.OutputSourceLineNumber = new SourceLineNumber(databasePath);
         }
 
         public IEnumerable<ITrackedFile> TrackedFiles { get; private set; }
@@ -41,11 +40,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private IMessaging Messaging { get; }
 
-        private IBackendHelper BackendHelper { get; }
-
         private WindowsInstallerData Data { get; }
 
-        private string OutputPath { get; }
+        private string DatabasePath { get; }
 
         private IEnumerable<string> CubeFiles { get; }
 
@@ -64,34 +61,34 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public void Execute()
         {
-            var trackedFiles = new List<ITrackedFile>();
             var stopwatch = Stopwatch.StartNew();
 
             this.Messaging.Write(VerboseMessages.ValidatingDatabase());
 
-            // Ensure the temporary files can be created the working folder.
-            var workingFolder = Path.Combine(this.IntermediateFolder, "_validate");
-            Directory.CreateDirectory(workingFolder);
-
             // Copy the database to a temporary location so it can be manipulated.
             // Ensure it is not read-only.
-            var workingDatabasePath = Path.Combine(workingFolder, Path.GetFileName(this.OutputPath));
-            FileSystem.CopyFile(this.OutputPath, workingDatabasePath, allowHardlink: false);
-
-            var trackWorkingDatabase = this.BackendHelper.TrackFile(workingDatabasePath, TrackedFileType.Temporary);
-            trackedFiles.Add(trackWorkingDatabase);
+            var workingDatabaseFilename = String.Concat(Path.GetFileNameWithoutExtension(this.DatabasePath), "_validate", Path.GetExtension(this.DatabasePath));
+            var workingDatabasePath = Path.Combine(this.IntermediateFolder, workingDatabaseFilename);
+            try
+            {
+                FileSystem.CopyFile(this.DatabasePath, workingDatabasePath, allowHardlink: false);
 
-            var attributes = File.GetAttributes(workingDatabasePath);
-            File.SetAttributes(workingDatabasePath, attributes & ~FileAttributes.ReadOnly);
+                var attributes = File.GetAttributes(workingDatabasePath);
+                File.SetAttributes(workingDatabasePath, attributes & ~FileAttributes.ReadOnly);
 
-            var validator = new WindowsInstallerValidator(this, workingDatabasePath, this.CubeFiles, this.Ices, this.SuppressedIces);
-            validator.Execute();
+                var validator = new WindowsInstallerValidator(this, workingDatabasePath, this.CubeFiles, this.Ices, this.SuppressedIces);
+                validator.Execute();
+            }
+            finally
+            {
+                if (File.Exists(workingDatabasePath))
+                {
+                    File.Delete(workingDatabasePath);
+                }
+            }
 
             stopwatch.Stop();
             this.Messaging.Write(VerboseMessages.ValidatedDatabase(stopwatch.ElapsedMilliseconds));
-
-
-            this.TrackedFiles = trackedFiles;
         }
 
         private void LogValidationMessage(ValidationMessage message)
diff --git a/src/wix/WixToolset.Core/BindContext.cs b/src/wix/WixToolset.Core/BindContext.cs
index 052382f1..9dd6aa46 100644
--- a/src/wix/WixToolset.Core/BindContext.cs
+++ b/src/wix/WixToolset.Core/BindContext.cs
@@ -36,8 +36,6 @@ namespace WixToolset.Core
 
         public IReadOnlyCollection<IFileSystemExtension> FileSystemExtensions { get; set; }
 
-        public IReadOnlyCollection<string> Ices { get; set; }
-
         public string IntermediateFolder { get; set; }
 
         public Intermediate IntermediateRepresentation { get; set; }
@@ -54,10 +52,6 @@ namespace WixToolset.Core
 
         public int? ResolvedLcid { get; set; }
 
-        public IReadOnlyCollection<string> SuppressIces { get; set; }
-
-        public bool SuppressValidation { get; set; }
-
         public bool SuppressLayout { get; set; }
 
         public CancellationToken CancellationToken { get; set; }
diff --git a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
index 3ea47279..d289b557 100644
--- a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -349,14 +349,11 @@ namespace WixToolset.Core.CommandLine
                     context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
                     context.Extensions = this.ExtensionManager.GetServices<IBinderExtension>();
                     context.FileSystemExtensions = this.ExtensionManager.GetServices<IFileSystemExtension>();
-                    context.Ices = this.commandLine.Ices;
                     context.IntermediateFolder = intermediateFolder;
                     context.IntermediateRepresentation = resolveResult.IntermediateRepresentation;
                     context.OutputPath = this.OutputFile;
                     context.PdbType = this.PdbType;
                     context.PdbPath = this.PdbType == PdbType.None ? null : this.PdbFile ?? Path.ChangeExtension(this.OutputFile, ".wixpdb");
-                    context.SuppressIces = this.commandLine.SuppressIces;
-                    context.SuppressValidation = this.commandLine.SuppressValidation;
                     context.CancellationToken = cancellationToken;
 
                     var binder = this.ServiceProvider.GetService<IBinder>();
@@ -540,12 +537,6 @@ namespace WixToolset.Core.CommandLine
 
             public string TrackingFile { get; private set; }
 
-            public List<string> Ices { get; } = new List<string>();
-
-            public List<string> SuppressIces { get; } = new List<string>();
-
-            public bool SuppressValidation { get; set; }
-
             public bool ResetAcls { get; set; }
 
             public CommandLine(IServiceProvider serviceProvider, IMessaging messaging)
@@ -627,13 +618,6 @@ namespace WixToolset.Core.CommandLine
                             parser.GetNextArgumentOrError(arg, this.IncludeSearchPaths);
                             return true;
 
-                        case "ice":
-                        {
-                            var value = parser.GetNextArgumentOrError(arg);
-                            this.Ices.Add(value);
-                            return true;
-                        }
-
                         case "intermediatefolder":
                             this.IntermediateFolder = parser.GetNextArgumentAsDirectoryOrError(arg);
                             return true;
@@ -670,17 +654,6 @@ namespace WixToolset.Core.CommandLine
                                 return false;
                             }
 
-                        case "sice":
-                        {
-                            var value = parser.GetNextArgumentOrError(arg);
-                            this.SuppressIces.Add(value);
-                            return true;
-                        }
-
-                        case "sval":
-                            this.SuppressValidation = true;
-                            return true;
-
                         case "resetacls":
                             this.ResetAcls = true;
                             return true;
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 487c5cb3..bbb73a52 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -168,6 +168,10 @@
   <UsingTask TaskName="ResolveWixReferences" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
   <UsingTask TaskName="ResolveWixReferences" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
 
+  <UsingTask TaskName="WindowsInstallerValidation" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="WindowsInstallerValidation" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="WindowsInstallerValidation" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
   <!--
   ***********************************************************************************************
   ***********************************************************************************************
@@ -553,6 +557,10 @@
     ================================================================================================
     -->
   <PropertyGroup>
+    <CompileDependsOn>
+      $(CompileDependsOn);
+      WindowsInstallerValidation
+    </CompileDependsOn>
     <CoreCompileDependsOn>
       AssignTargetPaths;
       CreateManifestResourceNames;
@@ -604,9 +612,6 @@
         Pedantic="$(Pedantic)"
         ReferencePaths="$(ReferencePaths)"
 
-        SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
-        TreatSpecificWarningsAsErrors="$(TreatSpecificWarningsAsErrors)"
-
         BindInputPaths="@(LinkerBindInputPaths)"
         BindFiles="$(BindFiles)"
         BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)"
@@ -619,12 +624,10 @@
         WixProjectFile="$(ProjectPath)"
         WixVariables="$(WixVariables)"
 
-        SuppressValidation="$(SuppressValidation)"
-        SuppressIces="$(SuppressIces)"
-        AdditionalCub="$(AdditionalCub)"
-
         SuppressAllWarnings="$(SuppressAllWarnings)"
+        SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
         TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+        TreatSpecificWarningsAsErrors="$(TreatSpecificWarningsAsErrors)"
         VerboseOutput="$(VerboseOutput)"
 
         RunAsSeparateProcess="$(RunWixToolsOutOfProc)"
@@ -636,6 +639,28 @@
     </ItemGroup>
   </Target>
 
+  <Target
+      Name="WindowsInstallerValidation"
+      DependsOnTargets="CoreCompile" 
+      Condition=" ('$(OutputType)' == 'Package' or '$(OutputType)' == 'Module') and '$(SuppressValidation)'!='true' ">
+      <WindowsInstallerValidation
+          DatabaseFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"
+          WixpdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
+          IntermediateDirectory="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)"
+          Ices="$(Ices)"
+          SuppressIces="$(SuppressIces)"
+          CubeFiles="$(AdditionalCub)"
+
+          AdditionalOptions="$(ValidationAdditionalOptions)"
+
+          NoLogo="true"
+          SuppressAllWarnings="$(SuppressAllWarnings)"
+          SuppressSpecificWarnings="$(SuppressSpecificWarnings)"
+          TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+          TreatSpecificWarningsAsErrors="$(TreatSpecificWarningsAsErrors)"
+          VerboseOutput="$(VerboseOutput)" />
+  </Target>
+
   <!--
     ================================================================================================
                                         _CreateProjectDefineConstants
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
index 1c5e68f0..41418711 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ModuleFixture.cs
@@ -15,7 +15,7 @@ namespace WixToolsetTest.CoreIntegration
     public class ModuleFixture
     {
         [Fact]
-        public void CanBuildSimpleModule()
+        public void CanBuildAndValidateSimpleModule()
         {
             var folder = TestData.Get(@"TestData\SimpleModule");
 
@@ -73,6 +73,30 @@ namespace WixToolsetTest.CoreIntegration
                     "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
                     "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
                 }, files.Select(f => Path.Combine(f.Path, f.Name)).ToArray());
+
+                var rows = Query.QueryDatabase(msmPath, new[] { "_SummaryInformation" });
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "_SummaryInformation:Title\tMerge Module",
+                    "_SummaryInformation:Subject\tMergeModule1",
+                    "_SummaryInformation:Author\tExample Company",
+                    "_SummaryInformation:Keywords\tMergeModule, MSI, database",
+                    "_SummaryInformation:Comments\tThis merge module contains the logic and data required to install MergeModule1.",
+                    "_SummaryInformation:Template\tIntel;1033",
+                    "_SummaryInformation:CodePage\t1252",
+                    "_SummaryInformation:PageCount\t200",
+                    "_SummaryInformation:WordCount\t0",
+                    "_SummaryInformation:CharacterCount\t0",
+                    "_SummaryInformation:Security\t2",
+                }, rows);
+
+                var validationResult = WixRunner.Execute(new[]
+                {
+                    "msi", "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    msmPath
+                });
+                validationResult.AssertSuccess();
             }
         }
 
@@ -109,5 +133,72 @@ namespace WixToolsetTest.CoreIntegration
                 }, rows);
             }
         }
+
+        [Fact]
+        public void CanMergeModule()
+        {
+            var msmFolder = TestData.Get(@"TestData\SimpleModule");
+            var folder = TestData.Get(@"TestData\SimpleMerge");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var intermediateFolder = fs.GetFolder();
+                var msiPath = Path.Combine(intermediateFolder, @"bin\test.msi");
+                var cabPath = Path.Combine(intermediateFolder, @"bin\cab1.cab");
+
+                var msmResult = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(msmFolder, "Module.wxs"),
+                    "-loc", Path.Combine(msmFolder, "Module.en-us.wxl"),
+                    "-bindpath", Path.Combine(msmFolder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, "bin", "test", "test.msm")
+                });
+
+                msmResult.AssertSuccess();
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(intermediateFolder, "bin", "test"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath
+                });
+
+                result.AssertSuccess();
+
+                var validationResult = WixRunner.Execute(new[]
+                {
+                    "msi", "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    msiPath
+                });
+                validationResult.AssertSuccess();
+
+                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
+                var section = intermediate.Sections.Single();
+                Assert.Empty(section.Symbols.OfType<FileSymbol>());
+
+                var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
+                Assert.Empty(data.Tables["File"].Rows);
+
+                var results = Query.QueryDatabase(msiPath, new[] { "File" });
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "File:File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tModuleComponent1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tfile1.txt\t17\t\t\t512\t1",
+                    "File:File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tModuleComponent2.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tfile2.txt\t17\t\t\t512\t2",
+                }, results);
+
+                var files = Query.GetCabinetFiles(cabPath);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
+                    "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE"
+                }, files.Select(f => f.Name).ToArray());
+            }
+        }
     }
 }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 2b3bfc88..f361a274 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -8,9 +8,6 @@ namespace WixToolsetTest.CoreIntegration
     using Example.Extension;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
-    using WixToolset.Data;
-    using WixToolset.Data.Symbols;
-    using WixToolset.Data.WindowsInstaller;
     using Xunit;
 
     public class MsiQueryFixture
@@ -835,68 +832,6 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
-        public void CanMergeModule()
-        {
-            var msmFolder = TestData.Get(@"TestData\SimpleModule");
-            var folder = TestData.Get(@"TestData\SimpleMerge");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var intermediateFolder = fs.GetFolder();
-                var msiPath = Path.Combine(intermediateFolder, @"bin\test.msi");
-                var cabPath = Path.Combine(intermediateFolder, @"bin\cab1.cab");
-
-                var msmResult = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(msmFolder, "Module.wxs"),
-                    "-loc", Path.Combine(msmFolder, "Module.en-us.wxl"),
-                    "-bindpath", Path.Combine(msmFolder, "data"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", Path.Combine(intermediateFolder, "bin", "test", "test.msm")
-                });
-
-                msmResult.AssertSuccess();
-
-                var result = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(folder, "Package.wxs"),
-                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
-                    "-bindpath", Path.Combine(intermediateFolder, "bin", "test"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", msiPath
-                });
-
-                result.AssertSuccess();
-
-                Assert.True(File.Exists(msiPath));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
-
-                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                var section = intermediate.Sections.Single();
-                Assert.Empty(section.Symbols.OfType<FileSymbol>());
-
-                var data = WindowsInstallerData.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"));
-                Assert.Empty(data.Tables["File"].Rows);
-
-                var results = Query.QueryDatabase(msiPath, new[] { "File" });
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "File:File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tModuleComponent1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tfile1.txt\t17\t\t\t512\t1",
-                    "File:File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tModuleComponent2.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tfile2.txt\t17\t\t\t512\t2",
-                }, results);
-
-                var files = Query.GetCabinetFiles(cabPath);
-                WixAssert.CompareLineByLine(new[]
-                {
-                    "File1.243FB739_4D05_472F_9CFB_EF6B1017B6DE",
-                    "File2.243FB739_4D05_472F_9CFB_EF6B1017B6DE"
-                }, files.Select(f => f.Name).ToArray());
-            }
-        }
-
-        [Fact]
         public void CanPublishComponentWithMultipleFeatureComponents()
         {
             var folder = TestData.Get(@"TestData\PublishComponent");
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs
index 377f7e11..2a0c374f 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BindVariables/PackageWithBindVariables.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="PacakgeWithBindVariables" Version="!(bind.fileversion.TestBinaryFile)" Manufacturer="Example Corporation" UpgradeCode="00000000-0000-0000-0000-000000000000">
+  <Package Name="PacakgeWithBindVariables" Version="!(bind.fileversion.TestBinaryFile)" Manufacturer="Example Corporation" UpgradeCode="41a2c17e-1976-465b-bcde-eae03516ca68">
 
     <Property Id="TestPackageManufacturer" Value="!(bind.Property.Manufacturer)" />
     <Property Id="TestPackageName" Value="!(bind.Property.ProductName)" />
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm
deleted file mode 100644
index 6f179aba..00000000
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/.data/test.msm
+++ /dev/null
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
index 3c999812..41dd19fc 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge/Package.wxs
@@ -1,7 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="MsiPackage" Codepage="1252" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200" Scope="perMachine">
-    
-
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
@@ -12,7 +10,6 @@
   <Fragment>
     <StandardDirectory Id="ProgramFilesFolder">
       <Directory Id="INSTALLFOLDER" Name="MsiPackage">
-        <!--   -->
         <Merge Id="TestMsm" Language="1033" SourceFile="test.msm" />
       </Directory>
     </StandardDirectory>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Validation/PackageWithIceIssues.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Validation/PackageWithIceIssues.wxs
new file mode 100644
index 00000000..4d3acdf7
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Validation/PackageWithIceIssues.wxs
@@ -0,0 +1,32 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="ValidationPackage" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <MajorUpgrade DowngradeErrorMessage="Downgrade message" />
+
+    <Property Id="MyProperty" Value="1" />
+    <Launch Condition="Myproperty" Message="Invalid cased Property Id below causes ICE46" />
+
+    <CustomAction Id="CausesICE12Error" Directory="INSTALLFOLDER" Value="Test" />
+
+    <Feature Id="ProductFeature" Title="Product Feature">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+
+    <InstallExecuteSequence>
+      <Custom Action="CausesICE12Error" Before="AppSearch" />
+    </InstallExecuteSequence>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFiles6432Folder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component>
+        <File Source="test.txt" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs
new file mode 100644
index 00000000..48339b89
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs
@@ -0,0 +1,133 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.CoreIntegration
+{
+    using System.IO;
+    using System.Linq;
+    using WixBuildTools.TestSupport;
+    using WixToolset.Core.TestPackage;
+    using Xunit;
+
+    public class ValidationFixture
+    {
+        [Fact]
+        public void CanValidateMsiWithIceIssues()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin", "test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Validation", "PackageWithIceIssues.wxs"),
+                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath,
+                });
+
+                result.AssertSuccess();
+
+                var validationResult = WixRunner.Execute(new[]
+                {
+                    "msi", "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    msiPath
+                });
+
+                Assert.Equal(1, validationResult.ExitCode);
+
+                var messages = validationResult.Messages.Select(m => m.ToString()).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"ICE12: CustomAction: CausesICE12Error is of type: 35. Therefore it must come after CostFinalize @ 1000 in Seq Table: InstallExecuteSequence. CA Seq#: 49",
+                    @"ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only."
+                }, messages);
+            }
+        }
+
+        [Fact]
+        public void CanValidateMsiSuppressIceError()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin", "test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Validation", "PackageWithIceIssues.wxs"),
+                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath,
+                });
+
+                result.AssertSuccess();
+
+                var validationResult = WixRunner.Execute(warningsAsErrors: false, new[]
+                {
+                    "msi", "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    "-sice", "ICE12",
+                    msiPath
+                });
+
+                validationResult.AssertSuccess();
+
+                var messages = validationResult.Messages.Select(m => m.ToString()).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only."
+                }, messages);
+            }
+        }
+
+        [Fact]
+        public void CanValidateMsiWithWarningsAsErrors()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msiPath = Path.Combine(baseFolder, @"bin", "test.msi");
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Validation", "PackageWithIceIssues.wxs"),
+                    "-bindpath", Path.Combine(folder, "SingleFile", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msiPath,
+                });
+
+                result.AssertSuccess();
+
+                var validationResult = WixRunner.Execute(warningsAsErrors: true, new[]
+                {
+                    "msi", "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    "-sice", "ICE12",
+                    msiPath
+                });
+
+                Assert.Equal(1, validationResult.ExitCode);
+
+                var messages = validationResult.Messages.Select(m => m.ToString()).ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only."
+                }, messages);
+            }
+        }
+    }
+}
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 3a9ce776..1a82c035 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -271,6 +271,7 @@ namespace WixToolsetTest.Sdk
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                 {
                     wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
+                    "-p:SuppressValidation=true"
                 });
                 result.AssertSuccess();
 
@@ -323,9 +324,44 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.DotNetCoreSdk)]
         [InlineData(BuildSystem.MSBuild)]
         [InlineData(BuildSystem.MSBuild64)]
-        public void CanBuildSimpleMsiPackageWithIceSuppressions(BuildSystem buildSystem)
+        public void CannotBuildMsiPackageWithIceIssues(BuildSystem buildSystem)
         {
-            var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
+            var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, suppressValidation: false);
+                Assert.Equal(1, result.ExitCode);
+
+                var iceIssues = result.Output.Where(line => line.Contains(": error") || line.Contains(": warning"))
+                                             .Select(line => line.Replace(baseFolder, "<baseFolder>")
+                                                                 .Replace("1>", String.Empty)  // remove any multi-proc markers
+                                                                 .Replace("WIX204", "WIX0204") // normalize error number reporting because MSBuild is not consistent on zero padding
+                                                                 .Trim())
+                                             .OrderBy(s => s, StringComparer.OrdinalIgnoreCase)
+                                             .ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"<baseFolder>\Package.wxs(17): error WIX0204: ICE12: CustomAction: CausesICE12Error is of type: 35. Therefore it must come after CostFinalize @ 1000 in Seq Table: InstallExecuteSequence. CA Seq#: 49 [<baseFolder>\MsiPackage.wixproj]",
+                    @"<baseFolder>\Package.wxs(17): error WIX0204: ICE12: CustomAction: CausesICE12Error is of type: 35. Therefore it must come after CostFinalize @ 1000 in Seq Table: InstallExecuteSequence. CA Seq#: 49 [<baseFolder>\MsiPackage.wixproj]",
+                    @"<baseFolder>\Package.wxs(8): warning WIX1076: ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only. [<baseFolder>\MsiPackage.wixproj]",
+                    @"<baseFolder>\Package.wxs(8): warning WIX1076: ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only. [<baseFolder>\MsiPackage.wixproj]",
+                }, iceIssues);
+            }
+        }
+
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk)]
+        [InlineData(BuildSystem.MSBuild)]
+        [InlineData(BuildSystem.MSBuild64)]
+        public void CannotBuildMsiPackageWithIceWarningsAsErrors(BuildSystem buildSystem)
+        {
+            var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage");
 
             using (var fs = new TestDataFolderFileSystem())
             {
@@ -336,8 +372,45 @@ namespace WixToolsetTest.Sdk
 
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                 {
-                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressIces", "ICE45;ICE46"),
-                });
+                    $"-p:TreatWarningsAsErrors=true",
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressIces", "ICE12"),
+                }, suppressValidation: false);
+                Assert.Equal(1, result.ExitCode);
+
+                var iceIssues = result.Output.Where(line => (line.Contains(": error") || line.Contains(": warning")))
+                                             .Select(line => line.Replace(baseFolder, "<baseFolder>")
+                                                                 .Replace("1>", String.Empty)  // remove any multi-proc markers
+                                                                 .Replace("WIX204", "WIX0204") // normalize error number reporting because MSBuild is not consistent on zero padding
+                                                                 .Trim())
+                                             .OrderBy(s => s, StringComparer.OrdinalIgnoreCase)
+                                             .ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"<baseFolder>\Package.wxs(8): error WIX1076: ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only. [<baseFolder>\MsiPackage.wixproj]",
+                    @"<baseFolder>\Package.wxs(8): error WIX1076: ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only. [<baseFolder>\MsiPackage.wixproj]",
+                }, iceIssues);
+            }
+        }
+
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk)]
+        [InlineData(BuildSystem.MSBuild)]
+        [InlineData(BuildSystem.MSBuild64)]
+        public void CanBuildMsiPackageWithIceSuppressions(BuildSystem buildSystem)
+        {
+            var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "SuppressIces", "ICE12"),
+                }, suppressValidation: false);
                 result.AssertSuccess();
             }
         }
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
index 28e0c219..875e3279 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildUtilities.cs
@@ -20,12 +20,13 @@ namespace WixToolsetTest.Sdk
         public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath), "..", "publish", "WixToolset.Sdk");
         public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
 
-        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal")
+        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", bool? outOfProc = null, string verbosityLevel = "normal", bool suppressValidation = true)
         {
             var allArgs = new List<string>
             {
                 $"-verbosity:{verbosityLevel}",
                 $"-p:Configuration={configuration}",
+                $"-p:SuppressValidation={suppressValidation}",
                 GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildUtilities.WixPropsPath),
                 // Node reuse means that child msbuild processes can stay around after the build completes.
                 // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang.
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj
new file mode 100644
index 00000000..acbcd85d
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Package.wxs" />
+    <Compile Include="PackageComponents.wxs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Package.en-us.wxl" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <BindInputPaths Include="data" />
+  </ItemGroup>
+
+  <Import Project="$(WixTargetsPath)" />
+
+  <Target Name="SignCabs">
+    <!-- It would be cool to actually sign, but signtool.exe is not always easy to find, so we'll
+         mock it up instead.
+    <Error Text="Could not find pfx at: $(TestCertificate)" Condition=" !Exists('$(TestCertificate)') " />
+    <Exec Command='signtool.exe sign /v /f $(TestCertificate) /p password %(SignCabs.FullPath)' />
+    -->
+    <Message Importance="high" Text="TEST: SignCabs: @(SignCabs)" />
+  </Target>
+
+  <Target Name="SignMsi">
+    <!-- It would be cool to actually sign, but signtool.exe is not always easy to find, so we'll
+         mock it up instead.
+    <Error Text="Could not find pfx at: $(TestCertificate)" Condition=" !Exists('$(TestCertificate)') " />
+    <Exec Command='signtool.exe sign /v /f $(TestCertificate) /p password "%(SignMsi.FullPath)" ' />
+    -->
+    <Message Importance="high" Text="TEST: SignMsi: @(SignMsi)" />
+  </Target>
+
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/Package.en-us.wxl b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/Package.wxs
new file mode 100644
index 00000000..e187ed7b
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/Package.wxs
@@ -0,0 +1,26 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+
+    <Property Id="MyProperty" Value="1" />
+    <Property Id="ReInStAlLmOdE" Value="Mixed-case Property Id causes ICE46" />
+
+    <Launch Condition="Myproperty" Message="Invalid cased Property Id below causes ICE46" />
+
+    <CustomAction Id="CausesICE12Error" Directory="INSTALLFOLDER" Value="Test" />
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+
+    <InstallExecuteSequence>
+      <Custom Action="CausesICE12Error" Before="AppSearch" />
+    </InstallExecuteSequence>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFiles6432Folder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/PackageComponents.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/PackageComponents.wxs
new file mode 100644
index 00000000..e26c4509
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/PackageComponents.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+       <Component>
+         <File Source="test.txt" />
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/data/test.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
index 0a133c7d..30be1ace 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
@@ -12,7 +12,7 @@
   </Package>
 
   <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
+    <StandardDirectory Id="ProgramFiles6432Folder">
         <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
     </StandardDirectory>
   </Fragment>