Applied changes from @Trenly's review.

microsoft · Jan 27, 2022 · 16d4318 · 16d4318
1 parent 3bcafe0
commit 16d4318
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/src/WingetCreateCore/Common/PackageParser.cs b/src/WingetCreateCore/Common/PackageParser.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license.
 
 namespace Microsoft.WingetCreateCore
@@ -650,26 +650,9 @@ private static bool ParseExeInstallerType(string path, Installer baseInstaller,
         /// <returns>A boolean.</returns>
         private static bool IsWix(QDatabase installer)
         {
-            // Do any of the WiX properties exist?
-            foreach (var property in installer.Properties)
-            {
-                if (property.Property.ToLower().Contains("wix"))
-                {
-                    return true;
-                }
-            }
-
-            // Do any of the WiX tables exist?
-            foreach (var table in installer.Tables)
-            {
-                if (table.Name.ToLower().Contains("wix"))
-                {
-                    return true;
-                }
-            }
-
-            // Does the CreatingApp mention WiX?
             return
+                Array.Exists(installer.Tables.ToArray(), table => table.Name.ToLower().Contains("wix")) ||
+                Array.Exists(installer.Properties.ToArray(), property => property.Property.ToLower().Contains("wix") || property.Value.ToLower().Contains("wix")) ||
                 installer.SummaryInfo.CreatingApp.ToLower().Contains("wix") ||
                 installer.SummaryInfo.CreatingApp.ToLower().Contains("windows installer xml");
         }