From ad80d6dc10f9bd6cb6a084857a8fb546cc55e756 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 19 Jul 2020 14:18:58 +1000
Subject: Don't embed application manifest for burn.exe since Core will embed
 it.

---
 src/stub/stub.manifest | 18 ------------------
 src/stub/stub.vcxproj  |  4 +---
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 src/stub/stub.manifest

(limited to 'src')

diff --git a/src/stub/stub.manifest b/src/stub/stub.manifest
deleted file mode 100644
index d5767cdb..00000000
--- a/src/stub/stub.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
- <assemblyIdentity name="setup.exe" version="1.0.0.0" processorArchitecture="x86" type="win32"/>
- <description>WiX Toolset Bootstrapper</description>
- <asmv3:application><asmv3:windowsSettings><ws:dpiAware xmlns:ws="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</ws:dpiAware></asmv3:windowsSettings></asmv3:application>
- <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /></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>
-</assembly>
diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj
index e6083aa5..e0e6c8c6 100644
--- a/src/stub/stub.vcxproj
+++ b/src/stub/stub.vcxproj
@@ -33,6 +33,7 @@
     <TargetName>burn</TargetName>
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
+    <GenerateManifest>false</GenerateManifest>
     <Description>Native component of WixToolset.Burn</Description>
     <!-- NBGV properties -->
     <AssemblyLanguage>1033</AssemblyLanguage>
@@ -78,9 +79,6 @@
       <RemoveUnreferencedCodeData>false</RemoveUnreferencedCodeData>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="stub.manifest" />
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="stub.rc" />
   </ItemGroup>
-- 
cgit v1.2.3-55-g6feb