From ea864b56d115e4f7a7205827ecaaba0e1db81d41 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 31 Dec 2018 23:57:35 -0600 Subject: Integrate into latest v4. --- src/wixext/BalExtensionData.cs | 45 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) (limited to 'src/wixext/BalExtensionData.cs') diff --git a/src/wixext/BalExtensionData.cs b/src/wixext/BalExtensionData.cs index 7e8dea5b..46152b53 100644 --- a/src/wixext/BalExtensionData.cs +++ b/src/wixext/BalExtensionData.cs @@ -1,55 +1,30 @@ // 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.Extensions +namespace WixToolset.Bal { - using System; - using System.Reflection; using WixToolset.Data; using WixToolset.Extensibility; /// /// The WiX Toolset Bal Extension. /// - public sealed class BalExtensionData : ExtensionData + public sealed class BalExtensionData : BaseExtensionData { /// - /// Gets the optional table definitions for this extension. + /// Gets the default culture. /// - /// The optional table definitions for this extension. - public override TableDefinitionCollection TableDefinitions - { - get - { - return BalExtensionData.GetExtensionTableDefinitions(); - } - } + /// The default culture. + public override string DefaultCulture => "en-US"; - /// - /// Gets the library associated with this extension. - /// - /// The table definitions to use while loading the library. - /// The loaded library. - public override Library GetLibrary(TableDefinitionCollection tableDefinitions) + public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) { - return BalExtensionData.GetExtensionLibrary(tableDefinitions); + tupleDefinition = BalTupleDefinitions.ByName(name); + return tupleDefinition != null; } - /// - /// Internal mechanism to access the extension's table definitions. - /// - /// Extension's table definitions. - internal static TableDefinitionCollection GetExtensionTableDefinitions() - { - return ExtensionData.LoadTableDefinitionHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.tables.xml"); - } - - /// - /// Internal mechanism to access the extension's library. - /// - /// Extension's library. - internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions) + public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) { - return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.bal.wixlib", tableDefinitions); + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", tupleDefinitions); } } } -- cgit v1.2.3-55-g6feb