1 files changed, 34 insertions, 50 deletions

diff --git a/src/WixToolset.Core/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs
index 6420b9b7..db66f600 100644
--- a/src/WixToolset.Core/Validator.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Validator.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
+namespace WixToolset.Core.WindowsInstaller
 {
     using System;
     using System.Collections.Generic;
@@ -12,8 +12,10 @@ namespace WixToolset
     using System.Threading;
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using WixToolset.Msi;
     using WixToolset.Core.Native;
+    using WixToolset.Msi;
+    using System.Linq;
+    using System.Reflection;
 
     /// <summary>
     /// Runs internal consistency evaluators (ICEs) from cub files against a database.
@@ -23,9 +25,7 @@ namespace WixToolset
         private string actionName;
         private StringCollection cubeFiles;
         private ValidatorExtension extension;
-        private string[] ices;
         private Output output;
-        private string[] suppressedICEs;
         private InstallUIHandler validationUIHandler;
         private bool validationSessionComplete;
 
@@ -54,11 +54,7 @@ namespace WixToolset
         /// </summary>
         /// <value>The list of ICEs.</value>
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] ICEs
-        {
-            get { return this.ices; }
-            set { this.ices = value; }
-        }
+        public ISet<string> ICEs { get; set; }
 
         /// <summary>
         /// Gets or sets the output used for finding source line information.
@@ -76,16 +72,12 @@ namespace WixToolset
         /// </summary>
         /// <value>The suppressed ICEs.</value>
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] SuppressedICEs
-        {
-            get { return this.suppressedICEs; }
-            set { this.suppressedICEs = value; }
-        }
+        public ISet<string> SuppressedICEs { get; set; }
 
         /// <summary>
         /// Sets the temporary path for the Binder.
         /// </summary>
-        public string TempFilesLocation { private get; set; }
+        public string IntermediateFolder { private get; set; }
 
         /// <summary>
         /// Add a cube file to the validation run.
@@ -103,8 +95,6 @@ namespace WixToolset
         /// <returns>true if validation succeeded; false otherwise.</returns>
         public void Validate(string databaseFile)
         {
-            Dictionary<string, string> indexedICEs = new Dictionary<string, string>();
-            Dictionary<string, string> indexedSuppressedICEs = new Dictionary<string, string>();
             int previousUILevel = (int)InstallUILevels.Basic;
             IntPtr previousHwnd = IntPtr.Zero;
             InstallUIHandler previousUIHandler = null;
@@ -120,28 +110,10 @@ namespace WixToolset
             this.extension.InitializeValidator();
 
             // Ensure the temporary files can be created.
-            Directory.CreateDirectory(this.TempFilesLocation);
-
-            // index the ICEs
-            if (null != this.ices)
-            {
-                foreach (string ice in this.ices)
-                {
-                    indexedICEs[ice] = null;
-                }
-            }
-
-            // index the suppressed ICEs
-            if (null != this.suppressedICEs)
-            {
-                foreach (string suppressedICE in this.suppressedICEs)
-                {
-                    indexedSuppressedICEs[suppressedICE] = null;
-                }
-            }
+            Directory.CreateDirectory(this.IntermediateFolder);
 
             // copy the database to a temporary location so it can be manipulated
-            string tempDatabaseFile = Path.Combine(this.TempFilesLocation, Path.GetFileName(databaseFile));
+            string tempDatabaseFile = Path.Combine(this.IntermediateFolder, Path.GetFileName(databaseFile));
             File.Copy(databaseFile, tempDatabaseFile);
 
             // remove the read-only property from the temporary database
@@ -236,7 +208,7 @@ namespace WixToolset
 
                                 string action = record.GetString(1);
 
-                                if (!indexedSuppressedICEs.ContainsKey(action))
+                                if ((this.SuppressedICEs == null || !this.SuppressedICEs.Contains(action)) && (this.ICEs == null || this.ICEs.Contains(action)))
                                 {
                                     actions.Add(action);
                                 }
@@ -244,18 +216,6 @@ namespace WixToolset
                         }
                     }
 
-                    if (0 != indexedICEs.Count)
-                    {
-                        // Walk backwards and remove those that arent in the list
-                        for (int i = actions.Count - 1; 0 <= i; i--)
-                        {
-                            if (!indexedICEs.ContainsKey(actions[i]))
-                            {
-                                actions.RemoveAt(i);
-                            }
-                        }
-                    }
-
                     // disable the internal UI handler and set an external UI handler
                     previousUILevel = Installer.SetInternalUI((int)InstallUILevels.None, ref previousHwnd);
                     previousUIHandler = Installer.SetExternalUI(this.validationUIHandler, (int)InstallLogModes.Error | (int)InstallLogModes.Warning | (int)InstallLogModes.User, IntPtr.Zero);
@@ -370,6 +330,30 @@ namespace WixToolset
             this.extension.OnMessage(e);
         }
 
+        public static Validator CreateFromContext(IBindContext context, string cubeFilename)
+        {
+            Validator validator = null;
+
+            // Tell the binder about the validator if validation isn't suppressed
+            if (!context.SuppressValidation)
+            {
+                validator = new Validator();
+                validator.IntermediateFolder = Path.Combine(context.IntermediateFolder, "validate");
+
+                // set the default cube file
+                string thisPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                validator.AddCubeFile(Path.Combine(thisPath, cubeFilename));
+
+                // Set the ICEs
+                validator.ICEs = new SortedSet<string>(context.Ices);
+
+                // Set the suppressed ICEs and disable ICEs that have equivalent-or-better checks in WiX.
+                validator.SuppressedICEs = new SortedSet<string>(context.SuppressIces.Union(new[] { "ICE08", "ICE33", "ICE47", "ICE66" }));
+            }
+
+            return validator;
+        }
+
         /// <summary>
         /// The validation external UI handler.
         /// </summary>