diff --git a/src/ext/DifxApp/DifxApp.wixext.sln b/src/ext/DifxApp/DifxApp.wixext.sln deleted file mode 100644 index d212c773e..000000000 --- a/src/ext/DifxApp/DifxApp.wixext.sln +++ /dev/null @@ -1,63 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30611.23 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "difxapp", "wixlib\difxapp.wixproj", "{5066EB93-D8F7-4FAE-B687-024D7A81BD95}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.DifxApp.wixext", "wixext\WixToolset.DifxApp.wixext.csproj", "{2256EFD7-E678-4485-818D-986D590068BE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.DifxApp", "test\WixToolsetTest.DifxApp\WixToolsetTest.DifxApp.csproj", "{883D7BA3-1ADC-47AC-95B0-221BB0B7788D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Debug|Any CPU.ActiveCfg = Debug|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Debug|Any CPU.Build.0 = Debug|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Debug|x64.ActiveCfg = Debug|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Debug|x86.ActiveCfg = Debug|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Debug|x86.Build.0 = Debug|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Release|Any CPU.ActiveCfg = Release|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Release|Any CPU.Build.0 = Release|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Release|x64.ActiveCfg = Release|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Release|x86.ActiveCfg = Release|x86 - {5066EB93-D8F7-4FAE-B687-024D7A81BD95}.Release|x86.Build.0 = Release|x86 - {2256EFD7-E678-4485-818D-986D590068BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Debug|x64.ActiveCfg = Debug|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Debug|x64.Build.0 = Debug|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Debug|x86.ActiveCfg = Debug|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Debug|x86.Build.0 = Debug|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Release|Any CPU.Build.0 = Release|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Release|x64.ActiveCfg = Release|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Release|x64.Build.0 = Release|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Release|x86.ActiveCfg = Release|Any CPU - {2256EFD7-E678-4485-818D-986D590068BE}.Release|x86.Build.0 = Release|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Debug|x64.ActiveCfg = Debug|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Debug|x64.Build.0 = Debug|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Debug|x86.ActiveCfg = Debug|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Debug|x86.Build.0 = Debug|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Release|Any CPU.Build.0 = Release|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Release|x64.ActiveCfg = Release|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Release|x64.Build.0 = Release|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Release|x86.ActiveCfg = Release|Any CPU - {883D7BA3-1ADC-47AC-95B0-221BB0B7788D}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {60A3EA0F-9313-47F8-BF6B-74478A57B577} - EndGlobalSection -EndGlobal diff --git a/src/ext/DifxApp/Directory.Build.props b/src/ext/DifxApp/Directory.Build.props deleted file mode 100644 index 4697cf0cc..000000000 --- a/src/ext/DifxApp/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - DifxApp.wixext - - - - diff --git a/src/ext/DifxApp/README.md b/src/ext/DifxApp/README.md deleted file mode 100644 index 49f30df83..000000000 --- a/src/ext/DifxApp/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# DifxApp.wixext -WixToolset.DifxApp.wixext - DIFxApp WiX Toolset Extension diff --git a/src/ext/DifxApp/difxapp.cmd b/src/ext/DifxApp/difxapp.cmd deleted file mode 100644 index 3f8224532..000000000 --- a/src/ext/DifxApp/difxapp.cmd +++ /dev/null @@ -1,21 +0,0 @@ -@setlocal -@pushd %~dp0 - -@set _C=Debug -:parse_args -@if /i "%1"=="release" set _C=Release -@if not "%1"=="" shift & goto parse_args - -@echo DifxApp.wixext build %_C% - -:: Build -msbuild -Restore -p:Configuration=%_C% || exit /b - -:: Test -dotnet test -c %_C% --no-build test\WixToolsetTest.DifxApp || exit /b - -:: Pack -msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.DifxApp.wixext.csproj || exit /b - -@popd -@endlocal diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs deleted file mode 100644 index d132952f5..000000000 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs +++ /dev/null @@ -1,46 +0,0 @@ -// 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 WixToolsetTest.DifxApp -{ - using System; - using System.IO; - using System.Linq; - using WixInternal.TestSupport; - using WixInternal.Core.TestPackage; - using WixToolset.DifxApp; - using Xunit; - - public class DifxAppExtensionFixture - { - [Fact] - public void CanBuildUsingDriver() - { - var folder = TestData.Get(@"TestData\UsingDriver"); - var build = new Builder(folder, typeof(DifxAppExtensionFactory), new[] { folder }); - - var results = build.BuildAndQuery(Build, "CustomAction"); - WixAssert.CompareLineByLine(new[] - { - "CustomAction:MsiCleanupOnSuccess\t1\tDIFxAppx64\tCleanupOnSuccess\t", - "CustomAction:MsiInstallDrivers\t3073\tDIFxAppAx64\tInstallDriverPackages\t", - "CustomAction:MsiProcessDrivers\t1\tDIFxAppx64\tProcessDriverPackages\t", - "CustomAction:MsiRollbackInstall\t3329\tDIFxAppAx64\tRollbackInstall\t", - "CustomAction:MsiUninstallDrivers\t3073\tDIFxAppAx64\tUninstallDriverPackages\t", - }, results); - } - - private static void Build(string[] args) - { - var newArgs = args.ToList(); - newArgs.Add("-platform"); - newArgs.Add("x64"); - - var extDir = Path.GetDirectoryName(new Uri(typeof(DifxAppExtensionFactory).Assembly.CodeBase).LocalPath); - newArgs.Add(Path.Combine(extDir, "..", "difxapp_x64.wixlib")); - - var result = WixRunner.Execute(warningsAsErrors: false, newArgs.ToArray()).AssertSuccess(); - - Assert.Single(result.Messages.Where(m => m.Id == (int)WixToolset.Data.WarningMessages.Ids.DeprecatedElement)); - } - } -} diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.en-us.wxl b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.en-us.wxl deleted file mode 100644 index f1df1234b..000000000 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.en-us.wxl +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs deleted file mode 100644 index 411893bc1..000000000 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/Package.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/PackageComponents.wxs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/PackageComponents.wxs deleted file mode 100644 index 9609771a3..000000000 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/PackageComponents.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/example.txt b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/example.txt deleted file mode 100644 index 1b4ffe8a4..000000000 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/TestData/UsingDriver/example.txt +++ /dev/null @@ -1 +0,0 @@ -This is example.txt. \ No newline at end of file diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj deleted file mode 100644 index d7176efad..000000000 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - net6.0 - true - - - - - - - - - - - - - - - - - diff --git a/src/ext/DifxApp/wixext/DifxAppCompiler.cs b/src/ext/DifxApp/wixext/DifxAppCompiler.cs deleted file mode 100644 index 6f32a60bb..000000000 --- a/src/ext/DifxApp/wixext/DifxAppCompiler.cs +++ /dev/null @@ -1,155 +0,0 @@ -// 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.DifxApp -{ - using System; - using System.Collections.Generic; - using System.Xml.Linq; - using WixToolset.Data; - using WixToolset.DifxApp.Symbols; - using WixToolset.Extensibility; - - /// - /// The compiler for the WiX Toolset Driver Install Frameworks for Applications Extension. - /// - public sealed class DifxAppCompiler : BaseCompilerExtension - { - private HashSet components; - - public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/difxapp"; - /// - /// Instantiate a new DifxAppCompiler. - /// - public DifxAppCompiler() - { - this.components = new HashSet(); - } - - /// - /// Processes an element for the Compiler. - /// - /// Source line number for the parent element. - /// Parent element of element to process. - /// Element to process. - /// Extra information about the context in which this element is being parsed. - public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) - { - switch (parentElement.Name.LocalName) - { - case "Component": - var componentId = context["ComponentId"]; - var componentWin64 = Boolean.Parse(context["Win64"]); - - switch (element.Name.LocalName) - { - case "Driver": - this.ParseDriverElement(intermediate, section, element, componentId, componentWin64); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - } - - /// - /// Parses a Driver element. - /// - /// Element to parse. - /// Identifier for parent component. - private void ParseDriverElement(Intermediate intermediate, IntermediateSection section, XElement node, string componentId, bool win64) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - int attributes = 0; - var sequence = CompilerConstants.IntegerNotSet; - - // See https://github.com/wixtoolset/issues/issues/6648. DifxApp is deprecated so warn the user. - this.Messaging.Write(WarningMessages.DeprecatedElement(sourceLineNumbers, node.Name.LocalName)); - - // check the number of times a Driver element has been nested under this Component element - if (null != componentId) - { - if (this.components.Contains(componentId)) - { - this.Messaging.Write(ErrorMessages.TooManyElements(sourceLineNumbers, "Component", node.Name.LocalName, 1)); - } - else - { - this.components.Add(componentId); - } - } - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "AddRemovePrograms": - if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x4; - } - break; - case "DeleteFiles": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x10; - } - break; - case "ForceInstall": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x1; - } - break; - case "Legacy": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x8; - } - break; - case "PlugAndPlayPrompt": - if (YesNoType.No == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib)) - { - attributes |= 0x2; - } - break; - case "Sequence": - sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, int.MaxValue); - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "MsiProcessDrivers"); - - var symbol = section.AddSymbol(new MsiDriverPackagesSymbol(sourceLineNumbers) - { - ComponentRef = componentId, - Flags = attributes, - }); - - if (CompilerConstants.IntegerNotSet != sequence) - { - symbol.Sequence = sequence; - } - } - } - } -} diff --git a/src/ext/DifxApp/wixext/DifxAppDecompiler.cs b/src/ext/DifxApp/wixext/DifxAppDecompiler.cs deleted file mode 100644 index e41d8b983..000000000 --- a/src/ext/DifxApp/wixext/DifxAppDecompiler.cs +++ /dev/null @@ -1,98 +0,0 @@ -// 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.DifxApp -{ -#if TODO_CONSIDER_DECOMPILER - using System; - using System.Collections; - using System.Globalization; - using WixToolset.Data; - using WixToolset.Extensibility; - using DifxApp = WixToolset.Extensions.Serialize.DifxApp; - using Wix = WixToolset.Data.Serialize; - - /// - /// The decompiler for the WiX Toolset Driver Install Frameworks for Applications Extension. - /// - public sealed class DifxAppDecompiler : DecompilerExtension - { - /// - /// Creates a decompiler for Gaming Extension. - /// - public DifxAppDecompiler() - { - this.TableDefinitions = DifxAppExtensionData.GetExtensionTableDefinitions(); - } - - /// - /// Decompiles an extension table. - /// - /// The table to decompile. - public override void DecompileTable(Table table) - { - switch (table.Name) - { - case "MsiDriverPackages": - this.DecompileMsiDriverPackagesTable(table); - break; - default: - base.DecompileTable(table); - break; - } - } - - /// - /// Decompile the MsiDriverPackages table. - /// - /// The table to decompile. - private void DecompileMsiDriverPackagesTable(Table table) - { - foreach (Row row in table.Rows) - { - DifxApp.Driver driver = new DifxApp.Driver(); - - int attributes = (int)row[1]; - if (0x1 == (attributes & 0x1)) - { - driver.ForceInstall = DifxApp.YesNoType.yes; - } - - if (0x2 == (attributes & 0x2)) - { - driver.PlugAndPlayPrompt = DifxApp.YesNoType.no; - } - - if (0x4 == (attributes & 0x4)) - { - driver.AddRemovePrograms = DifxApp.YesNoType.no; - } - - if (0x8 == (attributes & 0x8)) - { - driver.Legacy = DifxApp.YesNoType.yes; - } - - if (0x10 == (attributes & 0x10)) - { - driver.DeleteFiles = DifxApp.YesNoType.yes; - } - - if (null != row[2]) - { - driver.Sequence = (int)row[2]; - } - - Wix.Component component = (Wix.Component)this.Core.GetIndexedElement("Component", (string)row[0]); - if (null != component) - { - component.AddChild(driver); - } - else - { - this.Core.OnMessage(WixWarnings.ExpectedForeignRow(row.SourceLineNumbers, table.Name, row.GetPrimaryKey(DecompilerConstants.PrimaryKeyDelimiter), "Component", (string)row[0], "Component")); - } - } - } - } -#endif -} diff --git a/src/ext/DifxApp/wixext/DifxAppExtensionData.cs b/src/ext/DifxApp/wixext/DifxAppExtensionData.cs deleted file mode 100644 index 5552717c4..000000000 --- a/src/ext/DifxApp/wixext/DifxAppExtensionData.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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.DifxApp -{ - using WixToolset.Data; - using WixToolset.Extensibility; - - public sealed class DifxAppExtensionData : BaseExtensionData - { - public override string DefaultCulture => "en-US"; - - public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) - { - symbolDefinition = DifxAppSymbolDefinitions.ByName(name); - return symbolDefinition != null; - } - } -} diff --git a/src/ext/DifxApp/wixext/DifxAppExtensionFactory.cs b/src/ext/DifxApp/wixext/DifxAppExtensionFactory.cs deleted file mode 100644 index 3932685d2..000000000 --- a/src/ext/DifxApp/wixext/DifxAppExtensionFactory.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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.DifxApp -{ - using System; - using System.Collections.Generic; - using WixToolset.Extensibility; - - public class DifxAppExtensionFactory : BaseExtensionFactory - { - protected override IReadOnlyCollection ExtensionTypes => new[] - { - typeof(DifxAppCompiler), - typeof(DifxAppExtensionData), - typeof(DifxAppWindowsInstallerBackendBinderExtension), - }; - } -} diff --git a/src/ext/DifxApp/wixext/DifxAppTableDefinitions.cs b/src/ext/DifxApp/wixext/DifxAppTableDefinitions.cs deleted file mode 100644 index a6c26444d..000000000 --- a/src/ext/DifxApp/wixext/DifxAppTableDefinitions.cs +++ /dev/null @@ -1,26 +0,0 @@ -// 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.DifxApp -{ - using WixToolset.Data.WindowsInstaller; - - public static class DifxAppTableDefinitions - { - public static readonly TableDefinition MsiDriverPackages = new TableDefinition( - "MsiDriverPackages", - DifxAppSymbolDefinitions.MsiDriverPackages, - new[] - { - new ColumnDefinition("Component", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "Name of the component that represents the driver package", modularizeType: ColumnModularizeType.Column), - new ColumnDefinition("Flags", ColumnType.Number, 4, primaryKey: false, nullable: false, ColumnCategory.Unknown, minValue: 0, maxValue: 31, description: "Flags for installing and uninstalling driver packages"), - new ColumnDefinition("Sequence", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, description: "Order in which the driver packages are processed"), - }, - symbolIdIsPrimaryKey: false - ); - - public static readonly TableDefinition[] All = new[] - { - MsiDriverPackages, - }; - } -} diff --git a/src/ext/DifxApp/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs b/src/ext/DifxApp/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs deleted file mode 100644 index 41f01175a..000000000 --- a/src/ext/DifxApp/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs +++ /dev/null @@ -1,13 +0,0 @@ -// 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.DifxApp -{ - using System.Collections.Generic; - using WixToolset.Data.WindowsInstaller; - using WixToolset.Extensibility; - - public class DifxAppWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension - { - public override IReadOnlyCollection TableDefinitions => DifxAppTableDefinitions.All; - } -} diff --git a/src/ext/DifxApp/wixext/Symbols/DifxAppSymbolDefinitions.cs b/src/ext/DifxApp/wixext/Symbols/DifxAppSymbolDefinitions.cs deleted file mode 100644 index c1f9673ac..000000000 --- a/src/ext/DifxApp/wixext/Symbols/DifxAppSymbolDefinitions.cs +++ /dev/null @@ -1,37 +0,0 @@ -// 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.DifxApp -{ - using System; - using WixToolset.Data; - - public enum DifxAppSymbolDefinitionType - { - MsiDriverPackages, - } - - public static partial class DifxAppSymbolDefinitions - { - public static IntermediateSymbolDefinition ByName(string name) - { - if (!Enum.TryParse(name, out DifxAppSymbolDefinitionType type)) - { - return null; - } - - return ByType(type); - } - - public static IntermediateSymbolDefinition ByType(DifxAppSymbolDefinitionType type) - { - switch (type) - { - case DifxAppSymbolDefinitionType.MsiDriverPackages: - return DifxAppSymbolDefinitions.MsiDriverPackages; - - default: - throw new ArgumentOutOfRangeException(nameof(type)); - } - } - } -} diff --git a/src/ext/DifxApp/wixext/Symbols/MsiDriverPackagesSymbol.cs b/src/ext/DifxApp/wixext/Symbols/MsiDriverPackagesSymbol.cs deleted file mode 100644 index 2fd91bc84..000000000 --- a/src/ext/DifxApp/wixext/Symbols/MsiDriverPackagesSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.DifxApp -{ - using WixToolset.Data; - using WixToolset.DifxApp.Symbols; - - public static partial class DifxAppSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition MsiDriverPackages = new IntermediateSymbolDefinition( - DifxAppSymbolDefinitionType.MsiDriverPackages.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(MsiDriverPackagesSymbolFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MsiDriverPackagesSymbolFields.Flags), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(MsiDriverPackagesSymbolFields.Sequence), IntermediateFieldType.Number), - }, - typeof(MsiDriverPackagesSymbol)); - } -} - -namespace WixToolset.DifxApp.Symbols -{ - using WixToolset.Data; - - public enum MsiDriverPackagesSymbolFields - { - ComponentRef, - Flags, - Sequence, - } - - public class MsiDriverPackagesSymbol : IntermediateSymbol - { - public MsiDriverPackagesSymbol() : base(DifxAppSymbolDefinitions.MsiDriverPackages, null, null) - { - } - - public MsiDriverPackagesSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(DifxAppSymbolDefinitions.MsiDriverPackages, sourceLineNumber, id) - { - } - - public IntermediateField this[MsiDriverPackagesSymbolFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => this.Fields[(int)MsiDriverPackagesSymbolFields.ComponentRef].AsString(); - set => this.Set((int)MsiDriverPackagesSymbolFields.ComponentRef, value); - } - - public int Flags - { - get => this.Fields[(int)MsiDriverPackagesSymbolFields.Flags].AsNumber(); - set => this.Set((int)MsiDriverPackagesSymbolFields.Flags, value); - } - - public int? Sequence - { - get => this.Fields[(int)MsiDriverPackagesSymbolFields.Sequence].AsNullableNumber(); - set => this.Set((int)MsiDriverPackagesSymbolFields.Sequence, value); - } - } -} \ No newline at end of file diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj deleted file mode 100644 index 75ea81ecb..000000000 --- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - netstandard2.0 - WixToolset.DifxApp - WiX Toolset DIFxApp Extension - WiX Toolset DIFxApp Extension - embedded - - - - - - - - - - - - - - diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets deleted file mode 100644 index 87fce8f57..000000000 --- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/src/ext/DifxApp/wixlib/DifxAppExtension.wxs b/src/ext/DifxApp/wixlib/DifxAppExtension.wxs deleted file mode 100644 index 430c604bb..000000000 --- a/src/ext/DifxApp/wixlib/DifxAppExtension.wxs +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/ext/DifxApp/wixlib/difxapp.wixproj b/src/ext/DifxApp/wixlib/difxapp.wixproj deleted file mode 100644 index b32ceac54..000000000 --- a/src/ext/DifxApp/wixlib/difxapp.wixproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - difxapp_$(Platform) - Library - true - en-us - - - - - - diff --git a/src/ext/DifxApp/wixlib/x64/DIFxApp.dll b/src/ext/DifxApp/wixlib/x64/DIFxApp.dll deleted file mode 100644 index 69a44cc86..000000000 Binary files a/src/ext/DifxApp/wixlib/x64/DIFxApp.dll and /dev/null differ diff --git a/src/ext/DifxApp/wixlib/x64/DIFxAppA.dll b/src/ext/DifxApp/wixlib/x64/DIFxAppA.dll deleted file mode 100644 index 994580408..000000000 Binary files a/src/ext/DifxApp/wixlib/x64/DIFxAppA.dll and /dev/null differ diff --git a/src/ext/DifxApp/wixlib/x86/DIFxApp.dll b/src/ext/DifxApp/wixlib/x86/DIFxApp.dll deleted file mode 100644 index 678a9d95f..000000000 Binary files a/src/ext/DifxApp/wixlib/x86/DIFxApp.dll and /dev/null differ diff --git a/src/ext/DifxApp/wixlib/x86/DIFxAppA.dll b/src/ext/DifxApp/wixlib/x86/DIFxAppA.dll deleted file mode 100644 index 3ac0838d9..000000000 Binary files a/src/ext/DifxApp/wixlib/x86/DIFxAppA.dll and /dev/null differ diff --git a/src/ext/ext.cmd b/src/ext/ext.cmd index 0429f5426..8575b81e0 100644 --- a/src/ext/ext.cmd +++ b/src/ext/ext.cmd @@ -28,9 +28,6 @@ call ComPlus\complus.cmd %_C% || exit /b :: Dependency call Dependency\dependency.cmd %_C% || exit /b -:: DifxApp -call DifxApp\difxapp.cmd %_C% || exit /b - :: DirectX call DirectX\directx.cmd %_C% || exit /b