Merge pull request #40 from sboulema/#39

#39
sboulema · Feb 23, 2018 · bce273f · bce273f
2 parents 1fb38e5 + 8f19045
commit bce273f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/TGIT.sln b/TGIT.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGit", "TGit\TGit.csproj", "{22376990-61FD-4AF5-856C-004CEA4E77EC}"
 EndProject
@@ -25,4 +25,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0284DF37-BFF0-4FB8-904C-854A2396923F}
+	EndGlobalSection
 EndGlobal
diff --git a/TGit/TGIT.csproj b/TGit/TGIT.csproj
@@ -31,6 +31,16 @@
   <PropertyGroup>
     <ApplicationManifest>Images.imagemanifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VS2013|AnyCPU'">
+    <OutputPath>bin\VS2013\</OutputPath>
+    <DefineConstants>TRACE;VS2013</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -95,9 +105,16 @@
       <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VSSDK.Shell.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
+      <Private>False</Private>
+      <Aliases>global</Aliases>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
       <Private>True</Private>
+      <Aliases>vsshell14</Aliases>
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>

diff --git a/TGit/TGIT.vsct b/TGit/TGIT.vsct
@@ -435,7 +435,7 @@
     <Bitmaps>
       <Bitmap guid="guidImages" 
               href="Resources\octicons.png" 
-              usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, tag"/>     
+              usedList="showChanges, pull, push, showLog, revert, branch, merge, differences, blame, repo, resolve, sync, commit, disk, switch, cleanup, stash, fetch, browseRef, tag"/>     
     </Bitmaps>
   </Commands>
 

diff --git a/TGit/TGITPackage.cs b/TGit/TGITPackage.cs
@@ -1,20 +1,23 @@
-using System.ComponentModel.Design;
+extern alias vsshell14;
+
+using System.ComponentModel.Design;
 using System.Runtime.InteropServices;
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using SamirBoulema.TGit.Helpers;
 using SamirBoulema.TGit.Commands;
+using VsShell14 = vsshell14::Microsoft.VisualStudio.Shell;
 
 namespace SamirBoulema.TGit
 {
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
-    [ProvideMenuResource("Menus.ctmenu", 1, IconMappingFilename = "IconMappings.csv")]
+    //[VsShell14.ProvideMenuResource("Menus.ctmenu", 1, IconMappingFilename = "IconMappings.csv")]
+    [VsShell14.ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(GuidList.GuidTgitPkgString)]
     [ProvideAutoLoad(UIContextGuids80.NoSolution)]
     [ProvideOptionPage(typeof(OptionPageGrid), "TGit", "General", 0, 0, true)]
-    // ReSharper disable once InconsistentNaming
     public sealed class TGitPackage : Package
     {
         private DTE _dte;

diff --git a/TGit/packages.config b/TGit/packages.config
@@ -27,6 +27,7 @@
   <package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
   <package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
   <package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
+  <package id="VSSDK.Shell.12" version="12.0.4" targetFramework="net45" />
   <package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
   <package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
   <package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net45" />