From 86146e8c044a1aea2ea162701b1fc344d19e4dc3 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 7 Nov 2022 23:05:41 -0800
Subject: Very minor cleanup

---
 src/ext/Util/wixext/UtilCompiler.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/ext/Util')

diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs
index d937b4f1..47f82ca6 100644
--- a/src/ext/Util/wixext/UtilCompiler.cs
+++ b/src/ext/Util/wixext/UtilCompiler.cs
@@ -1232,10 +1232,7 @@ namespace WixToolset.Util
                 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name"));
             }
 
-            if (!element.Elements().Any())
-            {
-                this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission"));
-            }
+            var fileSharePermissionCount = 0;
 
             foreach (var child in element.Elements())
             {
@@ -1245,6 +1242,7 @@ namespace WixToolset.Util
                     {
                         case "FileSharePermission":
                             this.ParseFileSharePermissionElement(intermediate, section, child, id);
+                            ++fileSharePermissionCount;
                             break;
                         default:
                             this.ParseHelper.UnexpectedElement(element, child);
@@ -1257,6 +1255,11 @@ namespace WixToolset.Util
                 }
             }
 
+            if (fileSharePermissionCount == 0)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission"));
+            }
+
             this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
             this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
 
@@ -3521,7 +3524,7 @@ namespace WixToolset.Util
                             }
                             break;
                         case "SelectionLanguage":
-                            string selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            var selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                             switch (selectionLanguage)
                             {
                                 case "XPath":
@@ -3653,7 +3656,7 @@ namespace WixToolset.Util
                             }
                             else
                             {
-                                string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                                var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                                 switch (actionValue)
                                 {
                                     case "create":
-- 
cgit v1.2.3-55-g6feb