Merge branch 'release/v1.7.28'

proge-software · Jun 10, 2020 · 15af24c · 15af24c
2 parents 960fe79 + 7051bf1
commit 15af24c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git 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("80E09B6E-FD3E-4E9B-9894-A9DE8671F870", 1500, TargetPageId = "75EC888F-7549-4D9C-9967-4869A9AEDDDD")]
     public class GitFlowNavigationItem : TeamExplorerBaseNavigationItem
     {
         private readonly ITeamExplorer teamExplorer;

diff --git a/GitFlowWithPR.VS.Extension/source.extension.2013.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2013.vsixmanifest
@@ -2,7 +2,7 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
         <Identity Id="632375AC-F19B-4F7F-87C8-932B37D45CF2" Version="1.0.0" Language="en-US" Publisher="Fernando De Mennato" />
-        <DisplayName>GitFlow with PR for Visual Studio 2013</DisplayName>
+        <DisplayName>GitFlow with Pull Request</DisplayName>
         <Description xml:space="preserve">Integrates GitFlow with PR in Visual Studio Team Explorer 2013. Requires VS 2013 Update 3 or higher</Description>
         <MoreInfo>https://github.com/proge-software/GitFlow.VS</MoreInfo>
         <License>License.rtf</License>

diff --git a/GitFlowWithPR.VS.Extension/source.extension.2015.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2015.vsixmanifest
@@ -1,8 +1,8 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
         <Identity Id="DA8B7280-9135-446D-8842-B747C35EA730" Version="1.0.0" Language="en-US" Publisher="Fernando De Mennato" />
-        <DisplayName>GitFlow with PR for Visual Studio 2015</DisplayName>
-        <Description xml:space="preserve">Integrates GitFlow with PR in Visual Studio Team Explorer 2015</Description>
+        <DisplayName>GitFlow with Pull Request</DisplayName>
+        <Description xml:space="preserve">Integrates GitFlow with Pull Request in Visual Studio Team Explorer 2015</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>

diff --git a/GitFlowWithPR.VS.Extension/source.extension.2017.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2017.vsixmanifest
@@ -1,8 +1,8 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
         <Identity Id="B6AC18BB-1C07-402A-9DD6-AA2B0DBFA201" Version="1.0.0" Language="en-US" Publisher="Fernando De Mennato" />
-        <DisplayName>GitFlow with PR for Visual Studio 2017</DisplayName>
-        <Description xml:space="preserve">Integrates GitFlow with PR in Visual Studio 2017</Description>
+        <DisplayName>GitFlow with Pull Request</DisplayName>
+        <Description xml:space="preserve">Integrates GitFlow with Pull Request in Visual Studio 2017</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>

diff --git a/GitFlowWithPR.VS.Extension/source.extension.2019.vsixmanifest b/GitFlowWithPR.VS.Extension/source.extension.2019.vsixmanifest
@@ -1,14 +1,15 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
         <Identity Id="01FA6F71-CE26-4EB2-818F-A5E153ACB8D2" Version="1.0.0" Language="en-US" Publisher="Fernando De Mennato (Proge-Software)" />
-        <DisplayName>GitFlow with PR for Visual Studio 2019</DisplayName>
-        <Description xml:space="preserve">Integrates GitFlow with PR  in Visual Studio 2019</Description>
+        <DisplayName>GitFlow with Pull Request</DisplayName>
+        <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>
         <Icon>icon.png</Icon>
         <PreviewImage>icon.png</PreviewImage>
         <Tags>VisualStudio Git GitFlow PullRequest TeamExplorer</Tags>
+        <Preview>true</Preview>
     </Metadata>
     <Installation>
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />