Merge branch 'master' into fixes/912-diff-tooltip

Author: grokys

appveyor.yml

@@ -25,7 +25,4 @@ test_script:
 - ps: >-
     scripts\Run-Nunit.ps1 TrackingCollectionTests 180 Release -AppVeyor
 
-    scripts\Run-Xunit.ps1 UnitTests 180 Release -AppVeyor
-    
-artifacts:
-- path: build\Release\GitHub.VisualStudio.vsix
+    scripts\Run-Xunit.ps1 UnitTests 180 Release -AppVeyor

src/GitHub.VisualStudio/AssemblyResolverPackage.cs

@@ -1,11 +1,12 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Diagnostics;
 using System.Globalization;
+using System.Runtime.InteropServices;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
-using System.Linq;
 
 namespace GitHub.VisualStudio
 {
@@ -14,6 +15,8 @@ namespace GitHub.VisualStudio
 
     // This fires before ShellInitialized and SolutionExists.
     [ProvideAutoLoad(VSConstants.UICONTEXT.NoSolution_string)]
+
+    [Guid(GuidList.guidAssemblyResolverPkgString)]
     public class AssemblyResolverPackage : Package
     {
         // list of assemblies that should be resolved by name only

src/GitHub.VisualStudio/Settings/Guids.cs

@@ -5,6 +5,7 @@ namespace GitHub.VisualStudio
     static class GuidList
     {
         public const string guidGitHubPkgString = "c3d3dc68-c977-411f-b3e8-03b0dccf7dfc";
+        public const string guidAssemblyResolverPkgString = "a6424dba-34cb-360d-a4de-1b0b0411e57d";
         public const string guidGitHubCmdSetString = "c4c91892-8881-4588-a5d9-b41e8f540f5a";
         public const string guidGitHubToolbarCmdSetString = "C5F1193E-F300-41B3-B4C4-5A703DD3C1C6";
         public const string guidContextMenuSetString = "31057D08-8C3C-4C5B-9F91-8682EA08EC27";