diff options
Diffstat (limited to '')
-rw-r--r-- | src/WixToolset.Converters/WixConverter.cs | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs index 3ea0c3dc..c9ebdfd3 100644 --- a/src/WixToolset.Converters/WixConverter.cs +++ b/src/WixToolset.Converters/WixConverter.cs | |||
@@ -39,6 +39,7 @@ namespace WixToolset.Converters | |||
39 | private static readonly XName AdvertiseExecuteSequenceElementName = WixNamespace + "AdvertiseExecuteSequence"; | 39 | private static readonly XName AdvertiseExecuteSequenceElementName = WixNamespace + "AdvertiseExecuteSequence"; |
40 | private static readonly XName InstallExecuteSequenceElementName = WixNamespace + "InstallExecuteSequence"; | 40 | private static readonly XName InstallExecuteSequenceElementName = WixNamespace + "InstallExecuteSequence"; |
41 | private static readonly XName InstallUISequenceSequenceElementName = WixNamespace + "InstallUISequence"; | 41 | private static readonly XName InstallUISequenceSequenceElementName = WixNamespace + "InstallUISequence"; |
42 | private static readonly XName BootstrapperApplicationElementName = WixNamespace + "BootstrapperApplication"; | ||
42 | private static readonly XName EmbeddedChainerElementName = WixNamespace + "EmbeddedChainer"; | 43 | private static readonly XName EmbeddedChainerElementName = WixNamespace + "EmbeddedChainer"; |
43 | private static readonly XName ColumnElementName = WixNamespace + "Column"; | 44 | private static readonly XName ColumnElementName = WixNamespace + "Column"; |
44 | private static readonly XName ComponentElementName = WixNamespace + "Component"; | 45 | private static readonly XName ComponentElementName = WixNamespace + "Component"; |
@@ -130,6 +131,7 @@ namespace WixToolset.Converters | |||
130 | { WixConverter.AdvertiseExecuteSequenceElementName, this.ConvertSequenceElement }, | 131 | { WixConverter.AdvertiseExecuteSequenceElementName, this.ConvertSequenceElement }, |
131 | { WixConverter.InstallUISequenceSequenceElementName, this.ConvertSequenceElement }, | 132 | { WixConverter.InstallUISequenceSequenceElementName, this.ConvertSequenceElement }, |
132 | { WixConverter.InstallExecuteSequenceElementName, this.ConvertSequenceElement }, | 133 | { WixConverter.InstallExecuteSequenceElementName, this.ConvertSequenceElement }, |
134 | { WixConverter.BootstrapperApplicationElementName, this.ConvertBootstrapperApplicationElement }, | ||
133 | { WixConverter.ColumnElementName, this.ConvertColumnElement }, | 135 | { WixConverter.ColumnElementName, this.ConvertColumnElement }, |
134 | { WixConverter.CustomTableElementName, this.ConvertCustomTableElement }, | 136 | { WixConverter.CustomTableElementName, this.ConvertCustomTableElement }, |
135 | { WixConverter.ControlElementName, this.ConvertControlElement }, | 137 | { WixConverter.ControlElementName, this.ConvertControlElement }, |
@@ -442,6 +444,15 @@ namespace WixToolset.Converters | |||
442 | } | 444 | } |
443 | } | 445 | } |
444 | 446 | ||
447 | private void ConvertBootstrapperApplicationElement(XElement element) | ||
448 | { | ||
449 | if (this.SourceVersion < 4 && null == element.Attribute("DpiAwareness") && | ||
450 | this.OnError(ConverterTestType.AssignBootstrapperApplicationDpiAwareness, element, "The BootstrapperApplication DpiAwareness attribute is being set to 'unaware' to ensure it remains the same as the v3 default")) | ||
451 | { | ||
452 | element.Add(new XAttribute("DpiAwareness", "unaware")); | ||
453 | } | ||
454 | } | ||
455 | |||
445 | private void ConvertColumnElement(XElement element) | 456 | private void ConvertColumnElement(XElement element) |
446 | { | 457 | { |
447 | var category = element.Attribute("Category"); | 458 | var category = element.Attribute("Category"); |
@@ -1212,7 +1223,12 @@ namespace WixToolset.Converters | |||
1212 | /// <summary> | 1223 | /// <summary> |
1213 | /// The Condition='1' attribute is unnecessary on Publish elements. | 1224 | /// The Condition='1' attribute is unnecessary on Publish elements. |
1214 | /// </summary> | 1225 | /// </summary> |
1215 | PublishConditionOneUnnecessary | 1226 | PublishConditionOneUnnecessary, |
1227 | |||
1228 | /// <summary> | ||
1229 | /// DpiAwareness is new and is defaulted to 'perMonitorV2' which is a change in behavior. | ||
1230 | /// </summary> | ||
1231 | AssignBootstrapperApplicationDpiAwareness, | ||
1216 | } | 1232 | } |
1217 | } | 1233 | } |
1218 | } | 1234 | } |