From 6c59d4187748b66f027f07858ebab1c99a926d0f Mon Sep 17 00:00:00 2001
From: Xymanek <xymanek@outlook.com>
Date: Sun, 27 Oct 2019 23:08:38 +0200
Subject: [PATCH 1/2] Added app.manifest

---
 xcom2-launcher/xcom2-launcher/app.manifest    | 76 +++++++++++++++++++
 .../xcom2-launcher/xcom2-launcher.csproj      |  9 ++-
 2 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 xcom2-launcher/xcom2-launcher/app.manifest

diff --git a/xcom2-launcher/xcom2-launcher/app.manifest b/xcom2-launcher/xcom2-launcher/app.manifest
new file mode 100644
index 0000000..0da1f6d
--- /dev/null
+++ b/xcom2-launcher/xcom2-launcher/app.manifest
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the 
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
diff --git a/xcom2-launcher/xcom2-launcher/xcom2-launcher.csproj b/xcom2-launcher/xcom2-launcher/xcom2-launcher.csproj
index 45dc3f6..869e262 100644
--- a/xcom2-launcher/xcom2-launcher/xcom2-launcher.csproj
+++ b/xcom2-launcher/xcom2-launcher/xcom2-launcher.csproj
@@ -30,9 +30,7 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup>
-    <NoWin32Manifest>true</NoWin32Manifest>
-  </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <StartupObject>XCOM2Launcher.Program</StartupObject>
   </PropertyGroup>
@@ -72,6 +70,10 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="FastColoredTextBox, Version=2.16.24.0, Culture=neutral, PublicKeyToken=fb8aa12b994ef61b, processorArchitecture=MSIL">
       <HintPath>..\packages\FCTB.2.16.24\lib\FastColoredTextBox.dll</HintPath>
@@ -279,6 +281,7 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="app.manifest" />
     <None Include="GitVersionConfig.yaml" />
     <None Include="log4net.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

From 9b461f16b7e568ed79a0e34ce43c2b2c641800bb Mon Sep 17 00:00:00 2001
From: Xymanek <xymanek@outlook.com>
Date: Sun, 27 Oct 2019 23:20:13 +0200
Subject: [PATCH 2/2] DPI support

---
 xcom2-launcher/xcom2-launcher/app.config   | 3 +++
 xcom2-launcher/xcom2-launcher/app.manifest | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xcom2-launcher/xcom2-launcher/app.config b/xcom2-launcher/xcom2-launcher/app.config
index 7eb310d..4659242 100644
--- a/xcom2-launcher/xcom2-launcher/app.config
+++ b/xcom2-launcher/xcom2-launcher/app.config
@@ -14,4 +14,7 @@
       <probing privatePath="lib;libs" xmlns="" />
     </assemblyBinding>
   </runtime>
+  <System.Windows.Forms.ApplicationConfigurationSection>
+    <add key="DpiAwareness" value="PerMonitorV2" />
+  </System.Windows.Forms.ApplicationConfigurationSection>
 </configuration>
diff --git a/xcom2-launcher/xcom2-launcher/app.manifest b/xcom2-launcher/xcom2-launcher/app.manifest
index 0da1f6d..d9bbc1e 100644
--- a/xcom2-launcher/xcom2-launcher/app.manifest
+++ b/xcom2-launcher/xcom2-launcher/app.manifest
@@ -40,7 +40,7 @@
       <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
 
       <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
     </application>
   </compatibility>