From 73e6559b809f5f5ae2041d22ec81479df0fe91f9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 2 Feb 2019 14:07:55 -0600 Subject: Integrate into latest v4. --- src/wixext/DirectXDecompiler.cs | 4 +++- src/wixext/DirectXExtensionData.cs | 24 +++++++-------------- src/wixext/DirectXExtensionFactory.cs | 16 ++++++++++++++ src/wixext/WixDirectXExtension.csproj | 31 ---------------------------- src/wixext/WixToolset.DirectX.wixext.csproj | 31 ++++++++++++++++++++++++++++ src/wixext/WixToolset.DirectX.wixext.targets | 11 ++++++++++ 6 files changed, 68 insertions(+), 49 deletions(-) create mode 100644 src/wixext/DirectXExtensionFactory.cs delete mode 100644 src/wixext/WixDirectXExtension.csproj create mode 100644 src/wixext/WixToolset.DirectX.wixext.csproj create mode 100644 src/wixext/WixToolset.DirectX.wixext.targets (limited to 'src/wixext') diff --git a/src/wixext/DirectXDecompiler.cs b/src/wixext/DirectXDecompiler.cs index c8056c12..03f90163 100644 --- a/src/wixext/DirectXDecompiler.cs +++ b/src/wixext/DirectXDecompiler.cs @@ -1,7 +1,8 @@ // 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.DirectX { +#if TODO_CONSIDER_DECOMPILER using System; using System.Text; using WixToolset.Data; @@ -67,4 +68,5 @@ namespace WixToolset.Extensions } } } +#endif } diff --git a/src/wixext/DirectXExtensionData.cs b/src/wixext/DirectXExtensionData.cs index 828b087d..0221d104 100644 --- a/src/wixext/DirectXExtensionData.cs +++ b/src/wixext/DirectXExtensionData.cs @@ -1,34 +1,24 @@ // 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.DirectX { - using System; - using System.Reflection; using WixToolset.Data; using WixToolset.Extensibility; /// /// The WiX Toolset DirectX Extension. /// - public sealed class DirectXExtensionData : ExtensionData + public sealed class DirectXExtensionData : BaseExtensionData { /// - /// Gets the library associated with this extension. + /// Gets the default culture. /// - /// The table definitions to use while loading the library. - /// The loaded library. - public override Library GetLibrary(TableDefinitionCollection tableDefinitions) - { - return DirectXExtensionData.GetExtensionLibrary(tableDefinitions); - } + /// The default culture. + public override string DefaultCulture => "en-US"; - /// - /// 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.DirectX.wixlib", tableDefinitions); + return Intermediate.Load(typeof(DirectXExtensionData).Assembly, "WixToolset.DirectX.directx.wixlib", tupleDefinitions); } } } diff --git a/src/wixext/DirectXExtensionFactory.cs b/src/wixext/DirectXExtensionFactory.cs new file mode 100644 index 00000000..b3755ee9 --- /dev/null +++ b/src/wixext/DirectXExtensionFactory.cs @@ -0,0 +1,16 @@ +// 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.DirectX +{ + using System; + using System.Collections.Generic; + using WixToolset.Extensibility; + + public class DirectXExtensionFactory : BaseExtensionFactory + { + protected override IEnumerable ExtensionTypes => new[] + { + typeof(DirectXExtensionData), + }; + } +} diff --git a/src/wixext/WixDirectXExtension.csproj b/src/wixext/WixDirectXExtension.csproj deleted file mode 100644 index 577d36f3..00000000 --- a/src/wixext/WixDirectXExtension.csproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - {6182DBCA-146A-4F37-8406-3139BBE04636} - WixDirectXExtension - Library - WixToolset.Extensions - - - - - - - Data\DirectX.wixlib - - - - - - - - - - false - - - - diff --git a/src/wixext/WixToolset.DirectX.wixext.csproj b/src/wixext/WixToolset.DirectX.wixext.csproj new file mode 100644 index 00000000..a848ff9a --- /dev/null +++ b/src/wixext/WixToolset.DirectX.wixext.csproj @@ -0,0 +1,31 @@ + + + + + + netstandard2.0 + WixToolset.DirectX + WiX Toolset DirectX Extension + WiX Toolset DirectX Extension + true + build + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/WixToolset.DirectX.wixext.targets b/src/wixext/WixToolset.DirectX.wixext.targets new file mode 100644 index 00000000..4e27a6da --- /dev/null +++ b/src/wixext/WixToolset.DirectX.wixext.targets @@ -0,0 +1,11 @@ + + + + + + $(MSBuildThisFileDirectory)..\tools\WixToolset.DirectX.wixext.dll + + + + + -- cgit v1.2.3-55-g6feb