Fix Vs2012 naming
It was inconsistent with previous VS version naming.
This commit is contained in:
@@ -8,8 +8,8 @@
|
||||
<ProjectGuid>{699CE23D-8BBD-4C15-82E9-7A628ACCA4C6}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>GitTfs.Vs11</RootNamespace>
|
||||
<AssemblyName>GitTfs.Vs11</AssemblyName>
|
||||
<RootNamespace>GitTfs.Vs2012</RootNamespace>
|
||||
<AssemblyName>GitTfs.Vs2012</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
@@ -87,9 +87,9 @@
|
||||
<Link>Wrappers.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="TfsHelper.Vs11.cs" />
|
||||
<Compile Include="TfsHelper.Vs2012.cs" />
|
||||
<Compile Include="TfsPlugin.cs" />
|
||||
<Compile Include="Wrappers.Vs11.cs" />
|
||||
<Compile Include="Wrappers.Vs2012.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\GitTfs\GitTfs.csproj">
|
||||
@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("GitTfs.Vs11")]
|
||||
[assembly: AssemblyTitle("GitTfs.Vs2012")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
|
||||
@@ -14,7 +14,7 @@ using Sep.Git.Tfs.Util;
|
||||
using Sep.Git.Tfs.VsCommon;
|
||||
using StructureMap;
|
||||
|
||||
namespace Sep.Git.Tfs.Vs11
|
||||
namespace Sep.Git.Tfs.Vs2012
|
||||
{
|
||||
using System.Net;
|
||||
|
||||
@@ -120,10 +120,10 @@ namespace Sep.Git.Tfs.Vs11
|
||||
|
||||
private static string GetDialogAssemblyPath()
|
||||
{
|
||||
return Path.Combine(GetVs11InstallDir(), "PrivateAssemblies", DialogAssemblyName + ".dll");
|
||||
return Path.Combine(GetVs2012InstallDir(), "PrivateAssemblies", DialogAssemblyName + ".dll");
|
||||
}
|
||||
|
||||
private static string GetVs11InstallDir()
|
||||
private static string GetVs2012InstallDir()
|
||||
{
|
||||
return TryGetRegString(@"Software\Microsoft\VisualStudio\11.0", "InstallDir")
|
||||
?? TryGetRegString(@"Software\WOW6432Node\Microsoft\VisualStudio\11.0", "InstallDir");
|
||||
@@ -1,4 +1,4 @@
|
||||
namespace Sep.Git.Tfs.Vs11
|
||||
namespace Sep.Git.Tfs.Vs2012
|
||||
{
|
||||
class TfsPlugin : Sep.Git.Tfs.Core.TfsInterop.TfsPlugin
|
||||
{
|
||||
+1
-1
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.Vs2010", "GitTfs.Vs2
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.VsFake", "GitTfs.VsFake\GitTfs.VsFake.csproj", "{20C411E8-49C7-11E1-A776-3FE84824019B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.Vs11", "GitTfs.Vs11\GitTfs.Vs11.csproj", "{699CE23D-8BBD-4C15-82E9-7A628ACCA4C6}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitTfs.Vs2012", "GitTfs.Vs2012\GitTfs.Vs2012.csproj", "{699CE23D-8BBD-4C15-82E9-7A628ACCA4C6}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp", "lib\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}"
|
||||
EndProject
|
||||
|
||||
@@ -18,7 +18,7 @@ namespace Sep.Git.Tfs.Core.TfsInterop
|
||||
return x.Try("GitTfs.Vs" + explicitVersion, "Sep.Git.Tfs.Vs" + explicitVersion + ".TfsPlugin") ??
|
||||
x.Fail("Unable to load TFS version specified in GIT_TFS_CLIENT (" + explicitVersion + ")!");
|
||||
}
|
||||
return x.Try("GitTfs.Vs11", "Sep.Git.Tfs.Vs11.TfsPlugin") ??
|
||||
return x.Try("GitTfs.Vs2012", "Sep.Git.Tfs.Vs2012.TfsPlugin") ??
|
||||
x.Try("GitTfs.Vs2010", "Sep.Git.Tfs.Vs2010.TfsPlugin") ??
|
||||
x.Try("GitTfs.Vs2008", "Sep.Git.Tfs.Vs2008.TfsPlugin") ??
|
||||
x.Fail();
|
||||
|
||||
Reference in New Issue
Block a user