From 9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 25 Oct 2019 00:48:35 -0700 Subject: Update to WixOutput file structure to fix embedded file handling --- src/WixToolset.Core.WindowsInstaller/MsiBackend.cs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/MsiBackend.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs index 2ebb3f13..5cd7204a 100644 --- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs @@ -2,7 +2,6 @@ namespace WixToolset.Core.WindowsInstaller { - using System; using WixToolset.Core.WindowsInstaller.Bind; using WixToolset.Core.WindowsInstaller.Inscribe; using WixToolset.Core.WindowsInstaller.Unbind; @@ -26,18 +25,21 @@ namespace WixToolset.Core.WindowsInstaller var validator = Validator.CreateFromContext(context, "darice.cub"); - var command = new BindDatabaseCommand(context, backendExtensions, validator); - command.Execute(); + using (var command = new BindDatabaseCommand(context, backendExtensions, validator)) + { + command.Execute(); - var result = context.ServiceProvider.GetService(); - result.FileTransfers = command.FileTransfers; - result.TrackedFiles = command.TrackedFiles; + var result = context.ServiceProvider.GetService(); + result.FileTransfers = command.FileTransfers; + result.TrackedFiles = command.TrackedFiles; - foreach (var extension in backendExtensions) - { - extension.PostBackendBind(result, command.Pdb); + foreach (var extension in backendExtensions) + { + extension.PostBackendBind(result, command.Wixout); + } + + return result; } - return result; } public IDecompileResult Decompile(IDecompileContext context) -- cgit v1.2.3-55-g6feb