diff options
author | Bob Arnson <bob@firegiant.com> | 2021-12-12 15:40:45 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2021-12-12 16:51:16 -0500 |
commit | e223ab393bdf04a9c3d0d2144b48a10d7b2650a2 (patch) | |
tree | a85cff6b765385cc469cb3a5ea478fe998d17228 | |
parent | ebe9e91768d9514e8dbd617aaa05366365a05cf7 (diff) | |
download | wix-e223ab393bdf04a9c3d0d2144b48a10d7b2650a2.tar.gz wix-e223ab393bdf04a9c3d0d2144b48a10d7b2650a2.tar.bz2 wix-e223ab393bdf04a9c3d0d2144b48a10d7b2650a2.zip |
Deprecate WixDifxAppExtension.
https://github.com/wixtoolset/issues/issues/6648
-rw-r--r-- | src/ext/DifxApp/test/WixToolsetTest.DifxApp/DifxAppExtensionFixture.cs | 5 | ||||
-rw-r--r-- | src/ext/DifxApp/wixext/DifxAppCompiler.cs | 4 |
2 files changed, 6 insertions, 3 deletions
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 | |||
29 | 29 | ||
30 | private static void Build(string[] args) | 30 | private static void Build(string[] args) |
31 | { | 31 | { |
32 | var result = WixRunner.Execute(args) | 32 | var result = WixRunner.Execute(warningsAsErrors: false, args).AssertSuccess(); |
33 | .AssertSuccess(); | 33 | |
34 | Assert.Single(result.Messages.Where(m => m.Id == (int)WixToolset.Data.WarningMessages.Ids.DeprecatedElement)); | ||
34 | } | 35 | } |
35 | } | 36 | } |
36 | } | 37 | } |
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 | |||
38 | { | 38 | { |
39 | case "Component": | 39 | case "Component": |
40 | var componentId = context["ComponentId"]; | 40 | var componentId = context["ComponentId"]; |
41 | var directoryId = context["DirectoryId"]; | ||
42 | var componentWin64 = Boolean.Parse(context["Win64"]); | 41 | var componentWin64 = Boolean.Parse(context["Win64"]); |
43 | 42 | ||
44 | switch (element.Name.LocalName) | 43 | switch (element.Name.LocalName) |
@@ -68,6 +67,9 @@ namespace WixToolset.DifxApp | |||
68 | int attributes = 0; | 67 | int attributes = 0; |
69 | var sequence = CompilerConstants.IntegerNotSet; | 68 | var sequence = CompilerConstants.IntegerNotSet; |
70 | 69 | ||
70 | // See https://github.com/wixtoolset/issues/issues/6648. DifxApp is deprecated so warn the user. | ||
71 | this.Messaging.Write(WarningMessages.DeprecatedElement(sourceLineNumbers, node.Name.LocalName)); | ||
72 | |||
71 | // check the number of times a Driver element has been nested under this Component element | 73 | // check the number of times a Driver element has been nested under this Component element |
72 | if (null != componentId) | 74 | if (null != componentId) |
73 | { | 75 | { |