Try to use the pull request image from GitHub.VisualStudio

github · Oct 21, 2018 · e8f0e3e · e8f0e3e
1 parent e95d218
commit e8f0e3e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -141,6 +141,10 @@
     <Compile Include="VisualStudioExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="GitHub.InlineReviews.imagemanifest">
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
@@ -447,7 +451,6 @@
     <Content Include="Resources\logo_32x32%402x.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\PullRequestFilterCommand.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="SampleData\" />

diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest b/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file was generated by the ManifestFromResources tool.-->
+<!-- Version: 14.0.50929.2 -->
+<ImageManifest xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/VisualStudio/ImageManifestSchema/2014">
+  <Symbols>
+    <String Name="Resources" Value="/GitHub.VisualStudio;Component/Resources/icons" />
+
+    <Guid Name="guidGitHubInlineReviews" Value="{7b2a62fb-6aaa-4893-82c2-4895716a390c}" />
+    <ID Name="pullrequest" Value="1" />
+  </Symbols>
+  <Images>
+    <Image Guid="$(guidGitHubInlineReviews)" ID="$(pullrequest)">
+      <Source Uri="$(Resources)/git_pull_request.xaml" />
+    </Image>
+  </Images>
+  <ImageLists />
+</ImageManifest>
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
@@ -66,7 +66,7 @@
       </Button>
       <Button guid="guidPullRequestFilterCommandPackageCmdSet" id="PullRequestFilterCommandId" priority="0x0400" type="Button">
         <Parent guid="guidSHLMainMenu" id="IDG_VS_TOOLBAR_PROJWIN_FILTERS" />
-        <Icon guid="guidImages" id="pullrequest" />
+        <Icon guid="guidGitHubInlineReviews" id="pullrequest" />
         <Strings>
           <ButtonText>Pull Request Filter</ButtonText>
         </Strings>
@@ -83,9 +83,6 @@
         </Strings>
       </Button>
     </Buttons>
-    <Bitmaps>
-      <Bitmap guid="guidImages" href="Resources\PullRequestFilterCommand.png" usedList="pullrequest"/>
-    </Bitmaps>
   </Commands>
   <KeyBindings>
     <KeyBinding guid="guidGitHubCommandSet" id="NextInlineCommentId" editor="guidVSStd97" key1="VK_OEM_6" mod1="Alt"/>
@@ -108,7 +105,7 @@
       <IDSymbol name="PullRequestFilterCommandId" value="0x0100" />
     </GuidSymbol>
 
-    <GuidSymbol name="guidImages" value="{775aa523-6c52-4c11-9c28-823c99d15613}" >
+    <GuidSymbol name="guidGitHubInlineReviews" value="{7b2a62fb-6aaa-4893-82c2-4895716a390c}" >
       <IDSymbol name="pullrequest" value="1" />
     </GuidSymbol>
   </Symbols>

diff --git a/src/GitHub.InlineReviews/Resources/PullRequestFilterCommand.png b/src/GitHub.InlineReviews/Resources/PullRequestFilterCommand.png
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -413,6 +413,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="..\..\..\..\Desktop\Monikers.imagemanifest">
+      <Link>Monikers.imagemanifest</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>