Make the SecureObjectsTuple Id a bit more resilient.
Bob Arnson committed
Mar 9, 2020 at 19:50 UTC
00b945dfc182304a7999aa999f4303078beb2e52
2 files changed
+3
-2
src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+1
-1
@@ -105,7 +105,7 @@ namespace WixToolsetTest.Util
105
"CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t",
106
"CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t",
107
"CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t",
108
- "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
108
+ "Wix4SecureObject:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo",
109
}, results.OrderBy(s => s).ToArray());
110
}
111
src/wixext/UtilCompiler.cs
+2
-1
@@ -2452,7 +2452,8 @@ namespace WixToolset.Util
2452
{
2453
this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
2454
2455
- var tuple = new SecureObjectsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, objectId))
2455
+ var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user);
2456
+ var tuple = new SecureObjectsTuple(sourceLineNumbers, id)
2457
{
2458
Table = tableName,
2459
Domain = domain,