From 00b945dfc182304a7999aa999f4303078beb2e52 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 9 Mar 2020 19:50:20 -0400 Subject: Make the SecureObjectsTuple Id a bit more resilient. --- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/UtilCompiler.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 750098d6..8f33eff5 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -105,7 +105,7 @@ namespace WixToolsetTest.Util "CustomAction:Wix4ExecSecureObjectsRollback_X64\t11521\tWix4UtilCA_X64\tExecSecureObjectsRollback\t", "CustomAction:Wix4SchedSecureObjects_X64\t1\tWix4UtilCA_X64\tSchedSecureObjects\t", "CustomAction:Wix4SchedSecureObjectsRollback_X64\t1\tWix4UtilCA_X64\tSchedSecureObjectsRollback\t", - "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index a8d59ca3..6b359591 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2452,7 +2452,8 @@ namespace WixToolset.Util { this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "SchedSecureObjects", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); - var tuple = new SecureObjectsTuple(sourceLineNumbers, new Identifier(AccessModifier.Private, objectId)) + var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); + var tuple = new SecureObjectsTuple(sourceLineNumbers, id) { Table = tableName, Domain = domain, -- cgit v1.2.3-55-g6feb