From 1bb96e61fd59d153ba1f3672e0834fa23c786b61 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 28 Jun 2019 18:05:49 -0700
Subject: [PATCH 1/2] Ensure non-final builds have unique package GUIDs

This affects product code and upgrade code
---
 src/Installers/Windows/Wix.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index ce8b89829902..2084c3c8d930 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -22,6 +22,8 @@
 
   <PropertyGroup>
     <GuidInputs>$(Version);$(Platform)</GuidInputs>
+    <!-- Ensure for non-final builds the GUID will be different for each build -->
+    <GuidInputs Condition="'$(DotNetFinalVersionKind)' != 'release' AND '$(DotNetFinalVersionKind)' != 'prerelease'">$(GuidInputs);(VersionSuffix)</GuidInputs>
   </PropertyGroup>
 
   <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />

From d142db15fcb8c18d5b5bfcd0492db55613ebfe14 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 28 Jun 2019 19:28:24 -0700
Subject: [PATCH 2/2] Update

---
 src/Installers/Windows/Wix.targets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index 2084c3c8d930..8970b743418a 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -21,9 +21,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <GuidInputs>$(Version);$(Platform)</GuidInputs>
-    <!-- Ensure for non-final builds the GUID will be different for each build -->
-    <GuidInputs Condition="'$(DotNetFinalVersionKind)' != 'release' AND '$(DotNetFinalVersionKind)' != 'prerelease'">$(GuidInputs);(VersionSuffix)</GuidInputs>
+    <GuidInputs>$(Version);$(Platform);(VersionSuffix)</GuidInputs>
   </PropertyGroup>
 
   <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />