From 7766c8c1549a5f86a2deb3ae4c3901ce2a3226a3 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Fri, 2 Feb 2018 18:39:26 +0000
Subject: [PATCH] Avoid using MEF for VSUIContextFactory

---
 .../Services/LocalRepositoryModelFactory.cs                 | 2 --
 src/GitHub.TeamFoundation.14/Services/VSGitExt.cs           | 6 ++++++
 src/GitHub.TeamFoundation.14/Services/VSUIContextFactory.cs | 2 --
 .../GitHub.TeamFoundation.15.csproj                         | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/GitHub.TeamFoundation.14/Services/LocalRepositoryModelFactory.cs b/src/GitHub.TeamFoundation.14/Services/LocalRepositoryModelFactory.cs
index d4445b09ec..39c937dfaa 100644
--- 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
index d57f61fbbd..1ffed5c502 100644
--- 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
index 12d9c3ff40..6cedf85cd8 100644
--- 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
index b6de976bcb..1f24f6c7bb 100644
--- 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>