aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Util
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Util')
-rw-r--r--src/ext/Util/wixext/UtilCompiler.cs15
1 files changed, 9 insertions, 6 deletions
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
1232 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name")); 1232 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Name"));
1233 } 1233 }
1234 1234
1235 if (!element.Elements().Any()) 1235 var fileSharePermissionCount = 0;
1236 {
1237 this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission"));
1238 }
1239 1236
1240 foreach (var child in element.Elements()) 1237 foreach (var child in element.Elements())
1241 { 1238 {
@@ -1245,6 +1242,7 @@ namespace WixToolset.Util
1245 { 1242 {
1246 case "FileSharePermission": 1243 case "FileSharePermission":
1247 this.ParseFileSharePermissionElement(intermediate, section, child, id); 1244 this.ParseFileSharePermissionElement(intermediate, section, child, id);
1245 ++fileSharePermissionCount;
1248 break; 1246 break;
1249 default: 1247 default:
1250 this.ParseHelper.UnexpectedElement(element, child); 1248 this.ParseHelper.UnexpectedElement(element, child);
@@ -1257,6 +1255,11 @@ namespace WixToolset.Util
1257 } 1255 }
1258 } 1256 }
1259 1257
1258 if (fileSharePermissionCount == 0)
1259 {
1260 this.Messaging.Write(ErrorMessages.ExpectedElement(sourceLineNumbers, element.Name.LocalName, "FileSharePermission"));
1261 }
1262
1260 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1263 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbInstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1261 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); 1264 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureSmbUninstall", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
1262 1265
@@ -3521,7 +3524,7 @@ namespace WixToolset.Util
3521 } 3524 }
3522 break; 3525 break;
3523 case "SelectionLanguage": 3526 case "SelectionLanguage":
3524 string selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 3527 var selectionLanguage = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
3525 switch (selectionLanguage) 3528 switch (selectionLanguage)
3526 { 3529 {
3527 case "XPath": 3530 case "XPath":
@@ -3653,7 +3656,7 @@ namespace WixToolset.Util
3653 } 3656 }
3654 else 3657 else
3655 { 3658 {
3656 string actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); 3659 var actionValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
3657 switch (actionValue) 3660 switch (actionValue)
3658 { 3661 {
3659 case "create": 3662 case "create":