From 3ccd5e439da4296d6f2b66ce47075ab20d039676 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 14 Mar 2021 07:38:48 -0700 Subject: Minimize public surface area of Core Fixes wixtoolset/issues#6374 --- .../Bind/AttachPatchTransformsCommand.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs index 2249faf8..b2052b90 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs @@ -55,16 +55,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind private readonly TableDefinitionCollection tableDefinitions; - public AttachPatchTransformsCommand(IMessaging messaging, Intermediate intermediate, IEnumerable transforms) + public AttachPatchTransformsCommand(IMessaging messaging, IBackendHelper backendHelper, Intermediate intermediate, IEnumerable transforms) { this.tableDefinitions = new TableDefinitionCollection(WindowsInstallerTableDefinitions.All); this.Messaging = messaging; + this.BackendHelper = backendHelper; this.Intermediate = intermediate; this.Transforms = transforms; } private IMessaging Messaging { get; } + private IBackendHelper BackendHelper { get; } + private Intermediate Intermediate { get; } private IEnumerable Transforms { get; } @@ -797,7 +800,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind if (!deletedComponent.ContainsKey(componentId)) { var foundRemoveFileEntry = false; - var filename = Common.GetName(row.FieldAsString(2), false, true); + var filename = this.BackendHelper.GetMsiFileName(row.FieldAsString(2), false, true); if (transform.TryGetTable("RemoveFile", out var removeFileTable)) { @@ -813,7 +816,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind // Check if there is a RemoveFile entry for this file if (null != removeFileRow[2]) { - var removeFileName = Common.GetName(removeFileRow.FieldAsString(2), false, true); + var removeFileName = this.BackendHelper.GetMsiFileName(removeFileRow.FieldAsString(2), false, true); // Convert the MSI format for a wildcard string to Regex format. removeFileName = removeFileName.Replace('.', '|').Replace('?', '.').Replace("*", ".*").Replace("|", "\\."); -- cgit v1.2.3-55-g6feb