diff --git a/lib/15.0/Microsoft.TeamFoundation.Client.dll b/lib/15.0/Microsoft.TeamFoundation.Client.dll
index ee233792c5..ff4164ee7f 100644
Binary files a/lib/15.0/Microsoft.TeamFoundation.Client.dll and b/lib/15.0/Microsoft.TeamFoundation.Client.dll differ
diff --git a/lib/15.0/Microsoft.TeamFoundation.Common.dll b/lib/15.0/Microsoft.TeamFoundation.Common.dll
index 9e4091ac0f..7ab1fb2525 100644
Binary files a/lib/15.0/Microsoft.TeamFoundation.Common.dll and b/lib/15.0/Microsoft.TeamFoundation.Common.dll differ
diff --git a/lib/15.0/Microsoft.TeamFoundation.Controls.dll b/lib/15.0/Microsoft.TeamFoundation.Controls.dll
index 6b8ee7aec3..65d4237f55 100644
Binary files a/lib/15.0/Microsoft.TeamFoundation.Controls.dll and b/lib/15.0/Microsoft.TeamFoundation.Controls.dll differ
diff --git a/lib/15.0/Microsoft.TeamFoundation.Git.Client.dll b/lib/15.0/Microsoft.TeamFoundation.Git.Client.dll
index 2c7389f685..f77b7d6a56 100644
Binary files a/lib/15.0/Microsoft.TeamFoundation.Git.Client.dll and b/lib/15.0/Microsoft.TeamFoundation.Git.Client.dll differ
diff --git a/lib/15.0/Microsoft.TeamFoundation.Git.Controls.dll b/lib/15.0/Microsoft.TeamFoundation.Git.Controls.dll
index e8977019f4..d077a0816c 100644
Binary files a/lib/15.0/Microsoft.TeamFoundation.Git.Controls.dll and b/lib/15.0/Microsoft.TeamFoundation.Git.Controls.dll differ
diff --git a/lib/15.0/Microsoft.TeamFoundation.Git.Provider.dll b/lib/15.0/Microsoft.TeamFoundation.Git.Provider.dll
index ec45978843..f8908bf622 100644
Binary files a/lib/15.0/Microsoft.TeamFoundation.Git.Provider.dll and b/lib/15.0/Microsoft.TeamFoundation.Git.Provider.dll differ
diff --git a/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj b/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj
index b7e4b948fb..7bf3483f1c 100644
--- a/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj
+++ b/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj
@@ -24,14 +24,14 @@
true
full
false
- DEBUG;TRACE
+ TRACE;DEBUG;TEAMEXPLORER14
prompt
4
pdbonly
true
- TRACE
+ TRACE;TEAMEXPLORER14
prompt
4
diff --git a/src/GitHub.TeamFoundation.14/Services/VSGitServices.cs b/src/GitHub.TeamFoundation.14/Services/VSGitServices.cs
index 8caa80b851..9a85107d16 100644
--- a/src/GitHub.TeamFoundation.14/Services/VSGitServices.cs
+++ b/src/GitHub.TeamFoundation.14/Services/VSGitServices.cs
@@ -12,6 +12,8 @@
using GitHub.TeamFoundation;
using Microsoft.TeamFoundation.Git.Controls.Extensibility;
using Microsoft.VisualStudio.TeamFoundation.Git.Extensibility;
+using Microsoft.VisualStudio.Shell;
+using System.Threading;
namespace GitHub.Services
{
@@ -21,6 +23,7 @@ namespace GitHub.Services
public class VSGitServices : IVSGitServices
{
readonly IGitHubServiceProvider serviceProvider;
+ readonly IVsStatusbar statusBar;
///
/// This MEF export requires specific versions of TeamFoundation. IGitExt is declared here so
@@ -34,6 +37,7 @@ public class VSGitServices : IVSGitServices
public VSGitServices(IGitHubServiceProvider serviceProvider)
{
this.serviceProvider = serviceProvider;
+ this.statusBar = serviceProvider.GetService();
}
// The Default Repository Path that VS uses is hidden in an internal
@@ -57,8 +61,19 @@ public string GetLocalClonePathFromGitProvider()
public void Clone(string cloneUrl, string clonePath, bool recurseSubmodules)
{
+#if TEAMEXPLORER14
var gitExt = serviceProvider.GetService();
gitExt.Clone(cloneUrl, clonePath, recurseSubmodules ? CloneOptions.RecurseSubmodule : CloneOptions.None);
+#else
+ var gitExt = serviceProvider.GetService();
+ var progress = new Progress();
+
+ ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
+ {
+ progress.ProgressChanged += (s, e) => statusBar.SetText(e.ProgressText);
+ await gitExt.CloneAsync(cloneUrl, clonePath, recurseSubmodules, default(CancellationToken), progress);
+ });
+#endif
}
IGitRepositoryInfo GetRepoFromVS()
diff --git a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj b/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj
index 6d9e0d3613..0552ad4224 100644
--- a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj
+++ b/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj
@@ -69,10 +69,22 @@
..\..\packages\VSSDK.ComponentModelHost.12.0.4\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll
False
+
+ ..\..\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll
+ True
+
+
+ ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll
+ True
+
..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll
True
+
+ ..\..\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll
+ True
+
..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll
True
@@ -85,6 +97,18 @@
..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll
True
+
+ ..\..\packages\Microsoft.VisualStudio.Threading.15.0.240\lib\net45\Microsoft.VisualStudio.Threading.dll
+ True
+
+
+ ..\..\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll
+ True
+
+
+ ..\..\packages\Microsoft.VisualStudio.Validation.15.0.82\lib\net45\Microsoft.VisualStudio.Validation.dll
+ True
+
..\..\packages\NullGuard.Fody.1.4.6\Lib\dotnet\NullGuard.dll
False
@@ -189,6 +213,7 @@
Properties\SolutionInfo.cs
+
diff --git a/src/GitHub.TeamFoundation.15/app.config b/src/GitHub.TeamFoundation.15/app.config
new file mode 100644
index 0000000000..514c4bff7e
--- /dev/null
+++ b/src/GitHub.TeamFoundation.15/app.config
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/GitHub.TeamFoundation.15/packages.config b/src/GitHub.TeamFoundation.15/packages.config
index fad8cecde1..00b561c118 100644
--- a/src/GitHub.TeamFoundation.15/packages.config
+++ b/src/GitHub.TeamFoundation.15/packages.config
@@ -3,10 +3,16 @@
+
+
+
+
+
+