Merge

clarartp · Jul 7, 2015 · c062749 · c062749
2 parents 4268dbd + cca1ac4
commit c062749
Show file tree

Hide file tree

Showing 37 changed files with 668 additions and 28 deletions.
diff --git a/Common/Product/SharedProject/ProvideDebugExceptionAttribute.cs b/Common/Product/SharedProject/ProvideDebugExceptionAttribute.cs
@@ -87,8 +87,15 @@ public override void Register(RegistrationAttribute.RegistrationContext context)
             key.SetValue("Code", _code);
             key.SetValue("State", (int)_state);
 
-            string name = _path.LastOrDefault() ?? "*";
-            engineKey.SetValue(name, (int)(_state & DkmValidFlags));
+            // Debug engine load time can be improved by writing the exception category default 
+            // stop setting and exceptions to the default settings at the exception category reg 
+            // key node. This improves debug engine load time by getting necessary exception stop
+            // settings for the entire category without having to enumerate the entire category 
+            // hive structure when loading the debug engine.
+            string name = _path.LastOrDefault();
+            if (name == null || !BreakByDefault) {
+                engineKey.SetValue(name ?? "*", (int)(_state & DkmValidFlags));
+            }
         }
 
         public override void Unregister(RegistrationAttribute.RegistrationContext context) {

diff --git a/Common/Setup/LaunchConditions.wxs b/Common/Setup/LaunchConditions.wxs
@@ -65,11 +65,15 @@
 
   <Fragment>
     <Property Id="VS_PRERELEASE" Secure="yes">
-      <?if "$(var.VSTargetVersion)"="12.0" ?>
-      <DirectorySearch Id="VSDevEnvFilePathSearch" Path="[VSINSTALLPATH]">
-        <FileSearch Id="VSDevEnvFileVersionSearch" Name="devenv.exe" MinVersion="12.0.0.0" MaxVersion="12.0.21004.0"/>
-      </DirectorySearch>
-      <?endif ?>
+      <RegistrySearch Id="VSPrereleaseInstallDir" Root="HKLM" Key="Software\Microsoft\VisualStudio\$(var.VSTargetVersion)\Setup\VS" Name="ProductDir" Type="directory">
+        <DirectorySearch Id="VSPrereleaseInstallDir_Common7_IDE" Path="Common7\IDE" Depth="1">
+          <?if "$(var.VSTargetVersion)"="14.0" ?>
+          <FileSearch Id="VSPrerelease_Common7_IDE_msenv_dll" Name="msenv.dll" MinVersion="14.0.0.0" MaxVersion="14.0.23102.0"/>
+          <?elseif "$(var.VSTargetVersion)"="12.0" ?>
+          <FileSearch Id="VSPrerelease_Common7_IDE_msenv_dll" Name="msenv.dll" MinVersion="12.0.0.0" MaxVersion="12.0.21004.0"/>
+          <?endif ?>
+        </DirectorySearch>
+      </RegistrySearch>
     </Property>
   </Fragment>
 

diff --git a/Python/Prerequisites/DisableSkipVerification.reg b/Python/Prerequisites/DisableSkipVerification.reg
@@ -22,6 +22,7 @@ Windows Registry Editor Version 5.00
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Django,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList.Host,B03F5F7F11D50A3A]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ExpressInteractiveWorkaround,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Hpc,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ImportWizard,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.IronPython,B03F5F7F11D50A3A]
@@ -83,6 +84,7 @@ Windows Registry Editor Version 5.00
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.Django,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList.Host,B03F5F7F11D50A3A]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.ExpressInteractiveWorkaround,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.Hpc,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.ImportWizard,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.IronPython,B03F5F7F11D50A3A]

diff --git a/Python/Prerequisites/DisableSkipVerificationX86.reg b/Python/Prerequisites/DisableSkipVerificationX86.reg
@@ -22,6 +22,7 @@ Windows Registry Editor Version 5.00
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Django,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList.Host,B03F5F7F11D50A3A]
+[-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ExpressInteractiveWorkaround,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Hpc,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ImportWizard,B03F5F7F11D50A3A]
 [-HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.IronPython,B03F5F7F11D50A3A]

diff --git a/Python/Prerequisites/EnableSkipVerification.reg b/Python/Prerequisites/EnableSkipVerification.reg
@@ -22,6 +22,7 @@ Windows Registry Editor Version 5.00
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Django,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList.Host,B03F5F7F11D50A3A]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ExpressInteractiveWorkaround,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Hpc,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ImportWizard,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.IronPython,B03F5F7F11D50A3A]
@@ -83,6 +84,7 @@ Windows Registry Editor Version 5.00
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.Django,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList.Host,B03F5F7F11D50A3A]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.ExpressInteractiveWorkaround,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.Hpc,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.ImportWizard,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\StrongName\Verification\Microsoft.PythonTools.IronPython,B03F5F7F11D50A3A]

diff --git a/Python/Prerequisites/EnableSkipVerificationX86.reg b/Python/Prerequisites/EnableSkipVerificationX86.reg
@@ -22,6 +22,7 @@ Windows Registry Editor Version 5.00
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Django,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.EnvironmentsList.Host,B03F5F7F11D50A3A]
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ExpressInteractiveWorkaround,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.Hpc,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.ImportWizard,B03F5F7F11D50A3A]
 [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\StrongName\Verification\Microsoft.PythonTools.IronPython,B03F5F7F11D50A3A]

diff --git a/Python/Prerequisites/generate.py b/Python/Prerequisites/generate.py
@@ -28,6 +28,7 @@
     "Microsoft.PythonTools.Django",
     "Microsoft.PythonTools.EnvironmentsList",
     "Microsoft.PythonTools.EnvironmentsList.Host",
+    "Microsoft.PythonTools.ExpressInteractiveWorkaround",
     "Microsoft.PythonTools.Hpc",
     "Microsoft.PythonTools.ImportWizard",
     "Microsoft.PythonTools.IronPython",

diff --git a/Python/Product/Analysis/Analyzer/FunctionAnalysisUnit.cs b/Python/Product/Analysis/Analyzer/FunctionAnalysisUnit.cs
@@ -150,8 +150,15 @@ internal void ProcessFunctionDecorators(DDG ddg) {
                                 nextExpr = _decoratorCalls[d] = new CallExpression(d, new[] { new Arg(expr) });
                             }
                             expr = nextExpr;
-                            var decorated = decorator.Call(expr, this, new[] { types }, ExpressionEvaluator.EmptyNames);
-
+                            var decorated = AnalysisSet.Empty;
+                            foreach (var ns in decorator) {
+                                var fd = ns as FunctionInfo;
+                                if (fd != null && Scope.EnumerateTowardsGlobal.Any(s => s.AnalysisValue == fd)) {
+                                    continue;
+                                }
+                                decorated = decorated.Union(ns.Call(expr, this, new[] { types }, ExpressionEvaluator.EmptyNames));
+                            }
+
                             // If processing decorators, update the current
                             // function type. Otherwise, we are acting as if
                             // each decorator returns the function unmodified.

diff --git a/Python/Product/Analysis/Interpreter/IPythonInterpreterFactoryWithDatabase.cs b/Python/Product/Analysis/Interpreter/IPythonInterpreterFactoryWithDatabase.cs
@@ -85,8 +85,8 @@ bool IsCurrent {
 
     public interface IPythonInterpreterFactoryWithDatabase2 : IPythonInterpreterFactoryWithDatabase {
         /// <summary>
-        /// Returns a list of module names that are causing the database to
-        /// appear out of date.
+        /// Returns a list of module names that appear to have current entries
+        /// in the database.
         /// </summary>
         IEnumerable<string> GetUpToDateModules();
     }

diff --git a/Python/Product/AnalysisMemoryTester/AnalysisMemoryTester.csproj b/Python/Product/AnalysisMemoryTester/AnalysisMemoryTester.csproj
@@ -80,7 +80,17 @@
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
+  -->
   <Target Name="AfterBuild">
+    <MakeDir Directories="$(OutputPath)\CompletionDB" />
+
+    <ItemGroup>
+      <_CompletionDB Include="$(BuildRoot)Python\Product\Analyzer\CompletionDB\*.idb" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_CompletionDB)"
+          DestinationFolder="$(OutputPath)\CompletionDB"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="true" />
   </Target>
-  -->
 </Project>
diff --git a/Python/Product/EnvironmentsList/EnvironmentsList.csproj b/Python/Product/EnvironmentsList/EnvironmentsList.csproj
@@ -226,6 +226,7 @@
     <Compile Include="DBExtension.xaml.cs">
       <DependentUpon>DBExtension.xaml</DependentUpon>
     </Compile>
+    <Compile Include="IEnvironmentViewExtensionProvider.cs" />
     <Compile Include="Pep440Version.cs" />
     <Compile Include="PipExtension.xaml.cs">
       <DependentUpon>PipExtension.xaml</DependentUpon>

diff --git a/Python/Product/EnvironmentsList/IEnvironmentViewExtensionProvider.cs b/Python/Product/EnvironmentsList/IEnvironmentViewExtensionProvider.cs
@@ -0,0 +1,19 @@
+/* ****************************************************************************
+ *
+ * Copyright (c) Microsoft Corporation. 
+ *
+ * This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
+ * copy of the license can be found in the License.html file at the root of this distribution. If 
+ * you cannot locate the Apache License, Version 2.0, please send an email to 
+ * [email protected]. By using this source code in any fashion, you are agreeing to be bound 
+ * by the terms of the Apache License, Version 2.0.
+ *
+ * You must not remove this notice, or any other, from this software.
+ *
+ * ***************************************************************************/
+
+namespace Microsoft.PythonTools.EnvironmentsList {
+    public interface IEnvironmentViewExtensionProvider {
+        IEnvironmentViewExtension CreateExtension(EnvironmentView view);
+    }
+}
diff --git a/Python/Product/ExpressInteractiveWorkaround/ExpressInteractiveWorkaround.csproj b/Python/Product/ExpressInteractiveWorkaround/ExpressInteractiveWorkaround.csproj
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Choose>
+    <When Condition=" '$(VisualStudioVersion)'=='14.0'  Or '$(TargetVisualStudioVersion)'=='VS140' ">
+      <PropertyGroup>
+        <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+        <FileUpgradeFlags>
+        </FileUpgradeFlags>
+        <UpgradeBackupLocation>
+        </UpgradeBackupLocation>
+        <OldToolsVersion>4.0</OldToolsVersion>
+      </PropertyGroup>
+    </When>
+    <When Condition=" '$(VisualStudioVersion)'=='12.0'  Or '$(TargetVisualStudioVersion)'=='VS120' ">
+      <PropertyGroup>
+        <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+        <FileUpgradeFlags>
+        </FileUpgradeFlags>
+        <UpgradeBackupLocation>
+        </UpgradeBackupLocation>
+        <OldToolsVersion>4.0</OldToolsVersion>
+      </PropertyGroup>
+    </When>
+    <When Condition=" '$(VisualStudioVersion)'=='11.0'  Or '$(TargetVisualStudioVersion)'=='VS110' ">
+      <PropertyGroup>
+        <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+        <FileUpgradeFlags>
+        </FileUpgradeFlags>
+        <UpgradeBackupLocation>
+        </UpgradeBackupLocation>
+        <OldToolsVersion>4.0</OldToolsVersion>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Import Project="..\ProjectBefore.settings" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{A9E7F3E9-0CD5-491E-8DA0-325D7E70237C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.PythonTools</RootNamespace>
+    <AssemblyName>Microsoft.PythonTools.ExpressInteractiveWorkaround</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.Shell.$(VsTarget), Version=$(VSTarget).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ExpressInteractiveWorkaroundPackage.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <VSCTCompile Include="ExpressInteractiveWorkaround.vsct">
+      <ResourceName>Menus.ctmenu</ResourceName>
+      <SubType>Designer</SubType>
+    </VSCTCompile>
+  </ItemGroup>
+  <PropertyGroup>
+    <UseCodebase>true</UseCodebase>
+    <RegisterOutputPackage>true</RegisterOutputPackage>
+    <RegisterWithCodebase>true</RegisterWithCodebase>
+  </PropertyGroup>
+  <Import Project="..\ProjectAfter.settings" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>