From 72729a5240b18e6fcb647d1113fddb2f1aeb61aa Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 26 Feb 2016 16:19:24 -0800
Subject: [PATCH] Enable VSIX rezipping on VS 2015 and disable HPC for good.

---
 Build/Common.Build.VSSDK.targets | 2 +-
 Python/products.settings         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Build/Common.Build.VSSDK.targets b/Build/Common.Build.VSSDK.targets
index d630e3189c..44439647cf 100644
--- a/Build/Common.Build.VSSDK.targets
+++ b/Build/Common.Build.VSSDK.targets
@@ -201,7 +201,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="_RezipSingleVSIX_Dev12" DependsOnTargets="_GetRezipVSIXFiles" BeforeTargets="Build" Inputs="@(VSIX)" Outputs="%(VSIX.Container)" Condition="'$(VSTarget)' == '12.0'">
+  <Target Name="_RezipSingleVSIX_Dev12_14" DependsOnTargets="_GetRezipVSIXFiles" BeforeTargets="Build" Inputs="@(VSIX)" Outputs="%(VSIX.Container)" Condition="'$(VSTarget)' == '12.0' or '$(VSTarget)' == '14.0'">
     <Message Text="Rezipping %(VSIX.SourceDir)" Importance="high" />
     
     <ItemGroup>
diff --git a/Python/products.settings b/Python/products.settings
index 8955942567..001ace001b 100644
--- a/Python/products.settings
+++ b/Python/products.settings
@@ -7,7 +7,7 @@
     <!-- Include HPC by default, and force to ReleaseBuild if dependencies are missing -->
     <IncludeHpc Condition="'$(IncludeHpc)' == '' and $(VSMajorVersion) >= 14">false</IncludeHpc>
     <IncludeHpc Condition="'$(IncludeHpc)' == ''">true</IncludeHpc>
-    <IncludeHpc Condition="'$(registry:HKEY_CLASSES_ROOT\CLSID\{3C376723-5FF9-4C55-89BB-E9E7A31577E1})' == ''">$(ReleaseBuild)</IncludeHpc>
+    <!--<IncludeHpc Condition="'$(registry:HKEY_CLASSES_ROOT\CLSID\{3C376723-5FF9-4C55-89BB-E9E7A31577E1})' == ''">$(ReleaseBuild)</IncludeHpc>-->
     
     <!-- Include test adapter by default, and force to false for VS 2010 -->
     <IncludeTestAdapter Condition="'$(IncludeTestAdapter)' == ''">true</IncludeTestAdapter>