From 49f1209035aac1fcfad5dbbe25f7b2306d3be86c Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 7 Dec 2017 14:19:05 -0800 Subject: Support MSI backends creating custom tables and remove WixToolset.Data.WindowsInstaller --- .../WindowsInstallerBackendHelper.cs | 53 ++++++++++++++++++++++ src/WixToolset.Core/WixToolsetServiceProvider.cs | 6 +++ 2 files changed, 59 insertions(+) create mode 100644 src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs (limited to 'src/WixToolset.Core') diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs new file mode 100644 index 00000000..3b41fdf1 --- /dev/null +++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs @@ -0,0 +1,53 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + +namespace WixToolset.Core.ExtensibilityServices +{ + using System; + using System.Linq; + using WixToolset.Data; + using WixToolset.Data.WindowsInstaller; + using WixToolset.Extensibility.Services; + + internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper + { + public WindowsInstallerBackendHelper(IServiceProvider serviceProvider) + { + this.ServiceProvider = serviceProvider; + } + + private IServiceProvider ServiceProvider { get; } + + public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, Output output, TableDefinition[] tableDefinitions) + { + var tableDefinition = tableDefinitions.FirstOrDefault(t => t.Name == tuple.Definition.Name); + + if (tableDefinition == null) + { + return false; + } + + var table = output.EnsureTable(tableDefinition); + var row = table.CreateRow(tuple.SourceLineNumbers); + for (var i = 0; i < tuple.Fields.Length; ++i) + { + if (i < tableDefinition.Columns.Count) + { + var column = tableDefinition.Columns[i]; + + switch (column.Type) + { + case ColumnType.Number: + row[i] = tuple.AsNumber(i); + break; + + default: + row[i] = tuple.AsString(i); + break; + } + } + } + + return true; + } + } +} diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs index d31d7355..c77f3813 100644 --- a/src/WixToolset.Core/WixToolsetServiceProvider.cs +++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs @@ -14,6 +14,7 @@ namespace WixToolset.Core private ParseHelper parseHelper; private PreprocessHelper preprocessHelper; private TupleDefinitionCreator tupleDefinitionCreator; + private WindowsInstallerBackendHelper windowsInstallerBackendHelper; public object GetService(Type serviceType) { @@ -76,6 +77,11 @@ namespace WixToolset.Core return this.preprocessHelper = this.preprocessHelper ?? new PreprocessHelper(this); } + if (serviceType == typeof(IWindowsInstallerBackendHelper)) + { + return this.windowsInstallerBackendHelper = this.windowsInstallerBackendHelper ?? new WindowsInstallerBackendHelper(this); + } + throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType)); } } -- cgit v1.2.3-55-g6feb