Merge 7766c8c into 3c23402

github · Feb 2, 2018 · 74753ef · 74753ef
2 parents 3c23402 + 7766c8c
commit 74753ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/GitHub.TeamFoundation.14/Services/LocalRepositoryModelFactory.cs b/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)

diff --git a/src/GitHub.TeamFoundation.14/Services/VSGitExt.cs b/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;

diff --git a/src/GitHub.TeamFoundation.14/Services/VSUIContextFactory.cs b/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)

diff --git a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj b/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>