From 041c1bffe7b4fab2e48df11b8c7adbea9f5cf17d Mon Sep 17 00:00:00 2001
From: William Kent <wjk@users.noreply.github.com>
Date: Thu, 22 Oct 2020 21:03:39 -0400
Subject: [PATCH 1/2] (Probably) fix AppX deployment

This will be verified after a followup commit.
---
 src/MSIExtract/MSIExtract.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/MSIExtract/MSIExtract.csproj b/src/MSIExtract/MSIExtract.csproj
index 713e894..0961d93 100644
--- a/src/MSIExtract/MSIExtract.csproj
+++ b/src/MSIExtract/MSIExtract.csproj
@@ -11,8 +11,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <ApplicationIcon>Setup.ico</ApplicationIcon>
     <NoWarn>CS8002;CA1303;SA1101;IDE0009;NU1701</NoWarn>
-
-    <UseCentennialDepsFileGeneration>false</UseCentennialDepsFileGeneration>
   </PropertyGroup>
 
   <ItemGroup>

From ab68b5a9567c65c168a6ac4278c7666e9f83437f Mon Sep 17 00:00:00 2001
From: William Kent <wjk@users.noreply.github.com>
Date: Thu, 22 Oct 2020 21:11:31 -0400
Subject: [PATCH 2/2] Do not repeatedly download the .NET runtime

---
 .../Directory.Build.targets                   | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/MSIExtract.AppxPackage/Directory.Build.targets b/src/MSIExtract.AppxPackage/Directory.Build.targets
index e027469..93b8859 100644
--- a/src/MSIExtract.AppxPackage/Directory.Build.targets
+++ b/src/MSIExtract.AppxPackage/Directory.Build.targets
@@ -8,21 +8,27 @@
     </ExtraContent>
   </ItemGroup>
 
-  <Target Name="DownloadNETRuntime" AfterTargets="BeforeBuild" Condition="'$(Configuration)' == 'Release'">
-    <PropertyGroup>
-      <BundledNETVersion>3.1.8</BundledNETVersion>
+  <PropertyGroup>
+    <BundledNETVersion>3.1.8</BundledNETVersion>
 
-      <BundledNETArch Condition="'$(Platform)' == 'x86'">x86</BundledNETArch>
-      <BundledNETArch Condition="'$(Platform)' == 'x64'">x64</BundledNETArch>
-      <BundledNETArch Condition="'$(Platform)' == 'ARM64'">arm64</BundledNETArch>
+    <BundledNETArch Condition="'$(Platform)' == 'x86'">x86</BundledNETArch>
+    <BundledNETArch Condition="'$(Platform)' == 'x64'">x64</BundledNETArch>
+    <BundledNETArch Condition="'$(Platform)' == 'ARM64'">arm64</BundledNETArch>
 
-      <BundledNETDirectory>$(RepoRootPath)obj\dotnet-runtimes\$(BundledNETVersion)-$(BundledNETArch)</BundledNETDirectory>
-    </PropertyGroup>
+    <BundledNETDirectory>$(RepoRootPath)obj\dotnet-runtimes\$(BundledNETVersion)-$(BundledNETArch)</BundledNETDirectory>
+  </PropertyGroup>
+
+  <Target Name="DownloadNETRuntime" Inputs="$(IntermediateOutputPath)dotnet-version.stamp" Outputs="$(IntermediateOutputPath)dotnet-download.stamp">
+    <WriteLinesToFile File="$(IntermediateOutputPath)dotnet-version.stamp" Lines="$(BundledNETVersion)|$(BundledNETArch)" WriteOnlyWhenDifferent="true" />
 
     <MakeDir Directories="$(BundledNETDirectory)" />
     <Exec Command="powershell -ExecutionPolicy Bypass -File $(RepoRootPath)tools\install-dotnet.ps1 -Version $(BundledNETVersion) -InstallDir . -Runtime dotnet -NoPath -Architecture $(BundledNETArch)" WorkingDirectory="$(BundledNETDirectory)" />
     <Exec Command="powershell -ExecutionPolicy Bypass -File $(RepoRootPath)tools\install-dotnet.ps1 -Version $(BundledNETVersion) -InstallDir . -Runtime windowsdesktop -NoPath -Architecture $(BundledNETArch)" WorkingDirectory="$(BundledNETDirectory)" />
 
+    <WriteLinesToFile File="$(IntermediateOutputPath)dotnet-download.stamp" Lines="$(BundledNETVersion)|$(BundledNETArch)" WriteOnlyWhenDifferent="true" />
+  </Target>
+
+  <Target Name="CopyNETRuntime" AfterTargets="BeforeBuild" DependsOnTargets="DownloadNETRuntime" Condition="'$(Configuration)' == 'Release'">
     <PropertyGroup>
       <_VFSDir Condition="'$(BundledNETArch)' == 'x64' or '$(BundledNETArch)' == 'arm64'">ProgramFilesX64</_VFSDir>
       <_VFSDir Condition="'$(BundledNETArch)' == 'x86'">ProgramFilesX86</_VFSDir>