Integrate into latest v4.

6 files changed, 68 insertions, 49 deletions

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;
 
     /// <summary>
     /// The WiX Toolset DirectX Extension.
     /// </summary>
-    public sealed class DirectXExtensionData : ExtensionData
+    public sealed class DirectXExtensionData : BaseExtensionData
     {
         /// <summary>
-        /// Gets the library associated with this extension.
+        /// Gets the default culture.
         /// </summary>
-        /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
-        /// <returns>The loaded library.</returns>
-        public override Library GetLibrary(TableDefinitionCollection tableDefinitions)
-        {
-            return DirectXExtensionData.GetExtensionLibrary(tableDefinitions);
-        }
+        /// <value>The default culture.</value>
+        public override string DefaultCulture => "en-US";
 
-        /// <summary>
-        /// Internal mechanism to access the extension's library.
-        /// </summary>
-        /// <returns>Extension's library.</returns>
-        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<Type> 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 @@
-<?xml version="1.0" encoding="utf-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. -->
-
-
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectGuid>{6182DBCA-146A-4F37-8406-3139BBE04636}</ProjectGuid>
-    <AssemblyName>WixDirectXExtension</AssemblyName>
-    <OutputType>Library</OutputType>
-    <RootNamespace>WixToolset.Extensions</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="DirectXDecompiler.cs" />
-    <Compile Include="DirectXExtensionData.cs" />
-    <EmbeddedResource Include="$(OutputPath)\DirectX.wixlib">
-      <Link>Data\DirectX.wixlib</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <ProjectReference Include="..\..\..\libs\WixToolset.Data\WixToolset.Data.csproj" />
-    <ProjectReference Include="..\..\..\libs\WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
-    <ProjectReference Include="..\..\..\tools\wix\Wix.csproj" />
-    <ProjectReference Include="..\wixlib\DirectXExtension.wixproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-</Project>
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 @@
+<?xml version="1.0" encoding="utf-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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>WixToolset.DirectX</RootNamespace>
+    <Description>WiX Toolset DirectX Extension</Description>
+    <Title>WiX Toolset DirectX Extension</Title>
+    <IsTool>true</IsTool>
+    <ContentTargetFolders>build</ContentTargetFolders>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileName).targets" />
+    <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
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 @@
+<?xml version="1.0" encoding="utf-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. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixToolsetDirectXWixextPath Condition=" '$(WixToolsetDirectXWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DirectX.wixext.dll</WixToolsetDirectXWixextPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <WixExtension Include="$(WixToolsetDirectXWixextPath)" />
+  </ItemGroup>
+</Project>