From 79a8aea0ad5145b567a1cd1f58a8cbecfbbcf9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Kemp=C3=A9?= <laurent.kempe@techheadbrothers.com>
Date: Wed, 16 May 2018 08:19:07 +0200
Subject: [PATCH 1/8] Add Pull Request filter button to Visual Studio solution
 explorer

---
 .../GitHub.InlineReviews.csproj               |   2 +
 .../InlineReviewsPackage.vsct                 |  17 +++
 .../PullRequestFilterProvider.cs              |  98 ++++++++++++++++++
 .../Resources/PullRequestFilterCommand.png    | Bin 0 -> 1457 bytes
 4 files changed, 117 insertions(+)
 create mode 100644 src/GitHub.InlineReviews/PullRequestFilterProvider.cs
 create mode 100644 src/GitHub.InlineReviews/Resources/PullRequestFilterCommand.png

diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
index c743cdc468..6479f354f7 100644
--- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
+++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -76,6 +76,7 @@
     <Compile Include="Glyph\GlyphMargin.cs" />
     <Compile Include="Glyph\GlyphMarginVisualManager.cs" />
     <Compile Include="Glyph\IGlyphFactory.cs" />
+    <Compile Include="PullRequestFilterProvider.cs" />
     <Compile Include="PullRequestStatusBarPackage.cs" />
     <Compile Include="InlineReviewsPackage.cs" />
     <Compile Include="Models\InlineCommentThreadModel.cs" />
@@ -456,6 +457,7 @@
     <Content Include="Resources\logo_32x32%402x.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\PullRequestFilterCommand.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != '' And '$(NCrunch)' != '1'" />
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
index 6cb4c884bb..c4645d640a 100644
--- a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
+++ b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
@@ -64,7 +64,19 @@
           <LocCanonicalName>.GitHub.PreviousComment</LocCanonicalName>
         </Strings>
       </Button>
+      <Button guid="guidPullRequestFilterCommandPackageCmdSet" id="PullRequestFilterCommandId" priority="0x0400" type="Button">
+        <Parent guid="guidSHLMainMenu" id="IDG_VS_TOOLBAR_PROJWIN_FILTERS" />
+        <Icon guid="guidImages" id="pullrequest" />
+        <Strings>
+          <ButtonText>Pull Request Filter</ButtonText>
+        </Strings>
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+      </Button>
     </Buttons>
+    <Bitmaps>
+      <Bitmap guid="guidImages" href="Resources\PullRequestFilterCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough"/>
+    </Bitmaps>
   </Commands>
   <KeyBindings>
     <KeyBinding guid="guidGitHubCommandSet" id="NextInlineCommentId" editor="guidVSStd97" key1="VK_OEM_6" mod1="Alt"/>
@@ -81,6 +93,11 @@
       <IDSymbol name="PreviousInlineCommentId" value="0x1002" />
     </GuidSymbol>
 
+    <GuidSymbol name="guidPullRequestFilterCommandPackageCmdSet" value="{7cde2dfc-43c9-41ff-bf2e-bef41cd99e09}">
+      <IDSymbol name="MyMenuGroup" value="0x1020" />
+      <IDSymbol name="PullRequestFilterCommandId" value="0x0100" />
+    </GuidSymbol>
+
     <GuidSymbol name="guidImages" value="{775aa523-6c52-4c11-9c28-823c99d15613}" >
       <IDSymbol name="bmpPic1" value="1" />
       <IDSymbol name="bmpPic2" value="2" />
diff --git a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
new file mode 100644
index 0000000000..66826e1662
--- /dev/null
+++ b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
@@ -0,0 +1,98 @@
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Threading.Tasks;
+using GitHub.Services;
+using GitHub.VisualStudio;
+using Microsoft.Internal.VisualStudio.PlatformUI;
+using Microsoft.VisualStudio.Shell;
+
+namespace GitHub.InlineReviews
+{
+    public class PullRequestFilterPackageGuids
+    {
+        public const string GuidPullRequestFilterPackageCmdSetString = "7cde2dfc-43c9-41ff-bf2e-bef41cd99e09";
+        public const int PullRequestFilterId = 0x0100;
+    }
+
+    [SolutionTreeFilterProvider(PullRequestFilterPackageGuids.GuidPullRequestFilterPackageCmdSetString, PullRequestFilterPackageGuids.PullRequestFilterId)]
+    [Export]
+    public class PullRequestFilterProvider : HierarchyTreeFilterProvider
+    {
+        private readonly IVsHierarchyItemCollectionProvider hierarchyCollectionProvider;
+        private readonly IGitHubServiceProvider githubServiceProvider;
+
+        [ImportingConstructor]
+        public PullRequestFilterProvider(IVsHierarchyItemCollectionProvider hierarchyCollectionProvider, IGitHubServiceProvider githubServiceProvider)
+        {
+            this.hierarchyCollectionProvider = hierarchyCollectionProvider;
+            this.githubServiceProvider = githubServiceProvider;
+        }
+
+        protected override HierarchyTreeFilter CreateFilter()
+        {
+            return new PullRequestFilter(hierarchyCollectionProvider, githubServiceProvider);
+        }
+
+        private sealed class PullRequestFilter : HierarchyTreeFilter
+        {
+            private readonly IVsHierarchyItemCollectionProvider hierarchyCollectionProvider;
+            private readonly IGitHubServiceProvider githubServiceProvider;
+            private IPullRequestSessionManager sessionManager;
+            private HashSet<string> pullRequestSessionFiles;
+
+            public PullRequestFilter(IVsHierarchyItemCollectionProvider hierarchyCollectionProvider, IGitHubServiceProvider githubServiceProvider)
+            {
+                this.hierarchyCollectionProvider = hierarchyCollectionProvider;
+                this.githubServiceProvider = githubServiceProvider;
+            }
+
+            IPullRequestSessionManager SessionManager
+            {
+                get
+                {
+                    // Lazily load the pull request session manager to prevent all of our assemblies
+                    // being loaded on VS startup.
+                    if (sessionManager == null)
+                    {
+                        sessionManager = githubServiceProvider.GetService<IPullRequestSessionManager>();
+                    }
+
+                    return sessionManager;
+                }
+            }
+
+            // Gets the items to be included from this filter provider.
+            // rootItems is a collection that contains the root of your solution
+            // Returns a collection of items to be included as part of the filter
+            protected override async Task<IReadOnlyObservableSet> GetIncludedItemsAsync(IEnumerable<IVsHierarchyItem> rootItems)
+            {
+                var root = HierarchyUtilities.FindCommonAncestor(rootItems);
+                var sourceItems = await hierarchyCollectionProvider.GetDescendantsAsync(root.HierarchyIdentity.NestedHierarchy, CancellationToken);
+
+                var vsSolution = githubServiceProvider.GetSolution();
+                vsSolution.GetSolutionInfo(out var solutionDirectory, out _, out _);
+
+                this.pullRequestSessionFiles = new HashSet<string>();
+                if (SessionManager.CurrentSession != null)
+                {
+                    var requestSessionFiles = await SessionManager.CurrentSession.GetAllFiles();
+                    requestSessionFiles.ForEach(file => this.pullRequestSessionFiles.Add(BuildAbsolutePath(solutionDirectory, file.RelativePath)));
+                }
+
+                return await hierarchyCollectionProvider.GetFilteredHierarchyItemsAsync(sourceItems, ShouldIncludeInFilter, CancellationToken);
+            }
+
+            // Returns true if filters hierarchy item name for given filter; otherwise, false</returns>
+            private bool ShouldIncludeInFilter(IVsHierarchyItem hierarchyItem)
+            {
+                return hierarchyItem?.CanonicalName != null && pullRequestSessionFiles.Contains(hierarchyItem.CanonicalName);
+            }
+
+            private static string BuildAbsolutePath(string solutionDirectory, string fileRelativePath)
+            {
+                return Path.Combine(solutionDirectory, fileRelativePath.Replace("/", @"\")).ToLower();
+            }
+        }
+    }
+}
diff --git a/src/GitHub.InlineReviews/Resources/PullRequestFilterCommand.png b/src/GitHub.InlineReviews/Resources/PullRequestFilterCommand.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b690845d912bc85dedba801172f914cf71b5d4f
GIT binary patch
literal 1457
zcmV;i1y1^jP)<h;3K|Lk000e1NJLTq003YB000mO1^@s6>AHIP00004XF*Lt006O%
z3;baP00009a7bBm000&w000&w0h<-Z6aWAK7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMHvEiZ-v9swFG)l}R9HvFm~TjART#!){BMSSi9WQ#5}2}RDxu<sK<q=H1d75`
zON$?Zz*<;LL{^C1f=pp|qev4$6Js-7ScDSPi7_inH)l42NZi%5(JeL|1xH~i-rnbQ
z&*j{+#~EkT>4D!m_dVx~XP@VubI&z_i2hd&(%#<QBg|!HjUkIo=40jwtJ{%fno~SU
z$jQl}*49>=+}vEQn>(KbCb7Y%m|uN9A5~RVIT#rkq21kG1W|5v7uw(7KOG8%E-@E^
z!C<ykb_jKDA7H$I$26Mer1I=}AOA479S7nc8A80x2fEnUBxZhMVnP@`_rn}*{<TTL
ztspJmU9p4U5bkro$1#SDtlatY9{tq!zJSeL(L>-`?e@Km;Ez||rqvk_R+ArnOmmXd
zy|Yf|KKz?bG6eer0+65Mi7qzgr9dDcOkNMH({^y@A>>NnzE>~?cQuS3eCkob?BzGn
zb`xzdnLl6K@XynY$}=?fLIoiR4zL*Qra1v={&R2b3eKGUip%D{DoL&+l9+009oQe#
z0LshD3$wDa3cI?x3YwalGTm<XN28;ow79sKj!CPMV`4=Yn{{JoXo&jy`i$m--&R(s
zv9S>*-^Ca`0D!xk>)4W3ei<I1>(87LAPB4m@yl4IIjO*Wy%q`GXp`|0=LM^wp}}2J
zQgV|6XsNEQeo#?S@p)!uCSjXONlCd{UtfPgbhM<7j|E+9>VnvM=H`v&gW%S-SOsjP
z_yV~F;qI0Jz--j88njTNn*UJ)2xmTUUa<1=^4!cD_?(}gPsPQ><Z`(LiHV7nk&*GB
zwzl?N(V3-=j|E*E!1pkBX675C`Cw}^C<5TV`_?do&}a%le#R<b^9QW%woG$UIZ6PL
z%m>a3*6{FfB|nT;)6&wYx3_nXx1f@Of`U689UbKLdOfMBsZ?58N=r*iFCOMU5D8su
z>ZemvQ`FYhW;7q%n!iOYEiDM(TWgq*DFpC!%d6-s9=cXnTc$aw97h1*LU3MKN>5M!
zAUQdiOaImQ`SA4Q<m4;-3`j%(g@uK99vpiBY|>fgA9?(ooSb^d{EhVus;jG`g@px}
zdd?au6fOY1`@L2-hfH$<F#fO)VUyv90b?CsB&7$S>ZAgY=KKAAVZP+z#dezgZkBvL
zKMj5|NHsMzG(J8K^S@+V)^Lo!cK^;|q%Fv?|3juZNn{Ao9z#`wRl{XX#d%>V-T@qB
zK30Oq<FT*%`}=8aZ4KsMXEMZK7WQ_WZdAh&1Xcsi{W1*nk;hLd)0|Xdc?ZzVRs&G$
z!2TdEEX6Z`gUrV@*LRrrm@(!H<_c3LCSvIz^KsVawp#A*$K8)Q-UGHb0*;q7eLgt<
z>ot`~?Yi00a8nI9217kPJ?^5Sq8$$5kM{QVz2)U)d$Qf#-67QZbhOji+4&l`xzzEo
zzy^ggU;Md&Yc{%Yw3NmJ1c5srM^m)JY=ne<Xd8d|d3?8cNrTk6$d@m*ri1oKAw+}o
zf~6iq`Se3<@|0*`aXo~e9Kh=w0NQfY@v*>W{5(B9Z8YCxxGuTHNb|88@G!QTZDIdM
z8&(0v$Ubr&c*sg~!yzBchkY}Sg!6*M$4z%xSy_Nz#BMh?H}A8_Pl^T>w}rB^vv2bX
z`JDr3<u>e7j_-&THu^CcLbT>X^3D!tz7$pkwkB**i({XOKS!u@fvGT8t?3-6`M_9=
zCy)$5HUF>yz;GTD1bmlYvdRaF`=92%eg<Lt_4!0H_c+ZbqJ)0|_E1LYRokjW00000
LNkvXXu0mjfB)z_N

literal 0
HcmV?d00001


From 00fef12cf4d1baccaca1ce163ce9c7afe839b178 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 16 May 2018 10:49:27 +0100
Subject: [PATCH 2/8] Fix build for C# 6.0/Visual Studio 2015

Alas `out var` isn't supported.
---
 src/GitHub.InlineReviews/PullRequestFilterProvider.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
index 66826e1662..be754fd657 100644
--- a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
+++ b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
@@ -71,7 +71,9 @@ protected override async Task<IReadOnlyObservableSet> GetIncludedItemsAsync(IEnu
                 var sourceItems = await hierarchyCollectionProvider.GetDescendantsAsync(root.HierarchyIdentity.NestedHierarchy, CancellationToken);
 
                 var vsSolution = githubServiceProvider.GetSolution();
-                vsSolution.GetSolutionInfo(out var solutionDirectory, out _, out _);
+                string solutionDirectory;
+                string _;
+                vsSolution.GetSolutionInfo(out solutionDirectory, out _, out _);
 
                 this.pullRequestSessionFiles = new HashSet<string>();
                 if (SessionManager.CurrentSession != null)

From c3545157ad80347a0434be4aee31523093f92c44 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 16 May 2018 11:19:42 +0100
Subject: [PATCH 3/8] Add IDSymbol for pullrequest Bitmap

---
 src/GitHub.InlineReviews/InlineReviewsPackage.vsct | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
index c4645d640a..ea80072a9c 100644
--- a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
+++ b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
@@ -75,7 +75,7 @@
       </Button>
     </Buttons>
     <Bitmaps>
-      <Bitmap guid="guidImages" href="Resources\PullRequestFilterCommand.png" usedList="bmpPic1, bmpPic2, bmpPicSearch, bmpPicX, bmpPicArrows, bmpPicStrikethrough"/>
+      <Bitmap guid="guidImages" href="Resources\PullRequestFilterCommand.png" usedList="pullrequest"/>
     </Bitmaps>
   </Commands>
   <KeyBindings>
@@ -99,12 +99,7 @@
     </GuidSymbol>
 
     <GuidSymbol name="guidImages" value="{775aa523-6c52-4c11-9c28-823c99d15613}" >
-      <IDSymbol name="bmpPic1" value="1" />
-      <IDSymbol name="bmpPic2" value="2" />
-      <IDSymbol name="bmpPicSearch" value="3" />
-      <IDSymbol name="bmpPicX" value="4" />
-      <IDSymbol name="bmpPicArrows" value="5" />
-      <IDSymbol name="bmpPicStrikethrough" value="6" />
+      <IDSymbol name="pullrequest" value="1" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>

From fa7db93095b55eeb862ad4b85e0bf624c0e8c622 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Wed, 16 May 2018 11:47:52 +0100
Subject: [PATCH 4/8] Keep CA happy by using ToUpperInvariant

I think there's a bug in CA where it suggests changing ToLowerInvariant
to ToUpperInvariant (I don't think it matters in this case).
Make PullRequestFilterPackageGuids a static class.
---
 src/GitHub.InlineReviews/PullRequestFilterProvider.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
index be754fd657..7a262ac50f 100644
--- a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
+++ b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
@@ -9,7 +9,7 @@
 
 namespace GitHub.InlineReviews
 {
-    public class PullRequestFilterPackageGuids
+    public static class PullRequestFilterPackageGuids
     {
         public const string GuidPullRequestFilterPackageCmdSetString = "7cde2dfc-43c9-41ff-bf2e-bef41cd99e09";
         public const int PullRequestFilterId = 0x0100;
@@ -93,7 +93,7 @@ private bool ShouldIncludeInFilter(IVsHierarchyItem hierarchyItem)
 
             private static string BuildAbsolutePath(string solutionDirectory, string fileRelativePath)
             {
-                return Path.Combine(solutionDirectory, fileRelativePath.Replace("/", @"\")).ToLower();
+                return Path.Combine(solutionDirectory, fileRelativePath.Replace("/", @"\")).ToUpperInvariant();
             }
         }
     }

From 0b1a752bb3ad898ebdf454a569aec86101e21bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Kemp=C3=A9?= <laurent.kempe@techheadbrothers.com>
Date: Wed, 16 May 2018 18:34:53 +0200
Subject: [PATCH 5/8] Fix issue introduced in previous commit

We need to compare hierarchy items, which come in lower case, to pull request session files in upper case!
---
 src/GitHub.InlineReviews/PullRequestFilterProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
index 7a262ac50f..f975363610 100644
--- a/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
+++ b/src/GitHub.InlineReviews/PullRequestFilterProvider.cs
@@ -88,7 +88,7 @@ protected override async Task<IReadOnlyObservableSet> GetIncludedItemsAsync(IEnu
             // Returns true if filters hierarchy item name for given filter; otherwise, false</returns>
             private bool ShouldIncludeInFilter(IVsHierarchyItem hierarchyItem)
             {
-                return hierarchyItem?.CanonicalName != null && pullRequestSessionFiles.Contains(hierarchyItem.CanonicalName);
+                return hierarchyItem?.CanonicalName != null && pullRequestSessionFiles.Contains(hierarchyItem.CanonicalName.ToUpperInvariant());
             }
 
             private static string BuildAbsolutePath(string solutionDirectory, string fileRelativePath)

From d54e07281f44904eaba41a74d513d19bca1f2f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Kemp=C3=A9?= <laurent.kempe@techheadbrothers.com>
Date: Sun, 21 Oct 2018 14:15:03 +0200
Subject: [PATCH 6/8] Try to use the pull request image from
 GitHub.VisualStudio

---
 .../GitHub.InlineReviews.csproj                |   8 ++++++--
 .../GitHub.InlineReviews.imagemanifest         |  17 +++++++++++++++++
 .../InlineReviewsPackage.vsct                  |   7 ++-----
 .../Resources/PullRequestFilterCommand.png     | Bin 1457 -> 0 bytes
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest
 delete mode 100644 src/GitHub.InlineReviews/Resources/PullRequestFilterCommand.png

diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
index a2ccbd1de2..290e2ee97c 100644
--- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
+++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -141,6 +141,11 @@
     <Compile Include="VisualStudioExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="GitHub.InlineReviews.imagemanifest">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
@@ -447,7 +452,6 @@
     <Content Include="Resources\logo_32x32%402x.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\PullRequestFilterCommand.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="SampleData\" />
@@ -467,7 +471,7 @@
   <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')" />
   <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')" />
   <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')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest b/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest
new file mode 100644
index 0000000000..e79e63ab00
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
index 022c4981ca..fb36c3f872 100644
--- 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
deleted file mode 100644
index 3b690845d912bc85dedba801172f914cf71b5d4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1457
zcmV;i1y1^jP)<h;3K|Lk000e1NJLTq003YB000mO1^@s6>AHIP00004XF*Lt006O%
z3;baP00009a7bBm000&w000&w0h<-Z6aWAK7<5HgbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMHvEiZ-v9swFG)l}R9HvFm~TjART#!){BMSSi9WQ#5}2}RDxu<sK<q=H1d75`
zON$?Zz*<;LL{^C1f=pp|qev4$6Js-7ScDSPi7_inH)l42NZi%5(JeL|1xH~i-rnbQ
z&*j{+#~EkT>4D!m_dVx~XP@VubI&z_i2hd&(%#<QBg|!HjUkIo=40jwtJ{%fno~SU
z$jQl}*49>=+}vEQn>(KbCb7Y%m|uN9A5~RVIT#rkq21kG1W|5v7uw(7KOG8%E-@E^
z!C<ykb_jKDA7H$I$26Mer1I=}AOA479S7nc8A80x2fEnUBxZhMVnP@`_rn}*{<TTL
ztspJmU9p4U5bkro$1#SDtlatY9{tq!zJSeL(L>-`?e@Km;Ez||rqvk_R+ArnOmmXd
zy|Yf|KKz?bG6eer0+65Mi7qzgr9dDcOkNMH({^y@A>>NnzE>~?cQuS3eCkob?BzGn
zb`xzdnLl6K@XynY$}=?fLIoiR4zL*Qra1v={&R2b3eKGUip%D{DoL&+l9+009oQe#
z0LshD3$wDa3cI?x3YwalGTm<XN28;ow79sKj!CPMV`4=Yn{{JoXo&jy`i$m--&R(s
zv9S>*-^Ca`0D!xk>)4W3ei<I1>(87LAPB4m@yl4IIjO*Wy%q`GXp`|0=LM^wp}}2J
zQgV|6XsNEQeo#?S@p)!uCSjXONlCd{UtfPgbhM<7j|E+9>VnvM=H`v&gW%S-SOsjP
z_yV~F;qI0Jz--j88njTNn*UJ)2xmTUUa<1=^4!cD_?(}gPsPQ><Z`(LiHV7nk&*GB
zwzl?N(V3-=j|E*E!1pkBX675C`Cw}^C<5TV`_?do&}a%le#R<b^9QW%woG$UIZ6PL
z%m>a3*6{FfB|nT;)6&wYx3_nXx1f@Of`U689UbKLdOfMBsZ?58N=r*iFCOMU5D8su
z>ZemvQ`FYhW;7q%n!iOYEiDM(TWgq*DFpC!%d6-s9=cXnTc$aw97h1*LU3MKN>5M!
zAUQdiOaImQ`SA4Q<m4;-3`j%(g@uK99vpiBY|>fgA9?(ooSb^d{EhVus;jG`g@px}
zdd?au6fOY1`@L2-hfH$<F#fO)VUyv90b?CsB&7$S>ZAgY=KKAAVZP+z#dezgZkBvL
zKMj5|NHsMzG(J8K^S@+V)^Lo!cK^;|q%Fv?|3juZNn{Ao9z#`wRl{XX#d%>V-T@qB
zK30Oq<FT*%`}=8aZ4KsMXEMZK7WQ_WZdAh&1Xcsi{W1*nk;hLd)0|Xdc?ZzVRs&G$
z!2TdEEX6Z`gUrV@*LRrrm@(!H<_c3LCSvIz^KsVawp#A*$K8)Q-UGHb0*;q7eLgt<
z>ot`~?Yi00a8nI9217kPJ?^5Sq8$$5kM{QVz2)U)d$Qf#-67QZbhOji+4&l`xzzEo
zzy^ggU;Md&Yc{%Yw3NmJ1c5srM^m)JY=ne<Xd8d|d3?8cNrTk6$d@m*ri1oKAw+}o
zf~6iq`Se3<@|0*`aXo~e9Kh=w0NQfY@v*>W{5(B9Z8YCxxGuTHNb|88@G!QTZDIdM
z8&(0v$Ubr&c*sg~!yzBchkY}Sg!6*M$4z%xSy_Nz#BMh?H}A8_Pl^T>w}rB^vv2bX
z`JDr3<u>e7j_-&THu^CcLbT>X^3D!tz7$pkwkB**i({XOKS!u@fvGT8t?3-6`M_9=
zCy)$5HUF>yz;GTD1bmlYvdRaF`=92%eg<Lt_4!0H_c+ZbqJ)0|_E1LYRokjW00000
LNkvXXu0mjfB)z_N


From 74390c611d3f6645378ff796b26a874d77fccde8 Mon Sep 17 00:00:00 2001
From: Jamie Cansdale <jcansdale@github.com>
Date: Mon, 22 Oct 2018 20:07:54 +0200
Subject: [PATCH 7/8] Update src/GitHub.InlineReviews/InlineReviewsPackage.vsct

Co-Authored-By: laurentkempe <laurent.kempe@techheadbrothers.com>
---
 src/GitHub.InlineReviews/InlineReviewsPackage.vsct | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
index fb36c3f872..2ca8e69ccb 100644
--- a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
+++ b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
@@ -67,6 +67,7 @@
       <Button guid="guidPullRequestFilterCommandPackageCmdSet" id="PullRequestFilterCommandId" priority="0x0400" type="Button">
         <Parent guid="guidSHLMainMenu" id="IDG_VS_TOOLBAR_PROJWIN_FILTERS" />
         <Icon guid="guidGitHubInlineReviews" id="pullrequest" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>Pull Request Filter</ButtonText>
         </Strings>

From a0c218d8d577e757338ab234405ff1d4b128db0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Kemp=C3=A9?= <laurent.kempe@techheadbrothers.com>
Date: Fri, 26 Oct 2018 09:22:05 +0200
Subject: [PATCH 8/8] Add and use new xaml pull request filter icon

---
 .../GitHub.InlineReviews.imagemanifest                   | 6 +++---
 src/GitHub.InlineReviews/InlineReviewsPackage.vsct       | 4 ++--
 src/GitHub.VisualStudio/GitHub.VisualStudio.csproj       | 4 ++++
 .../Resources/icons/git_pull_request_filter.xaml         | 9 +++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 src/GitHub.VisualStudio/Resources/icons/git_pull_request_filter.xaml

diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest b/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest
index e79e63ab00..e14525042d 100644
--- a/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest
+++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.imagemanifest
@@ -6,11 +6,11 @@
     <String Name="Resources" Value="/GitHub.VisualStudio;Component/Resources/icons" />
 
     <Guid Name="guidGitHubInlineReviews" Value="{7b2a62fb-6aaa-4893-82c2-4895716a390c}" />
-    <ID Name="pullrequest" Value="1" />
+    <ID Name="pullrequestfilter" Value="1" />
   </Symbols>
   <Images>
-    <Image Guid="$(guidGitHubInlineReviews)" ID="$(pullrequest)">
-      <Source Uri="$(Resources)/git_pull_request.xaml" />
+    <Image Guid="$(guidGitHubInlineReviews)" ID="$(pullrequestfilter)">
+      <Source Uri="$(Resources)/git_pull_request_filter.xaml" />
     </Image>
   </Images>
   <ImageLists />
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.vsct b/src/GitHub.InlineReviews/InlineReviewsPackage.vsct
index 2ca8e69ccb..d370d9a82f 100644
--- 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="guidGitHubInlineReviews" id="pullrequest" />
+        <Icon guid="guidGitHubInlineReviews" id="pullrequestfilter" />
         <CommandFlag>IconIsMoniker</CommandFlag>
         <Strings>
           <ButtonText>Pull Request Filter</ButtonText>
@@ -107,7 +107,7 @@
     </GuidSymbol>
 
     <GuidSymbol name="guidGitHubInlineReviews" value="{7b2a62fb-6aaa-4893-82c2-4895716a390c}" >
-      <IDSymbol name="pullrequest" value="1" />
+      <IDSymbol name="pullrequestfilter" value="1" />
     </GuidSymbol>
   </Symbols>
 </CommandTable>
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
index a355aad787..03526e80ac 100644
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -446,6 +446,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Resources\icons\git_pull_request_filter.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\icons\link_external.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/GitHub.VisualStudio/Resources/icons/git_pull_request_filter.xaml b/src/GitHub.VisualStudio/Resources/icons/git_pull_request_filter.xaml
new file mode 100644
index 0000000000..8573a29638
--- /dev/null
+++ b/src/GitHub.VisualStudio/Resources/icons/git_pull_request_filter.xaml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is compatible with Silverlight-->
+<Canvas xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Name="svg72" Width="48" Height="48">
+  <Canvas>
+    <Path Fill="#FF1B1F23" Stroke="#FFF6F6F6" Data="M14.547 13.257V23.5h-3.233V13.258L3.5 6.886V4.5h18.86v2.386l-7.813 6.37z"/>
+    <Path Fill="#FFF6F6F6" Stroke="#FFF6F6F6" Data="M42.5 35.992c1.225.84 2 2.278 2 3.82 0 2.563-2 4.626-4.5 4.626s-4.5-2.063-4.5-4.626a4.63 4.63 0 0 1 2-3.82V23.33c-.016-.45-.155-.776-.47-1.086-.33-.324-.637-.465-1.03-.496h-1.5v4.86l-7.196-7.422 7.196-7.422v4.86h1.52c1.674.066 3.156.768 4.456 2.087 1.28 1.298 1.96 2.837 2.024 4.6v12.679zm-8-19.367v1H34v-1h.501zm-8 6.384V35.99a4.66 4.66 0 0 1 2 3.82c0 2.563-2 4.626-4.5 4.626s-4.5-2.063-4.5-4.626a4.63 4.63 0 0 1 2-3.82V29.1v-6.094a4.66 4.66 0 0 1-2-3.82c0-2.563 2-4.625 4.5-4.625s4.5 2.062 4.5 4.624a4.63 4.63 0 0 1-2 3.822z"/>
+    <Path Fill="#FF1B1F23" Data="M42 36.265V23.312c-.06-1.608-.68-3.03-1.88-4.248-1.2-1.217-2.56-1.877-4.12-1.94h-2V13l-6 6.188 6 6.187V21.25h2c.54.04.96.227 1.38.64.42.412.6.866.62 1.422v12.953c-1.18.7-2 2.02-2 3.547 0 2.29 1.78 4.126 4 4.126 2.22 0 4-1.836 4-4.126a4.15 4.15 0 0 0-2-3.547zm-2 6.023c-1.32 0-2.4-1.135-2.4-2.475s1.1-2.476 2.4-2.476c1.3 0 2.4 1.135 2.4 2.475s-1.1 2.476-2.4 2.476zm-12-23.1c0-2.29-1.78-4.125-4-4.125-2.22 0-4 1.835-4 4.124a4.15 4.15 0 0 0 2 3.548v13.53c-1.18.7-2 2.02-2 3.547 0 2.29 1.78 4.126 4 4.126 2.22 0 4-1.836 4-4.126a4.15 4.15 0 0 0-2-3.547v-13.53c1.18-.7 2-2.02 2-3.547zm-1.6 20.625c0 1.36-1.1 2.474-2.4 2.474-1.3 0-2.4-1.134-2.4-2.474 0-1.34 1.1-2.476 2.4-2.476 1.3 0 2.4 1.135 2.4 2.475zM24 21.663c-1.32 0-2.4-1.135-2.4-2.476 0-1.34 1.1-2.475 2.4-2.475 1.3 0 2.4 1.135 2.4 2.476 0 1.34-1.1 2.475-2.4 2.475z"/>
+  </Canvas>
+</Canvas>
\ No newline at end of file