From 3ccd5e439da4296d6f2b66ce47075ab20d039676 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 14 Mar 2021 07:38:48 -0700
Subject: Minimize public surface area of Core

Fixes wixtoolset/issues#6374
---
 src/WixToolset.Core.WindowsInstaller/Validator.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Validator.cs')

diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs
index e8117de7..a6a41bd7 100644
--- a/src/WixToolset.Core.WindowsInstaller/Validator.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs
@@ -25,10 +25,10 @@ namespace WixToolset.Core.WindowsInstaller
     internal sealed class Validator
     {
         private string actionName;
-        private StringCollection cubeFiles;
+        private readonly StringCollection cubeFiles;
         private ValidatorExtension extension;
         private WindowsInstallerData output;
-        private InstallUIHandler validationUIHandler;
+        private readonly InstallUIHandler validationUIHandler;
         private bool validationSessionComplete;
         private readonly IMessaging messaging;
 
@@ -57,7 +57,6 @@ namespace WixToolset.Core.WindowsInstaller
         /// Gets or sets the list of ICEs to run.
         /// </summary>
         /// <value>The list of ICEs.</value>
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public ISet<string> ICEs { get; set; }
 
         /// <summary>
@@ -75,7 +74,6 @@ namespace WixToolset.Core.WindowsInstaller
         /// Gets or sets the suppressed ICEs.
         /// </summary>
         /// <value>The suppressed ICEs.</value>
-        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public ISet<string> SuppressedICEs { get; set; }
 
         /// <summary>
@@ -103,13 +101,8 @@ namespace WixToolset.Core.WindowsInstaller
             IntPtr previousHwnd = IntPtr.Zero;
             InstallUIHandler previousUIHandler = null;
 
-            if (null == databaseFile)
-            {
-                throw new ArgumentNullException("databaseFile");
-            }
-
             // initialize the validator extension
-            this.extension.DatabaseFile = databaseFile;
+            this.extension.DatabaseFile = databaseFile ?? throw new ArgumentNullException(nameof(databaseFile));
             this.extension.Output = this.output;
             this.extension.InitializeValidator();
 
-- 
cgit v1.2.3-55-g6feb