Move DirectX.wixext into ext

5 files changed, 154 insertions, 0 deletions

diff --git a/src/ext/DirectX/wixext/DirectXDecompiler.cs b/src/ext/DirectX/wixext/DirectXDecompiler.cs
new file mode 100644
index 00000000..03f90163
--- /dev/null
+++ b/src/ext/DirectX/wixext/DirectXDecompiler.cs
@@ -0,0 +1,72 @@
+// 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
+{
+#if TODO_CONSIDER_DECOMPILER
+    using System;
+    using System.Text;
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+    using Wix = WixToolset.Data.Serialize;
+
+    /// <summary>
+    /// The WiX Toolset DirectX Extension.
+    /// </summary>
+    public sealed class DirectXDecompiler : DecompilerExtension
+    {
+        /// <summary>
+        /// Get the extensions library to be removed.
+        /// </summary>
+        /// <param name="tableDefinitions">Table definitions for library.</param>
+        /// <returns>Library to remove from decompiled output.</returns>
+        public override Library GetLibraryToRemove(TableDefinitionCollection tableDefinitions)
+        {
+            return DirectXExtensionData.GetExtensionLibrary(tableDefinitions);
+        }
+
+        /// <summary>
+        /// Called at the beginning of the decompilation of a database.
+        /// </summary>
+        /// <param name="tables">The collection of all tables.</param>
+        public override void Initialize(TableIndexedCollection tables)
+        {
+            Table propertyTable = tables["Property"];
+
+            if (null != propertyTable)
+            {
+                foreach (Row row in propertyTable.Rows)
+                {
+                    if ("SecureCustomProperties" == row[0].ToString())
+                    {
+                        // if we've referenced any of the DirectX properties, add
+                        // a PropertyRef to pick up the CA from the extension and then remove
+                        // it from the SecureCustomExtensions property so we don't get duplicates
+                        StringBuilder remainingProperties = new StringBuilder();
+                        string[] secureCustomProperties = row[1].ToString().Split(';');
+                        foreach (string property in secureCustomProperties)
+                        {
+                            if (property.StartsWith("WIX_DIRECTX_"))
+                            {
+                                Wix.PropertyRef propertyRef = new Wix.PropertyRef();
+                                propertyRef.Id = property;
+                                this.Core.RootElement.AddChild(propertyRef);
+                            }
+                            else
+                            {
+                                if (0 < remainingProperties.Length)
+                                {
+                                    remainingProperties.Append(";");
+                                }
+                                remainingProperties.Append(property);
+                            }
+                        }
+
+                        row[1] = remainingProperties.ToString();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+#endif
+}
diff --git a/src/ext/DirectX/wixext/DirectXExtensionData.cs b/src/ext/DirectX/wixext/DirectXExtensionData.cs
new file mode 100644
index 00000000..d61af23f
--- /dev/null
+++ b/src/ext/DirectX/wixext/DirectXExtensionData.cs
@@ -0,0 +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.DirectX
+{
+    using WixToolset.Data;
+    using WixToolset.Extensibility;
+
+    /// <summary>
+    /// The WiX Toolset DirectX Extension.
+    /// </summary>
+    public sealed class DirectXExtensionData : BaseExtensionData
+    {
+        /// <summary>
+        /// Gets the default culture.
+        /// </summary>
+        /// <value>The default culture.</value>
+        public override string DefaultCulture => "en-US";
+
+        public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
+        {
+            return Intermediate.Load(typeof(DirectXExtensionData).Assembly, "WixToolset.DirectX.directx.wixlib", symbolDefinitions);
+        }
+    }
+}
diff --git a/src/ext/DirectX/wixext/DirectXExtensionFactory.cs b/src/ext/DirectX/wixext/DirectXExtensionFactory.cs
new file mode 100644
index 00000000..fb7f84aa
--- /dev/null
+++ b/src/ext/DirectX/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 IReadOnlyCollection<Type> ExtensionTypes => new[]
+        {
+            typeof(DirectXExtensionData),
+        };
+    }
+}
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
new file mode 100644
index 00000000..a848ff9a
--- /dev/null
+++ b/src/ext/DirectX/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/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
new file mode 100644
index 00000000..4e27a6da
--- /dev/null
+++ b/src/ext/DirectX/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>