Add a Manifest adding Supportinfo to .exe

env-windows.yml

@@ -2,12 +2,12 @@ name: vpn
 channels:
   - conda-forge
 dependencies:
-  - clang=16.0.6
-  - clang-tools=16.0.6
-  - clangxx=16.0.6
-  - llvm=16.0.6
-  - llvmdev=16.0.6
-  - lld=16.0.6
+  - clang=19.1.7
+  - clang-tools=19.1.7
+  - clangxx=19.1.7
+  - llvm=19.1.7
+  - llvmdev=19.1.7
+  - lld=19.1.7
   - python=3.9
   - nodejs=18.16.*
   - pip=22.3.1

scripts/windows/conda-setup-xwin-sdk.ps1

@@ -30,7 +30,7 @@ $env:PATH ="$conda_folder\xwin-$X_WIN_VERSION-x86_64-pc-windows-msvc;$env:PATH"
 xwin --accept-license --manifest-version 16 splat --include-debug-symbols --include-debug-libs --use-winsysroot-style --preserve-ms-arch-notation --disable-symlinks --output "$conda_folder\xwin"
 
 Write-Output("Downloading Microsoft.VisualStudio.Component.VC.Redist.MSM")
-python "$PSScriptRoot\fetch-vsix-package.py" --manifest-version 16 --output "$conda_folder\xwin" Microsoft.VisualStudio.Component.VC.Redist.MSM
+python "$PSScriptRoot\fetch-vsix-package.py" --manifest-version 17 --output "$conda_folder\xwin" Microsoft.VisualStudio.Component.VC.Redist.MSM
 
 Write-Output("Cleaning Up")
 Remove-Item "$conda_folder\xwin-$X_WIN_VERSION-x86_64-pc-windows-msvc" -ErrorAction SilentlyContinue -Force -Recurse

src/cmake/msvc.cmake

@@ -3,12 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang$")
-    # We're using clang in msvc mode so we can only use 
-    # msvc style compile flags
-    # We need to disable /Manifest tool as clang's implementation
-    # of mt.exe (llvm-mt) is not a complete drop in soloution. 
-    set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
+
 else()
     # /MP -> Compile Files Paraell
     # /Zc:preprocessor -> Enable Modern Macros, needed for settingsholder

src/cmake/windows.cmake

@@ -15,6 +15,7 @@ set_target_properties(mozillavpn PROPERTIES
     VERSION ${CMAKE_PROJECT_VERSION}
     WIN32_EXECUTABLE ON
 )
+target_sources(mozillavpn PRIVATE  ${CMAKE_SOURCE_DIR}/windows/vpn.manifest)
 
 # When used with MSVC, we find that RelWithDebInfo produces rather suboptimal
 # compiler flags. If we want to generate debugging symbols, then we should

windows/vpn.manifest

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"
+          xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+      <application>
+         <!-- Max Tested: Windows 11 -->
+         <maxversiontested Id="10.0.22000.1"/>
+         <!-- Supports Windows 10 and Windows 11 -->
+         <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+      </application>
+   </compatibility>
+
+  <asmv3:application>
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+      <dpiAwareness>PerMonitorV2</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+
+</assembly>