Merge branch 'master' into grokys/ncrunch

Author: grokys

src/GitHub.Exports/Helpers/ThreadingHelper.cs

@@ -7,6 +7,7 @@
 using System.Windows;
 using static Microsoft.VisualStudio.Threading.JoinableTaskFactory;
 using static Microsoft.VisualStudio.Threading.AwaitExtensions;
+using System.Windows.Threading;
 
 namespace GitHub.Helpers
 {
@@ -25,6 +26,11 @@ public static class ThreadingHelper
     {
         public static bool InUIThread => (!Guard.InUnitTestRunner && Application.Current.Dispatcher.CheckAccess()) || !(Guard.InUnitTestRunner);
 
+        /// <summary>
+        /// Gets the Dispatcher for the main thread.
+        /// </summary>
+        public static Dispatcher MainThreadDispatcher => Application.Current.Dispatcher;
+
         /// <summary>
         /// Switch to the UI thread using ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync
         /// Auto-disables switching when running in unit test mode

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -10,7 +10,7 @@
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
     <BuildType Condition="Exists('..\..\script\src\ApiClientConfiguration.cs')">Internal</BuildType>
-    <ApplicationVersion>2.2.0.6</ApplicationVersion>
+    <ApplicationVersion>2.2.0.7</ApplicationVersion>
     <OutputPath>..\..\build\$(Configuration)\</OutputPath>
     <VsixType>v3</VsixType>
     <IsProductComponent>true</IsProductComponent>

src/GitHub.VisualStudio/Services/UsageTracker.cs

@@ -65,7 +65,7 @@ public UsageTracker(IGitHubServiceProvider gitHubServiceProvider)
                 TimeSpan.FromMinutes(3),
                 DispatcherPriority.Background,
                 TimerTick,
-                Dispatcher.CurrentDispatcher);
+                ThreadingHelper.MainThreadDispatcher);
 
             RunTimer();
         }

src/GitHub.VisualStudio/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.2.0.6" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.2.0.7" Language="en-US" Publisher="GitHub, Inc" />
     <DisplayName>GitHub Extension for Visual Studio</DisplayName>
     <Description xml:space="preserve">A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</Description>
     <PackageId>GitHub.VisualStudio</PackageId>

src/MsiInstaller/Version.wxi

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define VersionNumber="2.2.0.6" ?>
+  <?define VersionNumber="2.2.0.7" ?>
 </Include>

src/common/SolutionInfo.cs

@@ -3,8 +3,8 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyProduct("GitHub Extension for Visual Studio")]
-[assembly: AssemblyVersion("2.2.0.6")]
-[assembly: AssemblyFileVersion("2.2.0.6")]
+[assembly: AssemblyVersion("2.2.0.7")]
+[assembly: AssemblyFileVersion("2.2.0.7")]
 [assembly: ComVisible(false)]
 [assembly: AssemblyCompany("GitHub, Inc.")]
 [assembly: AssemblyCopyright("Copyright © GitHub, Inc. 2014-2016")]
@@ -16,6 +16,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.2.0.6";
+        internal const string Version = "2.2.0.7";
     }
 }