diff options
Diffstat (limited to 'src/WixToolset.Converters/Wix3Converter.cs')
-rw-r--r-- | src/WixToolset.Converters/Wix3Converter.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/WixToolset.Converters/Wix3Converter.cs b/src/WixToolset.Converters/Wix3Converter.cs index c23930b6..9fde7360 100644 --- a/src/WixToolset.Converters/Wix3Converter.cs +++ b/src/WixToolset.Converters/Wix3Converter.cs | |||
@@ -35,6 +35,7 @@ namespace WixToolset.Converters | |||
35 | private static readonly XName CustomActionElementName = WixNamespace + "CustomAction"; | 35 | private static readonly XName CustomActionElementName = WixNamespace + "CustomAction"; |
36 | private static readonly XName PropertyElementName = WixNamespace + "Property"; | 36 | private static readonly XName PropertyElementName = WixNamespace + "Property"; |
37 | private static readonly XName WixElementWithoutNamespaceName = XNamespace.None + "Wix"; | 37 | private static readonly XName WixElementWithoutNamespaceName = XNamespace.None + "Wix"; |
38 | private static readonly XName IncludeElementWithoutNamespaceName = XNamespace.None + "Include"; | ||
38 | 39 | ||
39 | private static readonly Dictionary<string, XNamespace> OldToNewNamespaceMapping = new Dictionary<string, XNamespace>() | 40 | private static readonly Dictionary<string, XNamespace> OldToNewNamespaceMapping = new Dictionary<string, XNamespace>() |
40 | { | 41 | { |
@@ -86,7 +87,8 @@ namespace WixToolset.Converters | |||
86 | { Wix3Converter.PayloadElementName, this.ConvertSuppressSignatureValidation }, | 87 | { Wix3Converter.PayloadElementName, this.ConvertSuppressSignatureValidation }, |
87 | { Wix3Converter.CustomActionElementName, this.ConvertCustomActionElement }, | 88 | { Wix3Converter.CustomActionElementName, this.ConvertCustomActionElement }, |
88 | { Wix3Converter.PropertyElementName, this.ConvertPropertyElement }, | 89 | { Wix3Converter.PropertyElementName, this.ConvertPropertyElement }, |
89 | { Wix3Converter.WixElementWithoutNamespaceName, this.ConvertWixElementWithoutNamespace }, | 90 | { Wix3Converter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace }, |
91 | { Wix3Converter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace }, | ||
90 | }; | 92 | }; |
91 | 93 | ||
92 | this.Messaging = messaging; | 94 | this.Messaging = messaging; |
@@ -399,7 +401,7 @@ namespace WixToolset.Converters | |||
399 | /// </summary> | 401 | /// </summary> |
400 | /// <param name="element">The Wix element to convert.</param> | 402 | /// <param name="element">The Wix element to convert.</param> |
401 | /// <returns>The converted element.</returns> | 403 | /// <returns>The converted element.</returns> |
402 | private void ConvertWixElementWithoutNamespace(XElement element) | 404 | private void ConvertElementWithoutNamespace(XElement element) |
403 | { | 405 | { |
404 | if (this.OnError(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing. It must be present with a value of '{0}'.", WixNamespace.NamespaceName)) | 406 | if (this.OnError(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing. It must be present with a value of '{0}'.", WixNamespace.NamespaceName)) |
405 | { | 407 | { |