3 files changed, 98 insertions, 9 deletions

diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
index f804a2d8..0355cdc6 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
@@ -107,6 +107,8 @@ namespace WixToolset.Core.Burn.Bundles
             const string asmv3Namespace = "urn:schemas-microsoft-com:asm.v3";
             const string compatv1Namespace = "urn:schemas-microsoft-com:compatibility.v1";
             const string ws2005Namespace = "http://schemas.microsoft.com/SMI/2005/WindowsSettings";
+            const string ws2016Namespace = "http://schemas.microsoft.com/SMI/2016/WindowsSettings";
+            const string ws2017Namespace = "http://schemas.microsoft.com/SMI/2017/WindowsSettings";
 
             var bundleFileName = Path.GetFileName(outputPath);
             var bundleAssemblyVersion = windowsAssemblyVersion.ToString();
@@ -181,13 +183,56 @@ namespace WixToolset.Core.Burn.Bundles
                 writer.WriteEndElement(); // </security>
                 writer.WriteEndElement(); // </trustInfo>
 
-                writer.WriteStartElement("application", asmv3Namespace);
-                writer.WriteStartElement("windowsSettings");
-                writer.WriteStartElement("dpiAware", ws2005Namespace);
-                writer.WriteString("true");
-                writer.WriteEndElement(); // </application>
-                writer.WriteEndElement(); // </windowSettings>
-                writer.WriteEndElement(); // </dpiAware>
+                if (bootstrapperApplicationSymbol.DpiAwareness != WixBootstrapperApplicationDpiAwarenessType.Unaware)
+                {
+                    string dpiAwareValue = null;
+                    string dpiAwarenessValue = null;
+                    string gdiScalingValue = null;
+
+                    switch(bootstrapperApplicationSymbol.DpiAwareness)
+                    {
+                        case WixBootstrapperApplicationDpiAwarenessType.GdiScaled:
+                            gdiScalingValue = "true";
+                            break;
+                        case WixBootstrapperApplicationDpiAwarenessType.PerMonitor:
+                            dpiAwareValue = "true/pm";
+                            break;
+                        case WixBootstrapperApplicationDpiAwarenessType.PerMonitorV2:
+                            dpiAwareValue = "true/pm";
+                            dpiAwarenessValue = "PerMonitorV2, PerMonitor";
+                            break;
+                        case WixBootstrapperApplicationDpiAwarenessType.System:
+                            dpiAwareValue = "true";
+                            break;
+                    }
+
+                    writer.WriteStartElement("application", asmv3Namespace);
+                    writer.WriteStartElement("windowsSettings");
+
+                    if (dpiAwareValue != null)
+                    {
+                        writer.WriteStartElement("dpiAware", ws2005Namespace);
+                        writer.WriteString(dpiAwareValue);
+                        writer.WriteEndElement();
+                    }
+
+                    if (dpiAwarenessValue != null)
+                    {
+                        writer.WriteStartElement("dpiAwareness", ws2016Namespace);
+                        writer.WriteString(dpiAwarenessValue);
+                        writer.WriteEndElement();
+                    }
+
+                    if (gdiScalingValue != null)
+                    {
+                        writer.WriteStartElement("gdiScaling", ws2017Namespace);
+                        writer.WriteString(gdiScalingValue);
+                        writer.WriteEndElement();
+                    }
+
+                    writer.WriteEndElement(); // </windowSettings>
+                    writer.WriteEndElement(); // </application>
+                }
 
                 writer.WriteEndDocument(); // </assembly>
                 writer.Close();
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 7cdb8ca0..d73db84d 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -649,6 +649,7 @@ namespace WixToolset.Core
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             Identifier previousId = null;
             var previousType = ComplexReferenceChildType.Unknown;
+            var dpiAwareness = WixBootstrapperApplicationDpiAwarenessType.PerMonitorV2;
 
             // The BootstrapperApplication element acts like a Payload element so delegate to the "Payload" attribute parsing code to parse and create a Payload entry.
             var id = this.ParsePayloadElementContent(node, ComplexReferenceParentType.Container, Compiler.BurnUXContainerId, previousType, previousId, false);
@@ -658,6 +659,40 @@ namespace WixToolset.Core
                 previousType = ComplexReferenceChildType.Payload;
             }
 
+            foreach (var attrib in node.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || CompilerCore.WixNamespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "DpiAwareness":
+                            var dpiAwarenessValue = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (dpiAwarenessValue)
+                            {
+                                case "gdiScaled":
+                                    dpiAwareness = WixBootstrapperApplicationDpiAwarenessType.GdiScaled;
+                                    break;
+                                case "perMonitor":
+                                    dpiAwareness = WixBootstrapperApplicationDpiAwarenessType.PerMonitor;
+                                    break;
+                                case "perMonitorV2":
+                                    dpiAwareness = WixBootstrapperApplicationDpiAwarenessType.PerMonitorV2;
+                                    break;
+                                case "system":
+                                    dpiAwareness = WixBootstrapperApplicationDpiAwarenessType.System;
+                                    break;
+                                case "unaware":
+                                    dpiAwareness = WixBootstrapperApplicationDpiAwarenessType.Unaware;
+                                    break;
+                                default:
+                                    this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "DpiAwareness", dpiAwarenessValue, "gdiScaled", "perMonitor", "perMonitorV2", "system", "unaware"));
+                                    break;
+                            }
+                            break;
+                    }
+                }
+            }
+
             foreach (var child in node.Elements())
             {
                 if (CompilerCore.WixNamespace == child.Name.Namespace)
@@ -702,7 +737,10 @@ namespace WixToolset.Core
 
                 if (null != id)
                 {
-                    this.Core.AddSymbol(new WixBootstrapperApplicationSymbol(sourceLineNumbers, id));
+                    this.Core.AddSymbol(new WixBootstrapperApplicationSymbol(sourceLineNumbers, id)
+                    {
+                        DpiAwareness = dpiAwareness,
+                    });
                 }
             }
         }
@@ -1325,6 +1363,12 @@ namespace WixToolset.Core
                     case "EnableSignatureVerification":
                         enableSignatureVerification = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                         break;
+                    case "DpiAwareness":
+                        if (node.Name.LocalName != "BootstrapperApplication")
+                        {
+                            this.Core.UnexpectedAttribute(node, attrib);
+                        }
+                        break;
                     default:
                         this.Core.UnexpectedAttribute(node, attrib);
                         break;
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 9c5ec6ec..5e1e5866 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -127,7 +127,7 @@ namespace WixToolsetTest.CoreIntegration
                     "<dependency><dependentAssembly><assemblyIdentity name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" type=\"win32\" /></dependentAssembly></dependency>" +
                     "<compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\"><application><supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" /><supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" /><supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" /><supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" /><supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" /></application></compatibility>" +
                     "<trustInfo xmlns=\"urn:schemas-microsoft-com:asm.v3\"><security><requestedPrivileges><requestedExecutionLevel level=\"asInvoker\" uiAccess=\"false\" /></requestedPrivileges></security></trustInfo>" +
-                    "<application xmlns=\"urn:schemas-microsoft-com:asm.v3\"><windowsSettings><dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true</dpiAware></windowsSettings></application>" +
+                    "<application xmlns=\"urn:schemas-microsoft-com:asm.v3\"><windowsSettings><dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true/pm</dpiAware><dpiAwareness xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">PerMonitorV2, PerMonitor</dpiAwareness></windowsSettings></application>" +
                     "</assembly>", actualManifestData);
             }
         }