Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit d54e072

Browse files
committed
Try to use the pull request image from GitHub.VisualStudio
1 parent e95d218 commit d54e072

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

Diff for: src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@
141141
<Compile Include="VisualStudioExtensions.cs" />
142142
</ItemGroup>
143143
<ItemGroup>
144+
<Content Include="GitHub.InlineReviews.imagemanifest">
145+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
146+
<IncludeInVSIX>true</IncludeInVSIX>
147+
<SubType>Designer</SubType>
148+
</Content>
144149
<None Include="packages.config">
145150
<SubType>Designer</SubType>
146151
</None>
@@ -447,7 +452,6 @@
447452
<Content Include="Resources\logo_32x32%402x.png">
448453
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
449454
</Content>
450-
<Content Include="Resources\PullRequestFilterCommand.png" />
451455
</ItemGroup>
452456
<ItemGroup>
453457
<Folder Include="SampleData\" />
@@ -467,7 +471,7 @@
467471
<Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.8.122\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
468472
<Import Project="..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.SDK.Analyzers.15.8.33\build\Microsoft.VisualStudio.SDK.Analyzers.targets')" />
469473
<Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.8.3252\build\Microsoft.VSSDK.BuildTools.targets')" />
470-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
474+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
471475
Other similar extension points exist, see Microsoft.Common.targets.
472476
<Target Name="BeforeBuild">
473477
</Target>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- This file was generated by the ManifestFromResources tool.-->
3+
<!-- Version: 14.0.50929.2 -->
4+
<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">
5+
<Symbols>
6+
<String Name="Resources" Value="/GitHub.VisualStudio;Component/Resources/icons" />
7+
8+
<Guid Name="guidGitHubInlineReviews" Value="{7b2a62fb-6aaa-4893-82c2-4895716a390c}" />
9+
<ID Name="pullrequest" Value="1" />
10+
</Symbols>
11+
<Images>
12+
<Image Guid="$(guidGitHubInlineReviews)" ID="$(pullrequest)">
13+
<Source Uri="$(Resources)/git_pull_request.xaml" />
14+
</Image>
15+
</Images>
16+
<ImageLists />
17+
</ImageManifest>

Diff for: src/GitHub.InlineReviews/InlineReviewsPackage.vsct

+2-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</Button>
6767
<Button guid="guidPullRequestFilterCommandPackageCmdSet" id="PullRequestFilterCommandId" priority="0x0400" type="Button">
6868
<Parent guid="guidSHLMainMenu" id="IDG_VS_TOOLBAR_PROJWIN_FILTERS" />
69-
<Icon guid="guidImages" id="pullrequest" />
69+
<Icon guid="guidGitHubInlineReviews" id="pullrequest" />
7070
<Strings>
7171
<ButtonText>Pull Request Filter</ButtonText>
7272
</Strings>
@@ -83,9 +83,6 @@
8383
</Strings>
8484
</Button>
8585
</Buttons>
86-
<Bitmaps>
87-
<Bitmap guid="guidImages" href="Resources\PullRequestFilterCommand.png" usedList="pullrequest"/>
88-
</Bitmaps>
8986
</Commands>
9087
<KeyBindings>
9188
<KeyBinding guid="guidGitHubCommandSet" id="NextInlineCommentId" editor="guidVSStd97" key1="VK_OEM_6" mod1="Alt"/>
@@ -108,7 +105,7 @@
108105
<IDSymbol name="PullRequestFilterCommandId" value="0x0100" />
109106
</GuidSymbol>
110107

111-
<GuidSymbol name="guidImages" value="{775aa523-6c52-4c11-9c28-823c99d15613}" >
108+
<GuidSymbol name="guidGitHubInlineReviews" value="{7b2a62fb-6aaa-4893-82c2-4895716a390c}" >
112109
<IDSymbol name="pullrequest" value="1" />
113110
</GuidSymbol>
114111
</Symbols>
-1.42 KB
Binary file not shown.

0 commit comments

Comments
 (0)