From 3f25693b02ebad0ef410a713fed23afb8ae6c32f Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 8 Jul 2015 20:18:44 -0700
Subject: Issue #24585: Enables build-to-build upgrades that preserve settings.
 Rather than using Burn "Persisted" variables we now add registry keys for
 each added feature. These can be detected by the installer regardless of
 which version installed them, and we use this for Modify and Upgrade. In
 particular, Upgrades can't access the Persisted variables, but can find
 well-known registry keys. There are also some changes to the bootstrap app to
 properly handle upgrades. Finally, a few minor improvements to the Windows
 build to keep things tidier.

---
 Tools/msi/msi.props | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Tools/msi/msi.props')

diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props
index bd22345ec3..1d9f0f0df1 100644
--- a/Tools/msi/msi.props
+++ b/Tools/msi/msi.props
@@ -43,7 +43,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-        <IntermediateOutputPath>$(MSBuildThisFileDirectory)\obj\$(Configuration)_$(Platform)\$(OutputName)</IntermediateOutputPath>
+        <IntermediateOutputPath>$(PySourcePath)PCBuild\obj\$(Configuration)_$(Platform)_Setup\$(OutputName)</IntermediateOutputPath>
         <IntermediateOutputPath Condition="'$(OutputSuffix)' != ''">$(IntermediateOutputPath)_$(OutputSuffix)</IntermediateOutputPath>
         <OutputPath Condition="'$(OutputPath)' == ''">$(BuildPath)</OutputPath>
         <OutputPath Condition="!HasTrailingSlash($(OutputPath))">$(OutputPath)\</OutputPath>
@@ -71,6 +71,7 @@
             NextMajorVersionNumber=$(MajorVersionNumber).$([msbuild]::Add($(MinorVersionNumber), 1)).0.0;
             Bitness=$(Bitness);
             PyDebugExt=$(PyDebugExt);
+            OptionalFeatureName=$(OutputName);
         </DefineConstants>
         <DefineConstants Condition="'$(CRTRedist)' != ''">
             $(DefineConstants);CRTRedist=$(CRTRedist);
@@ -112,9 +113,6 @@
         <LinkerBindInputPaths Include="$(CRTRedist)" Condition="'$(CRTRedist)' != ''">
             <BindName>redist</BindName>
         </LinkerBindInputPaths>
-        <LinkerBindInputPaths Include="$(CRTRedist)\$(Platform)" Condition="'$(CRTRedist)' != ''">
-            <BindName>crt</BindName>
-        </LinkerBindInputPaths>
     </ItemGroup>
 
     <Target Name="_ValidateMsiProps" BeforeTargets="PrepareForBuild">
-- 
cgit v1.2.1