Dedupe files, remove reflection code

Author: shana

src/GitHub.Exports/GitHub.Exports.csproj

@@ -112,10 +112,10 @@
     <Compile Include="Services\ITeamExplorerServices.cs" />
     <Compile Include="Services\ITeamExplorerServiceHolder.cs" />
     <Compile Include="Services\INotificationService.cs" />
+    <Compile Include="Services\IVSServices.cs" />
     <Compile Include="Services\Logger.cs" />
     <Compile Include="Services\Services.cs" />
     <Compile Include="Services\StatusBarNotificationService.cs" />
-    <Compile Include="Services\VSServices.cs" />
     <Compile Include="Models\IConnection.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\common\SolutionInfo.cs">

src/GitHub.Exports/Services/IVSServices.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using GitHub.Models;
+
+namespace GitHub.Services
+{
+    public interface IVSServices
+    {
+        string GetLocalClonePathFromGitProvider();
+        void Clone(string cloneUrl, string clonePath, bool recurseSubmodules);
+        string GetActiveRepoPath();
+        LibGit2Sharp.IRepository GetActiveRepo();
+        IEnumerable<ISimpleRepositoryModel> GetKnownRepositories();
+        string SetDefaultProjectPath(string path);
+
+        void ActivityLogMessage(string message);
+        void ActivityLogWarning(string message);
+        void ActivityLogError(string message);
+    }
+}

src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj

@@ -63,6 +63,7 @@
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="microsoft.visualstudio.shell.interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="NullGuard, Version=1.4.1.0, Culture=neutral, PublicKeyToken=1958ac8092168428, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NullGuard.Fody.1.4.1\lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\NullGuard.dll</HintPath>
       <Private>True</Private>
@@ -100,6 +101,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Constants.cs" />
+    <Compile Include="Services\VSServices.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="Base\EnsureLoggedInSection.cs" />
     <Compile Include="Base\TeamExplorerInvitationBase.cs" />
@@ -118,7 +120,7 @@
     <Compile Include="Home\WikiNavigationItem.cs" />
     <Compile Include="Sync\EnsureLoggedInSectionSync.cs" />
     <Compile Include="Sync\GitHubPublishSection.cs" />
-    <Compile Include="TeamExplorerServices.cs" />
+    <Compile Include="Services\TeamExplorerServices.cs" />
     <None Include="..\..\script\Key.snk" Condition="$(Buildtype) == 'Internal'">
       <Link>Key.snk</Link>
     </None>
@@ -129,6 +131,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\submodules\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj">
+      <Project>{ee6ed99f-cb12-4683-b055-d28fc7357a34}</Project>
+      <Name>LibGit2Sharp</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit.csproj">
       <Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
       <Name>Octokit</Name>

…eamFoundation.14/TeamExplorerServices.cs …tion.14/Services/TeamExplorerServices.cssrc/GitHub.TeamFoundation.14/TeamExplorerServices.cs renamed to src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs src/GitHub.TeamFoundation.14/TeamExplorerServices.cs renamed to src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs

@@ -11,23 +11,11 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.Win32;
 using System.Diagnostics;
+using Microsoft.TeamFoundation.Git.Controls.Extensibility;
+using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
 
 namespace GitHub.Services
 {
-    public interface IVSServices
-    {
-        string GetLocalClonePathFromGitProvider();
-        void Clone(string cloneUrl, string clonePath, bool recurseSubmodules);
-        string GetActiveRepoPath();
-        LibGit2Sharp.IRepository GetActiveRepo();
-        IEnumerable<ISimpleRepositoryModel> GetKnownRepositories();
-        string SetDefaultProjectPath(string path);
-
-        void ActivityLogMessage(string message);
-        void ActivityLogWarning(string message);
-        void ActivityLogError(string message);
-    }
-
     [Export(typeof(IVSServices))]
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class VSServices : IVSServices
@@ -61,37 +49,30 @@ public string GetLocalClonePathFromGitProvider()
 
         public void Clone(string cloneUrl, string clonePath, bool recurseSubmodules)
         {
-            var gitExt = serviceProvider.TryGetService("Microsoft.TeamFoundation.Git.Controls.Extensibility.IGitRepositoriesExt, Microsoft.TeamFoundation.Git.Controls");
-            var cloneOptionsType = Type.GetType("Microsoft.TeamFoundation.Git.Controls.Extensibility.CloneOptions, Microsoft.TeamFoundation.Git.Controls");
-            var cloneMethod = gitExt.GetType().GetMethod("Clone", new Type[] { typeof(string), typeof(string), cloneOptionsType });
-            cloneMethod.Invoke(gitExt, new object[] { cloneUrl, clonePath, recurseSubmodules ? 1 : 0 });
+            var gitExt = serviceProvider.GetService<IGitRepositoriesExt>();
+            gitExt.Clone(cloneUrl, clonePath, recurseSubmodules ? CloneOptions.RecurseSubmodule : CloneOptions.None);
         }
 
-        object GetRepoFromVS()
+        IGitRepositoryInfo GetRepoFromVS()
         {
-            var gitExt = serviceProvider.TryGetService("Microsoft.VisualStudio.TeamFoundation.Git.Extensibility.IGitExt, Microsoft.TeamFoundation.Git.Provider");
-            var prop = gitExt?.GetType().GetProperty("ActiveRepositories");
-            var activeRepositories = prop?.GetValue(gitExt) as IEnumerable;
-            var e = activeRepositories?.GetEnumerator();
-            if (e?.MoveNext() ?? false)
-                return e.Current;
-            return null;
+            var gitExt = serviceProvider.GetService<IGitExt>();
+            return gitExt.ActiveRepositories.FirstOrDefault();
         }
 
         public LibGit2Sharp.IRepository GetActiveRepo()
         {
             var repo = GetRepoFromVS();
-            if (repo != null)
-                return serviceProvider.GetService<IGitService>().GetRepo(repo.GetType().GetProperty("RepositoryPath").GetValue(repo) as string);
-            return serviceProvider.GetSolution().GetRepoFromSolution();
+            return repo != null
+                ? serviceProvider.GetService<IGitService>().GetRepo(repo.RepositoryPath)
+                : serviceProvider.GetSolution().GetRepoFromSolution();
         }
 
         public string GetActiveRepoPath()
         {
             string ret = null;
             var repo = GetRepoFromVS();
             if (repo != null)
-                ret = repo.GetType().GetProperty("RepositoryPath")?.GetValue(repo) as string;
+                ret = repo.RepositoryPath;
             if (ret == null)
                 ret = serviceProvider.GetSolution().GetRepoFromSolution()?.Info?.Path;
             return ret ?? String.Empty;