Merge branch 'master' into feature/navigate-diff-to-editor

Author: grokys

appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.4.1.{build}'
+version: '2.4.2.{build}'
 skip_tags: true
 install:
 - ps: |

src/GitHub.TeamFoundation.14/Services/LocalRepositoryModelFactory.cs

@@ -3,8 +3,6 @@
 
 namespace GitHub.TeamFoundation.Services
 {
-    [Export(typeof(ILocalRepositoryModelFactory))]
-    [PartCreationPolicy(CreationPolicy.Shared)]
     class LocalRepositoryModelFactory : ILocalRepositoryModelFactory
     {
         public ILocalRepositoryModel Create(string localPath)

src/GitHub.TeamFoundation.14/Services/VSGitExt.cs

@@ -5,6 +5,7 @@
 using GitHub.Models;
 using GitHub.Services;
 using GitHub.Logging;
+using GitHub.TeamFoundation.Services;
 using Serilog;
 using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 using Task = System.Threading.Tasks.Task;
@@ -28,6 +29,11 @@ public class VSGitExt : IVSGitExt
         IReadOnlyList<ILocalRepositoryModel> activeRepositories;
 
         [ImportingConstructor]
+        public VSGitExt(IGitHubServiceProvider serviceProvider)
+            : this(serviceProvider, new VSUIContextFactory(), new LocalRepositoryModelFactory())
+        {
+        }
+
         public VSGitExt(IGitHubServiceProvider serviceProvider, IVSUIContextFactory factory, ILocalRepositoryModelFactory repositoryFactory)
         {
             this.serviceProvider = serviceProvider;

src/GitHub.TeamFoundation.14/Services/VSUIContextFactory.cs

@@ -6,8 +6,6 @@
 
 namespace GitHub.TeamFoundation.Services
 {
-    [Export(typeof(IVSUIContextFactory))]
-    [PartCreationPolicy(CreationPolicy.Shared)]
     class VSUIContextFactory : IVSUIContextFactory
     {
         public IVSUIContext GetUIContext(Guid contextGuid)

src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj

@@ -167,9 +167,15 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\GitHub.TeamFoundation.14\Services\LocalRepositoryModelFactory.cs">
+      <Link>Services\LocalRepositoryModelFactory.cs</Link>
+    </Compile>
     <Compile Include="..\GitHub.TeamFoundation.14\Services\VSGitExt.cs">
       <Link>Services\VSGitExt.cs</Link>
     </Compile>
+    <Compile Include="..\GitHub.TeamFoundation.14\Services\VSUIContextFactory.cs">
+      <Link>Services\VSUIContextFactory.cs</Link>
+    </Compile>
     <Compile Include="..\GitHub.TeamFoundation.14\Settings.cs">
       <Link>Settings.cs</Link>
     </Compile>

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.4.1.0" Language="en-US" Publisher="GitHub, Inc" />
+    <Identity Id="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Version="2.4.2.0" 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>
@@ -37,4 +37,4 @@
   <Prerequisites>
     <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.25824.0,16.0)" DisplayName="Visual Studio core editor" />
   </Prerequisites>
-</PackageManifest>
+</PackageManifest>

src/common/SolutionInfo.cs

@@ -18,6 +18,6 @@
 namespace System
 {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.4.1.0";
+        internal const string Version = "2.4.2.0";
     }
 }