Updated to ReSharper 10

JetBrains · Nov 6, 2015 · e6fef78 · e6fef78
1 parent 6cb250b
commit e6fef78
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 90 deletions.
diff --git a/install/presentation-assistant.nuspec b/install/presentation-assistant.nuspec
@@ -3,25 +3,21 @@
   <metadata>
     <id>JetBrains.PresentationAssistant</id>
     <title>Presentation Assistant</title>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <authors>JetBrains</authors>
     <owners>JetBrains</owners>
     <description>Shows the name and keyboard shortcuts of invoked actions.</description>
     <summary>Shows the name and keyboard shortcuts of invoked actions.</summary>
     <releaseNotes>
-&#8226; Support for ReSharper 9.2 RTM (#11)
-
-From previous releases:
-&#8226; Show Visual Studio shortcuts whenever possible
-&#8226; Removed hack to make topmost - interferes with zooming the screen for presentations
+&#8226; Support for ReSharper 10 RTM
     </releaseNotes>
     <projectUrl>https://github.com/JetBrains/resharper-presentation-assistant</projectUrl>
     <licenseUrl>https://raw.githubusercontent.com/JetBrains/resharper-presentaton-assistant/license.txt</licenseUrl>
     <iconUrl>http://resharper-plugins.jetbrains.com/Content/Images/packageReSharper.png</iconUrl>
     <copyright>Copyright 2015 JetBrains, s.r.o</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="Wave" version="[3.0]" />
+      <dependency id="Wave" version="[4.0]" />
     </dependencies>
     <tags>resharper presentation assistant keymap</tags>
   </metadata>

diff --git a/src/resharper-presentation-assistant/Properties/AssemblyInfo.cs b/src/resharper-presentation-assistant/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.*")]
+[assembly: AssemblyVersion("2.3.0.*")]
diff --git a/src/resharper-presentation-assistant/VisualStudio/VsActionFinder.cs b/src/resharper-presentation-assistant/VisualStudio/VsActionFinder.cs
@@ -6,11 +6,10 @@
 using JetBrains.ActionManagement;
 using JetBrains.Annotations;
 using JetBrains.Application;
-using JetBrains.Application.Parts;
+using JetBrains.Application.Catalogs;
 using JetBrains.DataFlow;
 using JetBrains.UI.ActionsRevised.Loader;
 using JetBrains.Util;
-using JetBrains.Util.Lazy;
 using JetBrains.Util.Logging;
 using JetBrains.VsIntegration.Interop.Extension;
 using JetBrains.VsIntegration.Shell;
@@ -98,7 +97,7 @@ private void PopulateCachedActionDefs()
 
         private class CommandBarActionDef : IActionDefWithId, IActionWithPath
         {
-            private readonly Util.Lazy.Lazy<BackingFields> backingFields;
+            private readonly Lazy<BackingFields> backingFields;
 
             private class BackingFields
             {
@@ -134,20 +133,20 @@ public CommandBarActionDef(VsShortcutFinder vsShortcutFinder, DTE dte, string ac
                     }
 
                     return fields;
-                });
+                }, true);
             }
 
             public bool IsInternal
             {
                 get { return false; }
             }
 
-            public PartCatalogueType Part
+            public PartCatalogType Part
             {
-                get { return null; }
+                get { return default(PartCatalogType); }
             }
 
-            public PartCatalogueType IconType
+            public PartCatalogType? IconType
             {
                 get { return null; }
             }
@@ -165,6 +164,8 @@ public string Description
                 get { return null; }
             }
 
+            public int? CustomVisualStudioId { get { return null; } }
+
             public CommandID CommandId { get; private set; }
 
             public string[] VsShortcuts

diff --git a/src/resharper-presentation-assistant/packages.config b/src/resharper-presentation-assistant/packages.config
@@ -3,40 +3,42 @@
   <package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net45" />
   <package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net45" />
   <package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net45" />
-  <package id="JetBrains.Annotations" version="9.2.0" targetFramework="net45" />
+  <package id="JetBrains.Annotations" version="10.0.0" targetFramework="net45" />
   <package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20150812.0" targetFramework="net45" developmentDependency="true" />
-  <package id="JetBrains.ExternalAnnotations" version="9.2.1" targetFramework="net45" />
-  <package id="JetBrains.Platform.Core.Ide" version="103.0.20150818.200225" targetFramework="net45" />
-  <package id="JetBrains.Platform.Core.Shell" version="103.0.20150818.190334" targetFramework="net45" />
-  <package id="JetBrains.Platform.Core.Text" version="103.0.20150818.200225" targetFramework="net45" />
-  <package id="JetBrains.Platform.Installer" version="103.0.20150818.200225" targetFramework="net45" />
-  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="103.0.20150818.200225" targetFramework="net45" />
+  <package id="JetBrains.ExternalAnnotations" version="10.0.15" targetFramework="net45" />
+  <package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net45" />
+  <package id="JetBrains.Platform.Core.Ide" version="104.0.20151101.164845" targetFramework="net45" />
+  <package id="JetBrains.Platform.Core.Shell" version="104.0.20151101.164331" targetFramework="net45" />
+  <package id="JetBrains.Platform.Core.Text" version="104.0.20151101.164845" targetFramework="net45" />
+  <package id="JetBrains.Platform.Installer" version="104.0.20151101.164845" targetFramework="net45" />
+  <package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="104.0.20151101.164845" targetFramework="net45" />
   <package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net45" />
   <package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net45" />
   <package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net45" />
   <package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net45" />
   <package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net45" />
   <package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net45" />
-  <package id="JetBrains.Platform.Symbols" version="103.0.20150818.200225" targetFramework="net45" />
-  <package id="JetBrains.Platform.Tests.Framework" version="103.0.20150818.200225" targetFramework="net45" />
-  <package id="JetBrains.Platform.VisualStudio" version="103.0.20150818.200225" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.Core" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.Cpp.src" version="103.0.20150819.153342" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.SolutionBuilder" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.src" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.Tasks" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.test.Framework" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.UnitTesting" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.Psi.Features.VisualStudio" version="103.0.20150819.145114" targetFramework="net45" />
-  <package id="JetBrains.ReSharper.SDK" version="9.2.20150819.163916" targetFramework="net45" />
-  <package id="JetBrains.Unix.Utils" version="20150702.4" targetFramework="net45" />
+  <package id="JetBrains.Platform.Symbols" version="104.0.20151101.164845" targetFramework="net45" />
+  <package id="JetBrains.Platform.Tests.Framework" version="104.0.20151101.164845" targetFramework="net45" />
+  <package id="JetBrains.Platform.VisualStudio" version="104.0.20151101.164845" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.Core" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.Cpp.src" version="104.0.20151101.190744" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.SolutionBuilder" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.src" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.Tasks" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.test.Framework" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.UnitTesting" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.Psi.Features.VisualStudio" version="104.0.20151101.185700" targetFramework="net45" />
+  <package id="JetBrains.ReSharper.SDK" version="10.0.20151101.194233" targetFramework="net45" />
+  <package id="JetBrains.ReSharper.SDK.Internal" version="104.0.20151101.194233" targetFramework="net45" />
   <package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net45" />
   <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net45" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
   <package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net45" />
   <package id="NuGet.Core" version="2.8.6" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="NUnit.Core" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net45" />
+  <package id="NUnit.ReSharperRunner3" version="3.0.11" targetFramework="net45" />
   <package id="NVelocity" version="1.0.3" targetFramework="net45" />
   <package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net45" />
   <package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net45" />
@@ -63,7 +65,7 @@
   <package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net45" />
   <package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net45" />
   <package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" />
-  <package id="Wave" version="3.0.0.0" targetFramework="net45" />
+  <package id="Wave" version="4.0.0.0" targetFramework="net45" />
   <package id="WinDbg.SymStore" version="8.1.20130822.1833" targetFramework="net45" developmentDependency="true" />
   <package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net45" />
   <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />