From 54c2fbb3f1687ad4c2bfad957b79bbcace8e06b8 Mon Sep 17 00:00:00 2001
From: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
Date: Thu, 24 Aug 2023 00:02:17 +0100
Subject: [PATCH] Manifest updates:

- Removed target to add manifest using mt.exe. The manifest is already in the project and embedded in the executable after the build.
- Removed Windows Vista and Windows 8 as .NET Framework 4.8 is not installable there.

Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
---
 AddManifest.targets      | 9 ---------
 XenAdmin/XenAdmin.csproj | 1 -
 XenAdmin/app.manifest    | 7 +------
 xe/Xe.csproj             | 1 -
 4 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 AddManifest.targets

diff --git a/AddManifest.targets b/AddManifest.targets
deleted file mode 100644
index b8a85d6b6..000000000
--- a/AddManifest.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <!-- Path to the Windows Kits 10 folder -->
-    <WinKits10Path>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot10', null, RegistryView.Registry32, RegistryView.Default))</WinKits10Path>
-
-    <PostBuildEvent Condition="'$(Configuration)' == 'Release'">"$(WinKits10Path)bin\10.0.18362.0\x64\mt.exe" -verbose -manifest "$(ProjectDir)app.manifest" -outputresource:"$(TargetDir)$(TargetFileName)";#1</PostBuildEvent>
-  </PropertyGroup>
-</Project>
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index cce1335f0..80686813f 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -6796,7 +6796,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)AddManifest.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/XenAdmin/app.manifest b/XenAdmin/app.manifest
index e24813243..f7757a021 100644
--- a/XenAdmin/app.manifest
+++ b/XenAdmin/app.manifest
@@ -11,19 +11,14 @@
   </trustInfo>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- 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 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
     </application>
diff --git a/xe/Xe.csproj b/xe/Xe.csproj
index 4897aca9d..af0a681bb 100755
--- a/xe/Xe.csproj
+++ b/xe/Xe.csproj
@@ -83,7 +83,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)AddManifest.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">