From 8afc573cb10c6e3830f84c729a2378238d3c7a8e Mon Sep 17 00:00:00 2001
From: Fernando De Mennato <fdemennato@progesoftware.it>
Date: Thu, 11 Jun 2020 20:26:38 +0200
Subject: [PATCH 1/3] Code review

---
 GitFlow.VS.sln.DotSettings                        |   3 ---
 .../GitFlow.VS.ExtensionPackage.cs                |   8 +++++---
 GitFlowWithPR.VS.Extension/GitFlowVersion.cs      |   2 +-
 .../GitFlowWithPR.VS.Extension.csproj             |   4 ----
 GitFlowWithPR.VS.Extension/Guids.cs               |   7 ++-----
 GitFlowWithPR.VS.Extension/Key.snk                | Bin 596 -> 0 bytes
 TeamExplorer.Common/UserSettings.cs               |   2 +-
 7 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 GitFlow.VS.sln.DotSettings
 delete mode 100644 GitFlowWithPR.VS.Extension/Key.snk

diff --git a/GitFlow.VS.sln.DotSettings b/GitFlow.VS.sln.DotSettings
deleted file mode 100644
index 9a3bd5c..0000000
--- a/GitFlow.VS.sln.DotSettings
+++ /dev/null
@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=GitFlowVS_002EExtension_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/GitFlowWithPR.VS.Extension/GitFlow.VS.ExtensionPackage.cs b/GitFlowWithPR.VS.Extension/GitFlow.VS.ExtensionPackage.cs
index b286451..c3c2e3a 100644
--- a/GitFlowWithPR.VS.Extension/GitFlow.VS.ExtensionPackage.cs
+++ b/GitFlowWithPR.VS.Extension/GitFlow.VS.ExtensionPackage.cs
@@ -13,12 +13,14 @@ namespace GitFlowWithPRVS.Extension
     [Guid(GuidList.GuidGitFlowWithPRVsExtensionPkgString)]
     public sealed class GitFlowWithPRVSExtension : AsyncPackage
     {
+        public GitFlowWithPRVSExtension()
+        {
+        }
 
-        protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+        protected override System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
             UserSettings.ServiceProvider = this;
-
-            await base.InitializeAsync(cancellationToken, progress);
+            return System.Threading.Tasks.Task.FromResult<object>(null);
         }
 
     }
diff --git a/GitFlowWithPR.VS.Extension/GitFlowVersion.cs b/GitFlowWithPR.VS.Extension/GitFlowVersion.cs
index e6d6984..f058bd1 100644
--- a/GitFlowWithPR.VS.Extension/GitFlowVersion.cs
+++ b/GitFlowWithPR.VS.Extension/GitFlowVersion.cs
@@ -6,7 +6,7 @@ namespace GitFlowWithPRVS.Extension
     public static class GitFlowVersion
     {
 
-        private static string GetVersion => Assembly.GetExecutingAssembly().GetName().Version.ToString();
+        private static string GetVersion => VSVersion.FullVersion.ToString();
         
 
         private static string GetFileInstallation =>  Path.Combine(Assembly.GetExecutingAssembly().Location, GetVersion);
diff --git a/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj b/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
index baf9c10..a8c83b3 100644
--- a/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
+++ b/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
@@ -70,7 +70,6 @@
     <RootNamespace>GitFlowWithPRVS.Extension</RootNamespace>
     <AssemblyName>GitFlowWithPRVS.Extension</AssemblyName>
     <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -712,9 +711,6 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Key.snk" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="icon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/GitFlowWithPR.VS.Extension/Guids.cs b/GitFlowWithPR.VS.Extension/Guids.cs
index dc852b7..a492523 100644
--- a/GitFlowWithPR.VS.Extension/Guids.cs
+++ b/GitFlowWithPR.VS.Extension/Guids.cs
@@ -4,11 +4,8 @@ namespace GitFlowWithPRVS.Extension
 {
     static class GuidList
     {
-        public const string GuidGitFlowWithPRVsExtensionPkgString = "632375AC-F19B-4F7F-87C8-932B37D45CF2";
-        public const string GuidGitFlowWithPRVsExtensionCmdSetString = "B9275284-B14F-44AC-93D9-59D19B25A7F9";
-
-        public static readonly Guid GuidGitFlowWithPRVsExtensionCmdSet = new Guid(GuidGitFlowWithPRVsExtensionCmdSetString);
-
+        public const string GuidGitFlowWithPRVsExtensionPkgString = "ee0e74b0-16d2-44aa-ad97-6c10f0bb2942";
+        
         public const string GitFlowPage = "75EC888F-7549-4D9C-9967-4869A9AEDDDD";
         public const string GitFlowActionSection = "6DACB452-3D08-492E-892B-E54E87456888";
         public const string GitFlowFeaturesSection = "91A711C0-CF48-4354-9005-266E0CF9A4EC";
diff --git a/GitFlowWithPR.VS.Extension/Key.snk b/GitFlowWithPR.VS.Extension/Key.snk
deleted file mode 100644
index d783e8b1fb9f323ef0fd50fc56eaf84ba6826f41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097p7lqx9b4+t!i}d;~DBZHn8kYKNqJ}vc
z(L1i&Kr}<jE3&yy(m3m}A5-Wce<1~!#qsx(J}G;<adCqSLW)#*3@eh_3T30WT3<kV
zg0d<wV6;IoTkl%fqXzF!nKqA(QU`mQj}K!)Yd^L?#Z5>g)UmbsV&%EWJ8rKk1l^bI
zpN*zf(u4lNv^TXlgF25QM`qIA4K`B;``y&kc(h&aC?XraK=vq{RHcAka}5*Z&1L4k
zwDkP*FV<omo@Khjp0Kp(N55&^=Zy{<DK8#B9SVE5Zgd)bgWg3fn^3Jd#{_NtAIo_Y
zQachi?HJfN+zZcMjUnqxjmXK?Gm_9f*N_{a^IU$E481rv00N}nB<M)eU<e(I1`bqg
zGUV;dnXFn2Foh@$&|;A=ft;l-PSJXiW5y!9>#~TTf)$~g6uii^+#ydeWLl<FEBoZX
zpYy%Cv{v2nv4WDiN%t*yik>?0A4;|I(zGJC_@++jZ-<V)OdnM4G68MFTmWYU#Ka-t
z!t=qK1o`(r-V52OWx$wWvew$YSl<pL{uzD!&Y0EsCOQf8B?_KW7?wc@McgoCGJB#C
z?zK-|<tGhwkwuj5k0xs@;S30WUA4O7oBf9J2If>V!H9$hVO-Onm#OJ^`1`8P*H(EI
zA*7Wl4)ln~@274u!Kur6M;nt;EMfc1J%ShqJ`*>%2h&O#f8#|3O}zF@-w!o9Q)Rxl
i8{pGqesAnLgAP$DRD8Z8Zv{S3g$}#^?F#@Yle7i(I~%G1

diff --git a/TeamExplorer.Common/UserSettings.cs b/TeamExplorer.Common/UserSettings.cs
index c6d0d0c..a4f6959 100644
--- a/TeamExplorer.Common/UserSettings.cs
+++ b/TeamExplorer.Common/UserSettings.cs
@@ -6,7 +6,7 @@ namespace TeamExplorer.Common
 {
     public static class UserSettings
     {
-        private const string CollectionPath = "GitFlowVSWithPR";
+        private const string CollectionPath = "GitFlowWithPRVS";
         public static IServiceProvider ServiceProvider { get; set; }
 
 

From 2e41985633a8835ececc8ff1e760e0d372e976ea Mon Sep 17 00:00:00 2001
From: Fernando De Mennato <fdemennato@progesoftware.it>
Date: Thu, 11 Jun 2020 21:20:56 +0200
Subject: [PATCH 2/3] Fix start vsix

---
 .github/workflows/CI.yml                          |   2 +-
 .github/workflows/Release.yml                     |   4 ++--
 .../GitFlowNavigationItem.cs                      |   2 +-
 .../GitFlowWithPR.VS.Extension.csproj             |   8 ++++----
 .../UI/InstallGitFlowUI.xaml                      |   2 +-
 .../source.extension.2015.vsixmanifest            |   4 ++--
 .../source.extension.2017.vsixmanifest            |   4 ++--
 .../source.extension.2019.vsixmanifest            |   6 +++---
 GitFlowWithPR.VS/GitFlowWithPR.VS.csproj          |   4 ++--
 GitFlowWithPR.VS/Key.snk                          | Bin 596 -> 0 bytes
 10 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 GitFlowWithPR.VS/Key.snk

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 0b2eb55..d3fbdd5 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -71,5 +71,5 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: GitFlow With PR ${{steps.gitversion.outputs.semVer}}.vsix
-          path: ${{ env.Extension_Project_Path }}\bin\${{ env.BuildConfiguration }}\GitFlowVS.2019.vsix 
+          path: ${{ env.Extension_Project_Path }}\bin\${{ env.BuildConfiguration }}\GitFlowWithPRVS.2019.vsix 
       
\ No newline at end of file
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index d00f5bd..0efdeb6 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -72,7 +72,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: GitFlow-With-PR-${{steps.gitversion.outputs.majorMinorPatch}}
-          path: ${{ env.Extension_Project_Path }}\bin\${{ env.BuildConfiguration }}\GitFlowVS.2019.vsix 
+          path: ${{ env.Extension_Project_Path }}\bin\${{ env.BuildConfiguration }}\GitFlowWithPRVS.2019.vsix 
       - name: upload README as artifact
         uses: actions/upload-artifact@v2
         with:
@@ -105,7 +105,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ env.Extension_Project_Path }}\bin\${{ env.BuildConfiguration }}\GitFlowVS.2019.vsix
+          asset_path: ${{ env.Extension_Project_Path }}\bin\${{ env.BuildConfiguration }}\GitFlowWithPRVS.2019.vsix
           asset_name: GitFlow With PR ${{steps.gitversion.outputs.semVer}}.vsix
           asset_content_type: application/zip          
 
diff --git a/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs b/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs
index c523a19..47b714d 100644
--- a/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs
+++ b/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs
@@ -9,7 +9,7 @@
 
 namespace GitFlowWithPRVS.Extension
 {
-    [TeamExplorerNavigationItem("80E09B6E-FD3E-4E9B-9894-A9DE8671F870", 1500, TargetPageId = "75EC888F-7549-4D9C-9967-4869A9AEDDDD")]
+    [TeamExplorerNavigationItem("59168500-14BC-4EE9-BB1F-7B2B970A4AF6", 1500, TargetPageId = "75EC888F-7549-4D9C-9967-4869A9AEDDDD")]
     public class GitFlowNavigationItem : TeamExplorerBaseNavigationItem
     {
         private readonly ITeamExplorer teamExplorer;
diff --git a/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj b/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
index a8c83b3..35aba9b 100644
--- a/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
+++ b/GitFlowWithPR.VS.Extension/GitFlowWithPR.VS.Extension.csproj
@@ -11,10 +11,10 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>14.0</OldToolsVersion>
-    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2013'">GitFlowVS.2013.vsix</TargetVsixContainerName>
-    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2015'">GitFlowVS.2015.vsix</TargetVsixContainerName>
-    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2017'">GitFlowVS.2017.vsix</TargetVsixContainerName>
-    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2019'">GitFlowVS.2019.vsix</TargetVsixContainerName>
+    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2013'">GitFlowWithPRVS.2013.vsix</TargetVsixContainerName>
+    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2015'">GitFlowWithPRVS.2015.vsix</TargetVsixContainerName>
+    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2017'">GitFlowWithPRVS.2017.vsix</TargetVsixContainerName>
+    <TargetVsixContainerName Condition="'$(Configuration)'=='VS2019'">GitFlowWithPRVS.2019.vsix</TargetVsixContainerName>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <PublishUrl>publish\</PublishUrl>
diff --git a/GitFlowWithPR.VS.Extension/UI/InstallGitFlowUI.xaml b/GitFlowWithPR.VS.Extension/UI/InstallGitFlowUI.xaml
index b9204a4..c1eecad 100644
--- a/GitFlowWithPR.VS.Extension/UI/InstallGitFlowUI.xaml
+++ b/GitFlowWithPR.VS.Extension/UI/InstallGitFlowUI.xaml
@@ -9,7 +9,7 @@
     
     <StackPanel Margin="10" Orientation="Vertical">
         <TextBlock Name="GitInstallation" TextWrapping="Wrap" Text="Could not locate Git for Windows on this machine. This is required by GitFlow. Please install it and try again" Visibility="Collapsed"></TextBlock>
-        <TextBlock Name="GitNoRepo" TextWrapping="Wrap" Text="Connect to a Git repo to start use the GitFlow extension" Visibility="Collapsed"></TextBlock>
+        <TextBlock Name="GitNoRepo" TextWrapping="Wrap" Text="Connect to a Git repo to start use the GitFlow With Pull Request extension" Visibility="Collapsed"></TextBlock>
         <TextBlock Name="GitFlowInstallation" TextWrapping="Wrap" Text="It looks like you don't have GitFlow or Azure-Cli installed. Let me do that for you"></TextBlock>
         <Button Name="GitFlowInstallationButton" Width="100px" Margin="0,10,0,0" Click="Button_Click" HorizontalAlignment="Left">Install</Button>
         <TextBlock Name="Error" Visibility="Hidden" Foreground="Red" FontStyle="Italic" Margin="0,10,0,0">An error occurred while configure GitFlow extension. Exit Code: {0}</TextBlock>
diff --git a/GitFlowWithPR.VS.Extension/source.extension.2015.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2015.vsixmanifest
index ae44da1..59aa624 100644
--- a/GitFlowWithPR.VS.Extension/source.extension.2015.vsixmanifest
+++ b/GitFlowWithPR.VS.Extension/source.extension.2015.vsixmanifest
@@ -19,7 +19,7 @@
         <Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" Version="[14.0,15.0)" />
     </Dependencies>
     <Assets>
-        <Asset Type="Microsoft.VisualStudio.VsPackage" Path="GitFlowVS.Extension.pkgdef" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" Path="GitFlowVS.Extension.dll" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" Path="GitFlowWithPRVS.Extension.pkgdef" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" Path="GitFlowWithPRVS.Extension.dll" />
     </Assets>
 </PackageManifest>
\ No newline at end of file
diff --git a/GitFlowWithPR.VS.Extension/source.extension.2017.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2017.vsixmanifest
index 602691d..2410eca 100644
--- a/GitFlowWithPR.VS.Extension/source.extension.2017.vsixmanifest
+++ b/GitFlowWithPR.VS.Extension/source.extension.2017.vsixmanifest
@@ -22,7 +22,7 @@
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
-        <Asset Type="Microsoft.VisualStudio.VsPackage" Path="GitFlowVS.Extension.pkgdef" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" Path="GitFlowVS.Extension.dll" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" Path="GitFlowWithPRVS.Extension.pkgdef" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" Path="GitFlowWithPRVS.Extension.dll" />
     </Assets>
 </PackageManifest>
\ No newline at end of file
diff --git a/GitFlowWithPR.VS.Extension/source.extension.2019.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2019.vsixmanifest
index 65baace..aaab03e 100644
--- a/GitFlowWithPR.VS.Extension/source.extension.2019.vsixmanifest
+++ b/GitFlowWithPR.VS.Extension/source.extension.2019.vsixmanifest
@@ -2,7 +2,7 @@
     <Metadata>
         <Identity Id="01FA6F71-CE26-4EB2-818F-A5E153ACB8D2" Version="1.0.0" Language="en-US" Publisher="Fernando De Mennato (Proge-Software)" />
         <DisplayName>GitFlow with Pull Request</DisplayName>
-        <Description xml:space="preserve">Integrates GitFlow with Pull Request  in Visual Studio 2019</Description>
+        <Description xml:space="preserve">Integrates GitFlow with Pull Request in Visual Studio 2019</Description>
         <MoreInfo>https://github.com/proge-software/GitFlow.VS</MoreInfo>
         <License>License.rtf</License>
         <GettingStartedGuide>http://blog.ehn.nu/2015/02/introducing-gitflow-for-visual-studio</GettingStartedGuide>
@@ -22,7 +22,7 @@
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
-        <Asset Type="Microsoft.VisualStudio.VsPackage" Path="GitFlowVS.Extension.pkgdef" />
-        <Asset Type="Microsoft.VisualStudio.MefComponent" Path="GitFlowVS.Extension.dll" />
+        <Asset Type="Microsoft.VisualStudio.VsPackage" Path="GitFlowWithPRVS.Extension.pkgdef" />
+        <Asset Type="Microsoft.VisualStudio.MefComponent" Path="GitFlowWithPRVS.Extension.dll" />
     </Assets>
 </PackageManifest>
\ No newline at end of file
diff --git a/GitFlowWithPR.VS/GitFlowWithPR.VS.csproj b/GitFlowWithPR.VS/GitFlowWithPR.VS.csproj
index c8cd4e3..eac6728 100644
--- a/GitFlowWithPR.VS/GitFlowWithPR.VS.csproj
+++ b/GitFlowWithPR.VS/GitFlowWithPR.VS.csproj
@@ -38,7 +38,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VS2013|AnyCPU'">
     <OutputPath>bin\VS2013\</OutputPath>
@@ -100,7 +101,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/GitFlowWithPR.VS/Key.snk b/GitFlowWithPR.VS/Key.snk
deleted file mode 100644
index d783e8b1fb9f323ef0fd50fc56eaf84ba6826f41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097p7lqx9b4+t!i}d;~DBZHn8kYKNqJ}vc
z(L1i&Kr}<jE3&yy(m3m}A5-Wce<1~!#qsx(J}G;<adCqSLW)#*3@eh_3T30WT3<kV
zg0d<wV6;IoTkl%fqXzF!nKqA(QU`mQj}K!)Yd^L?#Z5>g)UmbsV&%EWJ8rKk1l^bI
zpN*zf(u4lNv^TXlgF25QM`qIA4K`B;``y&kc(h&aC?XraK=vq{RHcAka}5*Z&1L4k
zwDkP*FV<omo@Khjp0Kp(N55&^=Zy{<DK8#B9SVE5Zgd)bgWg3fn^3Jd#{_NtAIo_Y
zQachi?HJfN+zZcMjUnqxjmXK?Gm_9f*N_{a^IU$E481rv00N}nB<M)eU<e(I1`bqg
zGUV;dnXFn2Foh@$&|;A=ft;l-PSJXiW5y!9>#~TTf)$~g6uii^+#ydeWLl<FEBoZX
zpYy%Cv{v2nv4WDiN%t*yik>?0A4;|I(zGJC_@++jZ-<V)OdnM4G68MFTmWYU#Ka-t
z!t=qK1o`(r-V52OWx$wWvew$YSl<pL{uzD!&Y0EsCOQf8B?_KW7?wc@McgoCGJB#C
z?zK-|<tGhwkwuj5k0xs@;S30WUA4O7oBf9J2If>V!H9$hVO-Onm#OJ^`1`8P*H(EI
zA*7Wl4)ln~@274u!Kur6M;nt;EMfc1J%ShqJ`*>%2h&O#f8#|3O}zF@-w!o9Q)Rxl
i8{pGqesAnLgAP$DRD8Z8Zv{S3g$}#^?F#@Yle7i(I~%G1


From 1773ca33e35b7619fd7fe942cc7ce821206bef54 Mon Sep 17 00:00:00 2001
From: Fernando De Mennato <fdemennato@progesoftware.it>
Date: Thu, 11 Jun 2020 21:29:48 +0200
Subject: [PATCH 3/3] Code review

---
 GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs | 2 +-
 GitFlowWithPR.VS.Extension/Guids.cs                 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs b/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs
index 47b714d..52a19cc 100644
--- a/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs
+++ b/GitFlowWithPR.VS.Extension/GitFlowNavigationItem.cs
@@ -9,7 +9,7 @@
 
 namespace GitFlowWithPRVS.Extension
 {
-    [TeamExplorerNavigationItem("59168500-14BC-4EE9-BB1F-7B2B970A4AF6", 1500, TargetPageId = "75EC888F-7549-4D9C-9967-4869A9AEDDDD")]
+    [TeamExplorerNavigationItem(GuidList.GitFlowNavigationItem, 1500, TargetPageId = GuidList.GitFlowPage)]
     public class GitFlowNavigationItem : TeamExplorerBaseNavigationItem
     {
         private readonly ITeamExplorer teamExplorer;
diff --git a/GitFlowWithPR.VS.Extension/Guids.cs b/GitFlowWithPR.VS.Extension/Guids.cs
index a492523..fcc9ec5 100644
--- a/GitFlowWithPR.VS.Extension/Guids.cs
+++ b/GitFlowWithPR.VS.Extension/Guids.cs
@@ -5,7 +5,9 @@ namespace GitFlowWithPRVS.Extension
     static class GuidList
     {
         public const string GuidGitFlowWithPRVsExtensionPkgString = "ee0e74b0-16d2-44aa-ad97-6c10f0bb2942";
-        
+
+        public const string GitFlowNavigationItem = "80E09B6E-FD3E-4E9B-9894-A9DE8671F870";
+
         public const string GitFlowPage = "75EC888F-7549-4D9C-9967-4869A9AEDDDD";
         public const string GitFlowActionSection = "6DACB452-3D08-492E-892B-E54E87456888";
         public const string GitFlowFeaturesSection = "91A711C0-CF48-4354-9005-266E0CF9A4EC";