Merge pull request #1121 from zooba/v2.2.3

Enable VSIX rezipping on VS 2015 and disable HPC for good.
microsoft · Feb 27, 2016 · 7286c42 · 7286c42
2 parents 2fc7280 + 72729a5
commit 7286c42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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>