From 5a1afc9030a1fcc101b6bb52b576fbbfa3ad33c2 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 23 Jul 2018 14:21:40 -0700 Subject: Integrate Extensibility.Data namespace change from Extensibility repo --- .../Bind/BindDatabaseCommand.cs | 6 +++--- .../Bind/CabinetResolver.cs | 1 + .../Bind/CreateCabinetsCommand.cs | 2 +- .../Bind/ProcessUncompressedFilesCommand.cs | 2 +- .../Inscribe/InscribeMsiPackageCommand.cs | 20 ++++++++++++-------- src/WixToolset.Core.WindowsInstaller/MsiBackend.cs | 2 +- src/WixToolset.Core.WindowsInstaller/MsmBackend.cs | 4 ++-- src/WixToolset.Core.WindowsInstaller/MspBackend.cs | 4 ++-- src/WixToolset.Core.WindowsInstaller/MstBackend.cs | 2 +- .../Unbind/UnbindMsiOrMsmCommand.cs | 2 +- .../UnbindContext.cs | 5 +---- src/WixToolset.Core.WindowsInstaller/Validator.cs | 6 ++++-- .../WindowsInstallerBackendFactory.cs | 1 + 13 files changed, 31 insertions(+), 26 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs index 2e4b4827..119cbd55 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs @@ -8,10 +8,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Linq; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Bind; using WixToolset.Data.Tuples; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; /// @@ -24,6 +24,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind public BindDatabaseCommand(IBindContext context, IEnumerable backendExtension, Validator validator) { + this.Messaging = context.ServiceProvider.GetService(); + this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions(); this.CabbingThreadCount = context.CabbingThreadCount; @@ -34,7 +36,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.ExpectedEmbeddedFiles = context.ExpectedEmbeddedFiles; this.FileSystemExtensions = context.FileSystemExtensions; this.Intermediate = context.IntermediateRepresentation; - this.Messaging = context.Messaging; this.OutputPath = context.OutputPath; this.IntermediateFolder = context.IntermediateFolder; this.Validator = validator; @@ -76,7 +77,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind private Validator Validator { get; } - public IEnumerable FileTransfers { get; private set; } public IEnumerable ContentFilePaths { get; private set; } diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs index cf8eb338..759fa586 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs @@ -10,6 +10,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.Native; using WixToolset.Data; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; public class CabinetResolver { diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs index 997ffa09..328bb082 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs @@ -11,11 +11,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind using System.Threading; using WixToolset.Core.Bind; using WixToolset.Data; - using WixToolset.Data.Bind; using WixToolset.Data.Tuples; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; /// diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs index 56c86b11..4b143ead 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs @@ -9,8 +9,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind using WixToolset.Core.Bind; using WixToolset.Core.Native; using WixToolset.Data; - using WixToolset.Data.Bind; using WixToolset.Data.Tuples; + using WixToolset.Extensibility.Data; using WixToolset.Msi; /// diff --git a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs index 93dd9d3b..f3028fbe 100644 --- a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs @@ -12,7 +12,8 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe using WixToolset.Core.WindowsInstaller.Bind; using WixToolset.Data; using WixToolset.Data.WindowsInstaller; - using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; + using WixToolset.Extensibility.Services; using WixToolset.Msi; internal class InscribeMsiPackageCommand @@ -20,11 +21,14 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe public InscribeMsiPackageCommand(IInscribeContext context) { this.Context = context; + this.Messaging = context.ServiceProvider.GetService(); this.TableDefinitions = WindowsInstallerStandardInternal.GetTableDefinitions(); } private IInscribeContext Context { get; } + private IMessaging Messaging { get; } + private TableDefinitionCollection TableDefinitions { get; } public bool Execute() @@ -36,7 +40,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe FileAttributes attributes = File.GetAttributes(this.Context.InputFilePath); if (FileAttributes.ReadOnly == (attributes & FileAttributes.ReadOnly)) { - this.Context.Messaging.Write(ErrorMessages.ReadOnlyOutputFile(this.Context.InputFilePath)); + this.Messaging.Write(ErrorMessages.ReadOnlyOutputFile(this.Context.InputFilePath)); return shouldCommit; } @@ -179,7 +183,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe // If the cabs aren't there, throw an error but continue to catch the other errors if (!File.Exists(cabPath)) { - this.Context.Messaging.Write(ErrorMessages.WixFileNotFound(cabPath)); + this.Messaging.Write(ErrorMessages.WixFileNotFound(cabPath)); continue; } @@ -205,11 +209,11 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe if ((5 == Environment.OSVersion.Version.Major && 2 == Environment.OSVersion.Version.Minor) || // W2K3 (5 == Environment.OSVersion.Version.Major && 1 == Environment.OSVersion.Version.Minor)) // XP { - this.Context.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); + this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); } else // otherwise, generic error { - this.Context.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); + this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult))); } } @@ -252,7 +256,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe if (digitalCertificateTable.Rows.Count > 0) { - var command = new CreateIdtFileCommand(this.Context.Messaging, digitalCertificateTable, codepage, this.Context.IntermediateFolder, true); + var command = new CreateIdtFileCommand(this.Messaging, digitalCertificateTable, codepage, this.Context.IntermediateFolder, true); command.Execute(); database.Import(command.IdtPath); @@ -261,7 +265,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe if (digitalSignatureTable.Rows.Count > 0) { - var command = new CreateIdtFileCommand(this.Context.Messaging, digitalSignatureTable, codepage, this.Context.IntermediateFolder, true); + var command = new CreateIdtFileCommand(this.Messaging, digitalSignatureTable, codepage, this.Context.IntermediateFolder, true); command.Execute(); database.Import(command.IdtPath); @@ -275,7 +279,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe // If we did find external cabs but none of them were signed, give a warning if (foundUnsignedExternals) { - this.Context.Messaging.Write(WarningMessages.ExternalCabsAreNotSigned(this.Context.InputFilePath)); + this.Messaging.Write(WarningMessages.ExternalCabsAreNotSigned(this.Context.InputFilePath)); } if (shouldCommit) diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs index 11198b2b..f72a7c66 100644 --- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs @@ -7,8 +7,8 @@ namespace WixToolset.Core.WindowsInstaller using WixToolset.Core.WindowsInstaller.Inscribe; using WixToolset.Core.WindowsInstaller.Unbind; using WixToolset.Data; - using WixToolset.Data.Bind; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; internal class MsiBackend : IBackend diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs index 4076da66..91377b48 100644 --- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs @@ -6,13 +6,13 @@ namespace WixToolset.Core.WindowsInstaller using WixToolset.Core.WindowsInstaller.Bind; using WixToolset.Core.WindowsInstaller.Unbind; using WixToolset.Data; - using WixToolset.Data.Bind; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; internal class MsmBackend : IBackend { - public BindResult Bind(WixToolset.Extensibility.IBindContext context) + public BindResult Bind(IBindContext context) { var extensionManager = context.ServiceProvider.GetService(); diff --git a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs index 5dbed241..a47802bb 100644 --- a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs @@ -10,13 +10,13 @@ namespace WixToolset.Core.WindowsInstaller using WixToolset.Data; using WixToolset.Data.Bind; using WixToolset.Extensibility; - using WixToolset.Extensibility.Services; + using WixToolset.Extensibility.Data; using WixToolset.Msi; using WixToolset.Ole32; internal class MspBackend : IBackend { - public BindResult Bind(WixToolset.Extensibility.IBindContext context) + public BindResult Bind(IBindContext context) { throw new NotImplementedException(); } diff --git a/src/WixToolset.Core.WindowsInstaller/MstBackend.cs b/src/WixToolset.Core.WindowsInstaller/MstBackend.cs index 4eb0901c..fa696d55 100644 --- a/src/WixToolset.Core.WindowsInstaller/MstBackend.cs +++ b/src/WixToolset.Core.WindowsInstaller/MstBackend.cs @@ -5,8 +5,8 @@ namespace WixToolset.Core.WindowsInstaller using System; using WixToolset.Core.WindowsInstaller.Unbind; using WixToolset.Data; - using WixToolset.Data.Bind; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; internal class MstBackend : IBackend { diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs index ce3f1ff6..2cea9cfb 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs @@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind using System.ComponentModel; using WixToolset.Core.Native; using WixToolset.Data; - using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; using WixToolset.Msi; internal class UnbindMsiOrMsmCommand diff --git a/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs b/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs index ff71bea4..2bc4516d 100644 --- a/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs +++ b/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs @@ -3,15 +3,12 @@ namespace WixToolset.Core { using System; - using WixToolset.Extensibility; - using WixToolset.Extensibility.Services; + using WixToolset.Extensibility.Data; internal class UnbindContext : IUnbindContext { public IServiceProvider ServiceProvider { get; } - public IMessaging Messaging { get; set; } - public string ExportBasePath { get; set; } public string InputFilePath { get; set; } diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs index 5f41e88d..cbe489be 100644 --- a/src/WixToolset.Core.WindowsInstaller/Validator.cs +++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs @@ -16,6 +16,7 @@ namespace WixToolset.Core.WindowsInstaller using WixToolset.Data; using WixToolset.Data.WindowsInstaller; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; using WixToolset.Msi; @@ -324,14 +325,15 @@ namespace WixToolset.Core.WindowsInstaller } } - public static Validator CreateFromContext(WixToolset.Extensibility.IBindContext context, string cubeFilename) + public static Validator CreateFromContext(IBindContext context, string cubeFilename) { Validator validator = null; + var messaging = context.ServiceProvider.GetService(); // Tell the binder about the validator if validation isn't suppressed if (!context.SuppressValidation) { - validator = new Validator(context.Messaging); + validator = new Validator(messaging); validator.IntermediateFolder = Path.Combine(context.IntermediateFolder, "validate"); // set the default cube file diff --git a/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs index b66a4617..8ffa1a03 100644 --- a/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs +++ b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs @@ -5,6 +5,7 @@ namespace WixToolset.Core.WindowsInstaller using System; using System.IO; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; internal class WindowsInstallerBackendFactory : IBackendFactory { -- cgit v1.2.3-55-g6feb