diff options
author | Bevan Weiss <bevan.weiss@gmail.com> | 2024-07-06 21:03:57 +1000 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2025-02-11 23:14:49 -0800 |
commit | 644276562dcadd65fcb0e9a7c06c704cdda36423 (patch) | |
tree | f42af115bf5354d1c1691c44d517388f6c369b16 /src/ext/Util/wixext/UtilCompiler.cs | |
parent | 7b1bb025dea1d1e9e144cce0dcbba2d86f053b8f (diff) | |
download | wix-644276562dcadd65fcb0e9a7c06c704cdda36423.tar.gz wix-644276562dcadd65fcb0e9a7c06c704cdda36423.tar.bz2 wix-644276562dcadd65fcb0e9a7c06c704cdda36423.zip |
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 <bevan.weiss@gmail.com>
Diffstat (limited to 'src/ext/Util/wixext/UtilCompiler.cs')
-rw-r--r-- | src/ext/Util/wixext/UtilCompiler.cs | 7 |
1 files changed, 5 insertions, 2 deletions
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 | |||
1475 | 1475 | ||
1476 | if (null != componentId) | 1476 | if (null != componentId) |
1477 | { | 1477 | { |
1478 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureGroups", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); | 1478 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix6ConfigureGroups", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); |
1479 | } | 1479 | } |
1480 | 1480 | ||
1481 | foreach (var child in element.Elements()) | 1481 | foreach (var child in element.Elements()) |
@@ -1488,7 +1488,7 @@ namespace WixToolset.Util | |||
1488 | this.ParseGroupRefElement(intermediate, section, child, id.Id, groupType:true); | 1488 | this.ParseGroupRefElement(intermediate, section, child, id.Id, groupType:true); |
1489 | break; | 1489 | break; |
1490 | default: | 1490 | default: |
1491 | //this.ParseHelper.UnexpectedElement(element, child); | 1491 | this.ParseHelper.UnexpectedElement(element, child); |
1492 | break; | 1492 | break; |
1493 | } | 1493 | } |
1494 | } | 1494 | } |
@@ -1561,6 +1561,9 @@ namespace WixToolset.Util | |||
1561 | } | 1561 | } |
1562 | else | 1562 | else |
1563 | { | 1563 | { |
1564 | // Add reference to bring in fragment | ||
1565 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix6AddGroupMembership", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); | ||
1566 | |||
1564 | section.AddSymbol(new GroupGroupSymbol(sourceLineNumbers) | 1567 | section.AddSymbol(new GroupGroupSymbol(sourceLineNumbers) |
1565 | { | 1568 | { |
1566 | ChildGroupRef = childId, | 1569 | ChildGroupRef = childId, |