Remove embedded manifest

dotnet · Dec 1, 2017 · 3b40582 · 3b40582
1 parent 24f027b
commit 3b40582
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/SignService/SignService.csproj b/src/SignService/SignService.csproj
@@ -3,17 +3,17 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <WinSdkBinDir Condition="'$(WinSdkBinDir)' == ''">$(MSBuildProgramFiles32)\Windows Kits\10\bin\10.0.16299.0\x64\</WinSdkBinDir>
+    <WinSdkBinDir Condition="'$(WinSdkBinDir)' == ''">$(MSBuildProgramFiles32)\Windows Kits\10\bin\x64\</WinSdkBinDir>
     <NetSdkBinDir Condition="'$(NetSdkBinDir)' == ''">$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7 Tools\</NetSdkBinDir>
     <DockerComposeProjectPath>..\..\docker\docker-compose.dcproj</DockerComposeProjectPath>
     <UserSecretsId>9c2a9e27-e4ca-46ef-a555-2b557d723c4d</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <SdkFile Include="$(WinSdkBinDir)appxpackaging.dll" />
+    <!--<SdkFile Include="$(WinSdkBinDir)appxpackaging.dll" />
     <SdkFile Include="$(WinSdkBinDir)opcservices.dll" />
     <SdkFile Include="$(WinSdkBinDir)Microsoft.Windows.Build.Appx.AppxPackaging.dll.manifest" />
-    <SdkFile Include="$(WinSdkBinDir)Microsoft.Windows.Build.Appx.OpcServices.dll.manifest" />
+    <SdkFile Include="$(WinSdkBinDir)Microsoft.Windows.Build.Appx.OpcServices.dll.manifest" />-->
     <SdkFile Include="$(WinSdkBinDir)makeappx.exe" />
     <SdkFile Include="$(WinSdkBinDir)makepri.exe" />
 
@@ -40,6 +40,10 @@
 
   <Target Name="PrebuildScript" BeforeTargets="CoreBuild">
     <Copy SourceFiles="@(SdkFile)" DestinationFolder="tools\SDK" SkipUnchangedFiles="true" />
+    <PropertyGroup>
+      <MtCmd>"$(WinSdkBinDir)mt.exe" -nologo -manifest blank.manifest -outputresource:tools\SDK\makeappx.exe;#1</MtCmd>
+    </PropertyGroup>
+    <Exec Command="$(MtCmd)" WorkingDirectory="$(MSBuildThisFileDirectory)" />
   </Target>
 
   <ItemGroup>

diff --git a/src/SignService/blank.manifest b/src/SignService/blank.manifest
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<!-- Copyright (c) Microsoft Corporation -->
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <assemblyIdentity
+    version="5.1.0.0"
+    processorArchitecture="amd64"
+    name="MakeAppx"
+    type="win32"
+  />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>