Added new manifest setting to support downlevel versions

Modified the app.manifest files of projects so that they run as Per Monitor DPI aware on Win 10 Anniversary Updates and higher, and as System DPI aware on lower versions of Windows.
deakintsang · Aug 6, 2016 · 1619aef · 1619aef
1 parent b8a194e
commit 1619aef
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 16 deletions.
diff --git a/PerMonitorDPI/Developer Guide - Per Monitor DPI - WPF Preview.docx b/PerMonitorDPI/Developer Guide - Per Monitor DPI - WPF Preview.docx
diff --git a/PerMonitorDPI/FormattedTextExample/App.config b/PerMonitorDPI/FormattedTextExample/App.config
@@ -3,7 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-  <runtime>
-    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
-  </runtime>
 </configuration>
diff --git a/PerMonitorDPI/FormattedTextExample/app.manifest b/PerMonitorDPI/FormattedTextExample/app.manifest
@@ -52,7 +52,11 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <!-- The combination of below two tags have the following effect : 
+      1) Per-Monitor for >= RS1 (Windows 10 Anniversary Update)
+      2) System < RS1 -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>
 

diff --git a/PerMonitorDPI/ImageScaling/App.config b/PerMonitorDPI/ImageScaling/App.config
@@ -3,7 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-  <runtime>
-    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
-  </runtime>
 </configuration>
diff --git a/PerMonitorDPI/ImageScaling/app.manifest b/PerMonitorDPI/ImageScaling/app.manifest
@@ -52,7 +52,11 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <!-- The combination of below two tags have the following effect : 
+      1) Per-Monitor for >= RS1 (Windows 10 Anniversary Update)
+      2) System < RS1 -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>
 

diff --git a/PerMonitorDPI/TextFormatting/App.config b/PerMonitorDPI/TextFormatting/App.config
@@ -3,7 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-  <runtime>
-    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
-  </runtime>
 </configuration>
diff --git a/PerMonitorDPI/TextFormatting/app.manifest b/PerMonitorDPI/TextFormatting/app.manifest
@@ -52,7 +52,11 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <!-- The combination of below two tags have the following effect : 
+      1) Per-Monitor for >= RS1 (Windows 10 Anniversary Update)
+      2) System < RS1 -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>
 

diff --git a/PerMonitorDPI/WinFormsHost/App.config b/PerMonitorDPI/WinFormsHost/App.config
@@ -3,7 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
     </startup>
-  <runtime>
-    <AppContextSwitchOverrides value="Switch.System.Windows.DoNotScaleForDpiChanges=false"/>
-  </runtime>
 </configuration>
diff --git a/PerMonitorDPI/WinFormsHost/app.manifest b/PerMonitorDPI/WinFormsHost/app.manifest
@@ -52,7 +52,11 @@
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <!-- The combination of below two tags have the following effect : 
+      1) Per-Monitor for >= RS1 (Windows 10 Anniversary Update)
+      2) System < RS1 -->
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings"> PerMonitor</dpiAwareness>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
     </windowsSettings>
   </application>