Merge branch 'master' into fixes/1517-mef-dispatcher-to-factory

Author: jcansdale

src/GitHub.Exports/Helpers/ThreadingHelper.cs

@@ -24,7 +24,7 @@ public interface IAwaiter : INotifyCompletion
 
     public static class ThreadingHelper
     {
-        public static bool InUIThread => (!Guard.InUnitTestRunner && Application.Current.Dispatcher.CheckAccess()) || !(Guard.InUnitTestRunner);
+        public static bool InUIThread => Guard.InUnitTestRunner ? true : Application.Current.Dispatcher.CheckAccess();
 
         /// <summary>
         /// Gets the Dispatcher for the main thread.
@@ -88,7 +88,7 @@ public AwaiterWrapper()
             {
                 isCompleted = () => true;
                 onCompleted = c => c();
-                getResult = () => {};
+                getResult = () => { };
             }
 
             public AwaiterWrapper(MainThreadAwaiter awaiter)

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -1,31 +1,28 @@
 using System;
-using System.ComponentModel.Composition;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using GitHub.Api;
 using GitHub.Extensions;
+using GitHub.Helpers;
 using GitHub.Info;
 using GitHub.Exports;
 using GitHub.Logging;
-using GitHub.Models;
 using GitHub.Services;
 using GitHub.ViewModels.GitHubPane;
 using GitHub.VisualStudio.Menus;
 using GitHub.VisualStudio.UI;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Octokit;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
 
 namespace GitHub.VisualStudio
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#110", "#112", System.AssemblyVersionInformation.Version, IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version, IconResourceID = 400)]
     [Guid(Guids.guidGitHubPkgString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     // Only initialize when we're in the context of a Git repository.
@@ -36,7 +33,6 @@ public class GitHubPackage : AsyncPackage
     {
         static readonly ILogger log = LogManager.ForContext<GitHubPackage>();
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         readonly IServiceProvider serviceProvider;
 
         public GitHubPackage()
@@ -77,6 +73,9 @@ async Task InitializeMenus()
                 return;
             }
 
+            // IMenuCommandService.AddCommand uses IServiceProvider.GetService and must be called on Main thread.
+            await ThreadingHelper.SwitchToMainThreadAsync();
+
             foreach (var menu in menus.Menus)
                 serviceProvider.AddCommandHandler(menu.Guid, menu.CmdId, (s, e) => menu.Activate());
 
@@ -95,16 +94,6 @@ async Task EnsurePackageLoaded(Guid packageGuid)
         }
     }
 
-    [Export(typeof(IGitHubClient))]
-    public class GHClient : GitHubClient
-    {
-        [ImportingConstructor]
-        public GHClient(IProgram program)
-            : base(program.ProductHeader)
-        {
-        }
-    }
-
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class ServiceProviderExports
     {
@@ -149,35 +138,8 @@ public ServiceProviderExports([Import(typeof(SVsServiceProvider))] IServiceProvi
     public sealed class ServiceProviderPackage : AsyncPackage, IServiceProviderPackage, IGitHubToolWindowManager
     {
         public const string ServiceProviderPackageId = "D5CE1488-DEDE-426D-9E5B-BFCCFBE33E53";
-        const string StartPagePreview4PackageId = "3b764d23-faf7-486f-94c7-b3accc44a70d";
-        const string StartPagePreview5PackageId = "3b764d23-faf7-486f-94c7-b3accc44a70e";
         static readonly ILogger log = LogManager.ForContext<ServiceProviderPackage>();
 
-        Version vsversion;
-        Version VSVersion
-        {
-            get
-            {
-                if (vsversion == null)
-                {
-                    var asm = typeof(ITaskList).Assembly;
-                    try
-                    {
-                        // this will return Microsoft.VisualStudio.Shell.Immutable.14.0 in VS15
-                        // but Microsoft.VisualStudio.Shell.Framework in Dev15
-                        var vinfo = FileVersionInfo.GetVersionInfo(asm.Location);
-                        vsversion = new Version(vinfo.FileMajorPart, vinfo.FileMinorPart, vinfo.FileBuildPart, vinfo.FilePrivatePart);
-                    }
-                    catch
-                    {
-                        // something wrong, fallback to assembly version
-                        vsversion = asm.GetName().Version;
-                    }
-                }
-                return vsversion;
-            }
-        }
-
         protected override Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
             AddService(typeof(IGitHubServiceProvider), CreateService, true);
@@ -286,7 +248,6 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             }
             else if (serviceType == typeof(IUsageTracker))
             {
-                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                 var usageService = await GetServiceAsync(typeof(IUsageService)) as IUsageService;
                 var serviceProvider = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
                 return new UsageTracker(serviceProvider, usageService);