aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-07-19 14:18:58 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-07-19 19:16:11 +1000
commitad80d6dc10f9bd6cb6a084857a8fb546cc55e756 (patch)
tree87dbae82c37c6e1517829714f695b8764ca6e5cf
parent92f54db2406108864742bd1dd1a828171b1542bc (diff)
downloadwix-ad80d6dc10f9bd6cb6a084857a8fb546cc55e756.tar.gz
wix-ad80d6dc10f9bd6cb6a084857a8fb546cc55e756.tar.bz2
wix-ad80d6dc10f9bd6cb6a084857a8fb546cc55e756.zip
Don't embed application manifest for burn.exe since Core will embed it.
-rw-r--r--src/stub/stub.manifest18
-rw-r--r--src/stub/stub.vcxproj4
2 files changed, 1 insertions, 21 deletions
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 @@
1<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2<!-- 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. -->
3
4
5<assembly xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0">
6 <assemblyIdentity name="setup.exe" version="1.0.0.0" processorArchitecture="x86" type="win32"/>
7 <description>WiX Toolset Bootstrapper</description>
8 <asmv3:application><asmv3:windowsSettings><ws:dpiAware xmlns:ws="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</ws:dpiAware></asmv3:windowsSettings></asmv3:application>
9 <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency>
10 <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application>
11 <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
12 <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
13 <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
14 <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
15 <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
16 </application></compatibility>
17 <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>
18</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 @@
33 <TargetName>burn</TargetName> 33 <TargetName>burn</TargetName>
34 <PlatformToolset>v142</PlatformToolset> 34 <PlatformToolset>v142</PlatformToolset>
35 <CharacterSet>Unicode</CharacterSet> 35 <CharacterSet>Unicode</CharacterSet>
36 <GenerateManifest>false</GenerateManifest>
36 <Description>Native component of WixToolset.Burn</Description> 37 <Description>Native component of WixToolset.Burn</Description>
37 <!-- NBGV properties --> 38 <!-- NBGV properties -->
38 <AssemblyLanguage>1033</AssemblyLanguage> 39 <AssemblyLanguage>1033</AssemblyLanguage>
@@ -79,9 +80,6 @@
79 </ClCompile> 80 </ClCompile>
80 </ItemGroup> 81 </ItemGroup>
81 <ItemGroup> 82 <ItemGroup>
82 <Manifest Include="stub.manifest" />
83 </ItemGroup>
84 <ItemGroup>
85 <ResourceCompile Include="stub.rc" /> 83 <ResourceCompile Include="stub.rc" />
86 </ItemGroup> 84 </ItemGroup>
87 85