From ba6581a2d9113b9b3b894e63b7b62dd475df1e91 Mon Sep 17 00:00:00 2001 From: Philippe Miossec Date: Tue, 29 Jul 2014 14:18:25 +0200 Subject: [PATCH] Drop VsCommon in namespace (because that's an internal namespace) --- GitTfs.VsCommon/TfsPlugin.cs | 2 +- GitTfs.VsFake/TfsPlugin.cs | 2 +- GitTfs/Core/TfsInterop/TfsPlugin.cs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GitTfs.VsCommon/TfsPlugin.cs b/GitTfs.VsCommon/TfsPlugin.cs index 1ddd7ae9..194c6e6d 100644 --- a/GitTfs.VsCommon/TfsPlugin.cs +++ b/GitTfs.VsCommon/TfsPlugin.cs @@ -1,4 +1,4 @@ -namespace Sep.Git.Tfs.VsCommon +namespace Sep.Git.Tfs { class TfsPlugin : Sep.Git.Tfs.Core.TfsInterop.TfsPlugin { diff --git a/GitTfs.VsFake/TfsPlugin.cs b/GitTfs.VsFake/TfsPlugin.cs index 5a519f3d..8aa4f7ae 100644 --- a/GitTfs.VsFake/TfsPlugin.cs +++ b/GitTfs.VsFake/TfsPlugin.cs @@ -3,7 +3,7 @@ using System.IO; using Sep.Git.Tfs.Core; using Sep.Git.Tfs.VsFake; -namespace Sep.Git.Tfs.VsCommon +namespace Sep.Git.Tfs { class TfsPlugin : Sep.Git.Tfs.Core.TfsInterop.TfsPlugin { diff --git a/GitTfs/Core/TfsInterop/TfsPlugin.cs b/GitTfs/Core/TfsInterop/TfsPlugin.cs index 7d440c0c..ddc5dbab 100644 --- a/GitTfs/Core/TfsInterop/TfsPlugin.cs +++ b/GitTfs/Core/TfsInterop/TfsPlugin.cs @@ -16,12 +16,12 @@ namespace Sep.Git.Tfs.Core.TfsInterop if (explicitVersion == "11") explicitVersion = "2012"; // GitTfs.Vs2012 was formerly called GitTfs.Vs11 if(!String.IsNullOrEmpty(explicitVersion)) { - return x.Try("GitTfs.Vs" + explicitVersion, "Sep.Git.Tfs.VsCommon.TfsPlugin") ?? + return x.Try("GitTfs.Vs" + explicitVersion, "Sep.Git.Tfs.TfsPlugin") ?? x.Fail("Unable to load TFS version specified in GIT_TFS_CLIENT (" + explicitVersion + ")!"); } - return x.Try("GitTfs.Vs2013", "Sep.Git.Tfs.VsCommon.TfsPlugin") ?? - x.Try("GitTfs.Vs2012", "Sep.Git.Tfs.VsCommon.TfsPlugin") ?? - x.Try("GitTfs.Vs2010", "Sep.Git.Tfs.VsCommon.TfsPlugin") ?? + return x.Try("GitTfs.Vs2013", "Sep.Git.Tfs.TfsPlugin") ?? + x.Try("GitTfs.Vs2012", "Sep.Git.Tfs.TfsPlugin") ?? + x.Try("GitTfs.Vs2010", "Sep.Git.Tfs.TfsPlugin") ?? x.Fail(); }