From e223ab393bdf04a9c3d0d2144b48a10d7b2650a2 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 12 Dec 2021 15:40:45 -0500 Subject: Deprecate WixDifxAppExtension. https://github.com/wixtoolset/issues/issues/6648 --- .../DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs | 5 +++-- src/ext/DifxApp/wixext/DifxAppCompiler.cs | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/ext') diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs index f5166453..edb4f889 100644 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs +++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs @@ -29,8 +29,9 @@ namespace WixToolsetTest.DifxApp private static void Build(string[] args) { - var result = WixRunner.Execute(args) - .AssertSuccess(); + var result = WixRunner.Execute(warningsAsErrors: false, args).AssertSuccess(); + + Assert.Single(result.Messages.Where(m => m.Id == (int)WixToolset.Data.WarningMessages.Ids.DeprecatedElement)); } } } diff --git a/src/ext/DifxApp/wixext/DifxAppCompiler.cs b/src/ext/DifxApp/wixext/DifxAppCompiler.cs index e056988f..7d000f67 100644 --- a/src/ext/DifxApp/wixext/DifxAppCompiler.cs +++ b/src/ext/DifxApp/wixext/DifxAppCompiler.cs @@ -38,7 +38,6 @@ namespace WixToolset.DifxApp { case "Component": var componentId = context["ComponentId"]; - var directoryId = context["DirectoryId"]; var componentWin64 = Boolean.Parse(context["Win64"]); switch (element.Name.LocalName) @@ -68,6 +67,9 @@ namespace WixToolset.DifxApp 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) { -- cgit v1.2.3-55-g6feb