Merge branch 'release/v1.7.29'

proge-software · Jun 11, 2020 · 6890e35 · 6890e35
2 parents 15af24c + 1773ca3
commit 6890e35
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 33 deletions.
diff --git 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 
 
diff --git 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/GitFlow.VS.sln.DotSettings b/GitFlow.VS.sln.DotSettings
diff --git 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/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(GuidList.GitFlowNavigationItem, 1500, TargetPageId = GuidList.GitFlowPage)]
     public class GitFlowNavigationItem : TeamExplorerBaseNavigationItem
     {
         private readonly ITeamExplorer teamExplorer;

diff --git 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
@@ -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>
@@ -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
@@ -4,10 +4,9 @@ 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 const string GuidGitFlowWithPRVsExtensionPkgString = "ee0e74b0-16d2-44aa-ad97-6c10f0bb2942";
 
-        public static readonly Guid GuidGitFlowWithPRVsExtensionCmdSet = new Guid(GuidGitFlowWithPRVsExtensionCmdSetString);
+        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";

diff --git a/GitFlowWithPR.VS.Extension/Key.snk b/GitFlowWithPR.VS.Extension/Key.snk
diff --git 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
@@ -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>
diff --git 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>
diff --git 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>
diff --git 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
diff --git 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; }