From 2fc8bf70034e9e0d00d41e3356e7c9c8516fd03d Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sun, 1 Mar 2015 08:57:32 +0100
Subject: [PATCH] fix #528: Open Build Output in ILSpy fix #504: Collapse group
 in Visual Studio context menu

---
 ILSpy.AddIn/ILSpyAddIn.vsct      |  45 +++++++++++++++++++++----------
 ILSpy.AddIn/ILSpyAddInPackage.cs |  30 +++++++++++++++++----
 ILSpy.AddIn/PkgCmdID.cs          |   4 +--
 ILSpy.AddIn/Resources/Images.png | Bin 994 -> 1753 bytes
 4 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/ILSpy.AddIn/ILSpyAddIn.vsct b/ILSpy.AddIn/ILSpyAddIn.vsct
index 0ad7cad4b..69af34274 100644
--- a/ILSpy.AddIn/ILSpyAddIn.vsct
+++ b/ILSpy.AddIn/ILSpyAddIn.vsct
@@ -40,13 +40,13 @@
          group as the part of a menu contained between two lines. The parent of a group 
          must be a menu. -->
     <Groups>
-      <Group guid="guidILSpyAddInCmdSet" id="ILSpyAddInGroup" priority="0x0200">
-        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_REFERENCE"/>
-      </Group>
-
       <Group guid="guidILSpyAddInCmdSet" id="OpenILSpyGroup" priority="0x0200">
         <Parent guid="guidSHLMainMenu" id="IDM_VS_MENU_TOOLS"/>
       </Group>
+
+      <Group guid="guidILSpyAddInCmdSet" id="OpenILSpyProjGroup" priority="0x0200">
+        <Parent guid="guidSHLMainMenu" id="IDM_VS_CTXT_PROJNODE"/>
+      </Group>
     </Groups>
     
     <!--Buttons section. -->
@@ -61,16 +61,25 @@
               <CommandFlag>DynamicVisibility</CommandFlag>
           If you do not want an image next to your command, remove the Icon node /> -->
 
-      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenInILSpy" priority="0x0600" type="Button">
-        <Parent guid="guidILSpyAddInCmdSet" id="ILSpyAddInGroup" />
-        <Icon guid="guidImages" id="bmpPicSearch" />
+      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenReferenceInILSpy" priority="0x0600" type="Button">
+        <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyRefGroup" />
+        <Icon guid="guidImages" id="bmpLogo" />
         <Strings>
           <ButtonText>Open in ILSpy</ButtonText>
         </Strings>
       </Button>
 
+      <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenProjectOutputInILSpy" priority="0x0600" type="Button">
+        <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyProjGroup" />
+        <Icon guid="guidImages" id="bmpLogo" />
+        <Strings>
+          <ButtonText>Open output in ILSpy</ButtonText>
+        </Strings>
+      </Button>
+
       <Button guid="guidILSpyAddInCmdSet" id="cmdidOpenILSpy" priority="0x0600" type="Button">
         <Parent guid="guidILSpyAddInCmdSet" id="OpenILSpyGroup" />
+        <Icon guid="guidImages" id="bmpLogo" />
         <Strings>
           <ButtonText>ILSpy</ButtonText>
         </Strings>
@@ -85,10 +94,16 @@
             bitmap strip containing the bitmaps and then there are the numeric ids of the elements used 
             inside a button definition. An important aspect of this declaration is that the element id 
             must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
-      <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows"/>
+      <Bitmap guid="guidImages" href="Resources\Images.png" usedList="bmpLogo, bmpPic1, bmpPic2, bmpPicX, bmpPicArrows"/>
     </Bitmaps>
   </Commands>
 
+  <CommandPlacements>
+    <CommandPlacement guid="guidILSpyAddInCmdSet" id="cmdidOpenReferenceInILSpy" priority="0x0600">
+      <Parent guid="guidSHLMainMenu" id="IDG_VS_CTXT_REFERENCE"/>
+    </CommandPlacement>
+  </CommandPlacements>
+
   <Symbols>
     <!-- This is the package guid. -->
     <GuidSymbol name="guidILSpyAddInPkg" value="{a9120dbe-164a-4891-842f-fb7829273838}" />
@@ -96,16 +111,18 @@
     <!-- This is the guid used to group the menu commands together -->
     <GuidSymbol name="guidILSpyAddInCmdSet" value="{85ddb8ca-a842-4b1c-ba1a-94141fdf19d0}">
 
-      <IDSymbol name="ILSpyAddInGroup" value="0x1020" />
-      <IDSymbol name="OpenILSpyGroup" value="0x1030" />
+      <IDSymbol name="OpenILSpyGroup" value="0x1010" />
+      <IDSymbol name="OpenILSpyRefGroup" value="0x1020" />
+      <IDSymbol name="OpenILSpyProjGroup" value="0x1030" />
       <IDSymbol name="cmdidOpenILSpy" value="0x0100" />
-      <IDSymbol name="cmdidOpenInILSpy" value="0x0200" />
+      <IDSymbol name="cmdidOpenReferenceInILSpy" value="0x0200" />
+      <IDSymbol name="cmdidOpenProjectOutputInILSpy" value="0x0300" />
     </GuidSymbol>
      
     <GuidSymbol name="guidImages" value="{2f654db9-4641-4638-9937-27c6202b2a6a}" >
-      <IDSymbol name="bmpPic1" value="1" />
-      <IDSymbol name="bmpPic2" value="2" />
-      <IDSymbol name="bmpPicSearch" value="3" />
+      <IDSymbol name="bmpLogo" value="1" />
+      <IDSymbol name="bmpPic1" value="2" />
+      <IDSymbol name="bmpPic2" value="3" />
       <IDSymbol name="bmpPicX" value="4" />
       <IDSymbol name="bmpPicArrows" value="5" />
       <IDSymbol name="bmpPicStrikethrough" value="6" />
diff --git a/ILSpy.AddIn/ILSpyAddInPackage.cs b/ILSpy.AddIn/ILSpyAddInPackage.cs
index 3ea64ebbb..de2ddd160 100644
--- a/ILSpy.AddIn/ILSpyAddInPackage.cs
+++ b/ILSpy.AddIn/ILSpyAddInPackage.cs
@@ -67,14 +67,19 @@ namespace ICSharpCode.ILSpy.AddIn
 			OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
 			if (null != mcs) {
 				// Create the command for the menu item.
-				CommandID menuCommandID = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenInILSpy);
-				MenuCommand menuItem = new MenuCommand(OpenInILSpyCallback, menuCommandID);
+				CommandID menuCommandID = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenReferenceInILSpy);
+				MenuCommand menuItem = new MenuCommand(OpenReferenceInILSpyCallback, menuCommandID);
 				mcs.AddCommand(menuItem);
 
 				// Create the command for the menu item.
-				CommandID menuCommandID2 = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenILSpy);
-				MenuCommand menuItem2 = new MenuCommand(OpenILSpyCallback, menuCommandID2);
+				CommandID menuCommandID2 = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenProjectOutputInILSpy);
+				MenuCommand menuItem2 = new MenuCommand(OpenProjectOutputInILSpyCallback, menuCommandID2);
 				mcs.AddCommand(menuItem2);
+
+				// Create the command for the menu item.
+				CommandID menuCommandID3 = new CommandID(GuidList.guidILSpyAddInCmdSet, (int)PkgCmdIDList.cmdidOpenILSpy);
+				MenuCommand menuItem3 = new MenuCommand(OpenILSpyCallback, menuCommandID3);
+				mcs.AddCommand(menuItem3);
 			}
 		}
 		#endregion
@@ -84,7 +89,7 @@ namespace ICSharpCode.ILSpy.AddIn
 		/// See the Initialize method to see how the menu item is associated to this function using
 		/// the OleMenuCommandService service and the MenuCommand class.
 		/// </summary>
-		private void OpenInILSpyCallback(object sender, EventArgs e)
+		private void OpenReferenceInILSpyCallback(object sender, EventArgs e)
 		{
 			var explorer = ((EnvDTE80.DTE2)GetGlobalService(typeof(EnvDTE.DTE))).ToolWindows.SolutionExplorer;
 			var items =(object[]) explorer.SelectedItems;
@@ -102,6 +107,21 @@ namespace ICSharpCode.ILSpy.AddIn
 			}
 		}
 
+		private void OpenProjectOutputInILSpyCallback(object sender, EventArgs e)
+		{
+			var explorer = ((EnvDTE80.DTE2)GetGlobalService(typeof(EnvDTE.DTE))).ToolWindows.SolutionExplorer;
+			var items = (object[])explorer.SelectedItems;
+
+			foreach (EnvDTE.UIHierarchyItem item in items) {
+				EnvDTE.Project project = (EnvDTE.Project)item.Object;
+				EnvDTE.Configuration config = project.ConfigurationManager.ActiveConfiguration;
+				string projectPath = Path.GetDirectoryName(project.FileName);
+				string outputPath = config.Properties.Item("OutputPath").Value.ToString();
+				string assemblyFileName = project.Properties.Item("OutputFileName").Value.ToString();
+				OpenAssemblyInILSpy(Path.Combine(projectPath, outputPath, assemblyFileName));
+			}
+		}
+
 		private void OpenILSpyCallback(object sender, EventArgs e)
 		{
 			Process.Start(GetILSpyPath());
diff --git a/ILSpy.AddIn/PkgCmdID.cs b/ILSpy.AddIn/PkgCmdID.cs
index 5b24da1d6..1cc38a3fd 100644
--- a/ILSpy.AddIn/PkgCmdID.cs
+++ b/ILSpy.AddIn/PkgCmdID.cs
@@ -7,7 +7,7 @@ namespace ICSharpCode.ILSpy.AddIn
 	static class PkgCmdIDList
 	{
 		public const uint cmdidOpenILSpy = 0x100;
-		public const uint cmdidOpenInILSpy = 0x200;
-		public const uint cmdidOpenDefinitionInILSpy = 0x300;
+		public const uint cmdidOpenReferenceInILSpy = 0x200;
+		public const uint cmdidOpenProjectOutputInILSpy = 0x300;
 	};
 }
\ No newline at end of file
diff --git a/ILSpy.AddIn/Resources/Images.png b/ILSpy.AddIn/Resources/Images.png
index bf17e6be18815abd2302397d6f264f5551471803..4a217fa719351140b0b35698415abfe86bc5a2a4 100644
GIT binary patch
delta 1702
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

delta 939
zcmV;c162Ik4dMroB#|*Be*=U`L_t(oN6nbOYZO5g$AhF5`~xgfS)>xIEQD|tRtK>>
z1xayjLO_d{Li_<KjbLeU*r<gdX{?l>g@uTRjSvtLA-O}YxCHJ;BaH7m%=dUZ`}TJC
za+3SPmz#a_W-s@7JF_#Hn`QO;{pG=6&=fo6CgLIG)N;<9sb^LKfBE6T!GYV{+;o*n
zWn^3<j{cD9H5?8X5EHL=yWI;RoDkyD-w^M@GG@hsqJ3@kyL{Mv)9_46;4A}jwOUQU
zrx6cD@H0U`E}i^oyB{x}c}sjhE&_6o+pX@mr;pw5&ma6uLXHK6zWL<H-Fg1k{m&vy
zRR9q?bd?g|@X6oUf4J|C4qNWHd*VOWR@ZzS{m4VUz-<8h%S-3IzdX8&zIW&YWNB}=
znqS@9rA4<>z3NbiUaxl<{T39M@UK7Uc`x4nC}BHSd;Z+Kqpg^Z!zsxh%eB@!gbOJi
z3r|uMjN{Wz_%yEBhdkuR1%UCCOB_qm{?9iJ_v*?;ZxjNvf5Cr|NW-uU_;D=HF=z`s
zos$0Xgcv)dri4C@on$<P9Nt62r}h1jkD_7;!qd$H05)Qn4N+0n{g(t;P_$25fN}8Q
zln6-!WLy7eOU&1~x}7(kVlG@{20&7T6{`qrV-{ehg!GXtDB7nfKpuS9l!m3-@sEzh
ze4VS?dE+6hf6bjv$JJ^zpI_u1Kv_kAKi#YQTx)k^LD8N@0mc=<l!is?>yVZb^JwNX
z&UQ#o3GmzPcDG)yC+-tF-UU(P3Lv?=AuS;b3JmZ?U&0pfBF0!#F)+6I8PZaU$I(T`
zXTguJv(5o>-|fz?y}TtTvHn9EWNa3p>^4*b*1#Fle>SCI={7$@T1w2Ji;mBNzqPeB
zx`%S=BrMkr>~1u06aupW`+gP!Ioy6yF_74koB?9kx&S&3n=*cM!XYgsE7x*J_W}@!
zWx*fq*RzxbAA5ZiO779b(~mgL0mrSw#34<?fU*CNW7>KBF>C_2V(^*EDnL>A5Vn>C
z52FxxfAV?W0BjTqdFXq8>jv)a4`~oVz&w2ESZws?6`_o0LIBMrs0@6FOAO&-HsEC(
zx<`^CtfLRJ0ArX#5O~QF?l|+sT=Zm|=a~^_LK*lFpX_n)Da;BiO<1D#c3%7M(J%lN
zaCI#9G~vTDB>*V{9|CX|PM-3_&d8GFFGw!`A;sN{f#kuRCVc1I+&>fq)d&L-a5ew{
N002ovPDHLkV1ixu%)S5s