From 644276562dcadd65fcb0e9a7c06c704cdda36423 Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Sat, 6 Jul 2024 21:03:57 +1000 Subject: Group Add/Remove working. Local group membership Add/Remove working, however with BUILTIN local system groups .NET doesn't appear to locate them as either groups nor basic security Principals. Still needs work to fix the test for nested groups. Ideally with some way to test for domain groups. Signed-off-by: Bevan Weiss --- src/ext/Util/wixext/UtilCompiler.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/ext/Util/wixext/UtilCompiler.cs') diff --git a/src/ext/Util/wixext/UtilCompiler.cs b/src/ext/Util/wixext/UtilCompiler.cs index aff7dd0d..4b1e43b5 100644 --- a/src/ext/Util/wixext/UtilCompiler.cs +++ b/src/ext/Util/wixext/UtilCompiler.cs @@ -1475,7 +1475,7 @@ namespace WixToolset.Util if (null != componentId) { - this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureGroups", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix6ConfigureGroups", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); } foreach (var child in element.Elements()) @@ -1488,7 +1488,7 @@ namespace WixToolset.Util this.ParseGroupRefElement(intermediate, section, child, id.Id, groupType:true); break; default: - //this.ParseHelper.UnexpectedElement(element, child); + this.ParseHelper.UnexpectedElement(element, child); break; } } @@ -1561,6 +1561,9 @@ namespace WixToolset.Util } else { + // Add reference to bring in fragment + this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix6AddGroupMembership", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); + section.AddSymbol(new GroupGroupSymbol(sourceLineNumbers) { ChildGroupRef = childId, -- cgit v1.2.3-55-g6feb