From 34c1ceb7d1639a3a769ba214dc024b1921af2057 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 3 Apr 2020 12:02:16 +1000 Subject: Update dependencies. --- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- src/wixext/Tuples/SecureObjectsTuple.cs | 8 ++++++++ src/wixext/UtilCompiler.cs | 1 + src/wixext/UtilWindowsInstallerBackendExtension.cs | 7 ------- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index c5b370ac..b84e8b2d 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:secJTI3ywlGOTsHWSdR4bEtGDc.veU\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/wixext/Tuples/SecureObjectsTuple.cs b/src/wixext/Tuples/SecureObjectsTuple.cs index 920fe7b3..dd658be1 100644 --- a/src/wixext/Tuples/SecureObjectsTuple.cs +++ b/src/wixext/Tuples/SecureObjectsTuple.cs @@ -11,6 +11,7 @@ namespace WixToolset.Util UtilTupleDefinitionType.SecureObjects.ToString(), new[] { + new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.SecureObject), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Table), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.Domain), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(SecureObjectsTupleFields.User), IntermediateFieldType.String), @@ -27,6 +28,7 @@ namespace WixToolset.Util.Tuples public enum SecureObjectsTupleFields { + SecureObject, Table, Domain, User, @@ -46,6 +48,12 @@ namespace WixToolset.Util.Tuples public IntermediateField this[SecureObjectsTupleFields index] => this.Fields[(int)index]; + public string SecureObject + { + get => this.Fields[(int)SecureObjectsTupleFields.SecureObject].AsString(); + set => this.Set((int)SecureObjectsTupleFields.SecureObject, value); + } + public string Table { get => this.Fields[(int)SecureObjectsTupleFields.Table].AsString(); diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index 6e3c2531..fef9175e 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2481,6 +2481,7 @@ namespace WixToolset.Util var id = this.ParseHelper.CreateIdentifier("sec", objectId, tableName, domain, user); var tuple = new SecureObjectsTuple(sourceLineNumbers, id) { + SecureObject = objectId, Table = tableName, Domain = domain, User = user, diff --git a/src/wixext/UtilWindowsInstallerBackendExtension.cs b/src/wixext/UtilWindowsInstallerBackendExtension.cs index 8648cb17..2365ed01 100644 --- a/src/wixext/UtilWindowsInstallerBackendExtension.cs +++ b/src/wixext/UtilWindowsInstallerBackendExtension.cs @@ -5,7 +5,6 @@ namespace WixToolset.Util using System.Collections.Generic; using System.Linq; using System.Xml; - using WixToolset.Data; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; @@ -15,12 +14,6 @@ namespace WixToolset.Util public override IEnumerable TableDefinitions { get => Tables; } - public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) - { - var columnZeroIsId = tuple.Id != null; - return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId); - } - private static TableDefinition[] LoadTables() { using (var resourceStream = typeof(UtilWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Util.tables.xml")) diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 25b4e6a9..f2e3acd1 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 4db3b93d..4ad0cf8f 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -50,7 +50,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + -- cgit v1.2.3-55-g6feb