aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Converters/WixConverter.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Converters/WixConverter.cs')
-rw-r--r--src/WixToolset.Converters/WixConverter.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index a89d44ce..89d33598 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -63,7 +63,9 @@ namespace WixToolset.Converters
63 private static readonly XName ShortcutPropertyElementName = WixNamespace + "ShortcutProperty"; 63 private static readonly XName ShortcutPropertyElementName = WixNamespace + "ShortcutProperty";
64 private static readonly XName TextElementName = WixNamespace + "Text"; 64 private static readonly XName TextElementName = WixNamespace + "Text";
65 private static readonly XName UITextElementName = WixNamespace + "UIText"; 65 private static readonly XName UITextElementName = WixNamespace + "UIText";
66 private static readonly XName UtilCloseApplicationElementName = WixUtilNamespace + "CloseApplication";
66 private static readonly XName UtilPermissionExElementName = WixUtilNamespace + "PermissionEx"; 67 private static readonly XName UtilPermissionExElementName = WixUtilNamespace + "PermissionEx";
68 private static readonly XName UtilXmlConfigElementName = WixUtilNamespace + "XmlConfig";
67 private static readonly XName CustomActionElementName = WixNamespace + "CustomAction"; 69 private static readonly XName CustomActionElementName = WixNamespace + "CustomAction";
68 private static readonly XName PropertyElementName = WixNamespace + "Property"; 70 private static readonly XName PropertyElementName = WixNamespace + "Property";
69 private static readonly XName WixElementWithoutNamespaceName = XNamespace.None + "Wix"; 71 private static readonly XName WixElementWithoutNamespaceName = XNamespace.None + "Wix";
@@ -156,7 +158,9 @@ namespace WixToolset.Converters
156 { WixConverter.ShortcutPropertyElementName, this.ConvertShortcutPropertyElement }, 158 { WixConverter.ShortcutPropertyElementName, this.ConvertShortcutPropertyElement },
157 { WixConverter.TextElementName, this.ConvertTextElement }, 159 { WixConverter.TextElementName, this.ConvertTextElement },
158 { WixConverter.UITextElementName, this.ConvertUITextElement }, 160 { WixConverter.UITextElementName, this.ConvertUITextElement },
161 { WixConverter.UtilCloseApplicationElementName, this.ConvertUtilCloseApplicationElementName },
159 { WixConverter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement }, 162 { WixConverter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement },
163 { WixConverter.UtilXmlConfigElementName, this.ConvertUtilXmlConfigElement },
160 { WixConverter.PropertyElementName, this.ConvertPropertyElement }, 164 { WixConverter.PropertyElementName, this.ConvertPropertyElement },
161 { WixConverter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace }, 165 { WixConverter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
162 { WixConverter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace }, 166 { WixConverter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
@@ -692,6 +696,8 @@ namespace WixToolset.Converters
692 this.ConvertInnerTextToAttribute(xProperty, "Value"); 696 this.ConvertInnerTextToAttribute(xProperty, "Value");
693 } 697 }
694 698
699 private void ConvertUtilCloseApplicationElementName(XElement element) => this.ConvertInnerTextToAttribute(element, "Condition");
700
695 private void ConvertUtilPermissionExElement(XElement element) 701 private void ConvertUtilPermissionExElement(XElement element)
696 { 702 {
697 if (this.SourceVersion < 4 && null == element.Attribute("Inheritable")) 703 if (this.SourceVersion < 4 && null == element.Attribute("Inheritable"))
@@ -707,6 +713,8 @@ namespace WixToolset.Converters
707 } 713 }
708 } 714 }
709 715
716 private void ConvertUtilXmlConfigElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Value");
717
710 /// <summary> 718 /// <summary>
711 /// Converts a Wix element. 719 /// Converts a Wix element.
712 /// </summary> 720 /// </summary>