diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs index 669b3bc82..8a5c4f699 100644 --- a/CommonAssemblyInfo.cs +++ b/CommonAssemblyInfo.cs @@ -19,6 +19,6 @@ // Build Number // Revision // -[assembly: AssemblyVersion("2.50")] -[assembly: AssemblyFileVersion("2.50")] -[assembly: AssemblyInformationalVersion("2.50.00")] +[assembly: AssemblyVersion("2.50.01")] +[assembly: AssemblyFileVersion("2.50.01")] +[assembly: AssemblyInformationalVersion("2.50.01")] diff --git a/GitExtSshAskPass/SshAskPass.rc2 b/GitExtSshAskPass/SshAskPass.rc2 index d35e13f8c..355e0c5ce 100644 --- a/GitExtSshAskPass/SshAskPass.rc2 +++ b/GitExtSshAskPass/SshAskPass.rc2 @@ -13,8 +13,8 @@ // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,50,0,0 - PRODUCTVERSION 2,50,0,0 + FILEVERSION 2,50,01,0 + PRODUCTVERSION 2,50,01,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -30,12 +30,12 @@ BEGIN BLOCK "040904B0" BEGIN VALUE "FileDescription", "Git Extensions" - VALUE "FileVersion", "2.50" + VALUE "FileVersion", "2.50.01" VALUE "InternalName", "Git Extensions" VALUE "LegalCopyright", "Copyright 2013-2017" VALUE "OriginalFilename", "GitExtSshAskPass.exe" VALUE "ProductName", "Git Extensions" - VALUE "ProductVersion", "2.50.00" + VALUE "ProductVersion", "2.50.01" END END BLOCK "VarFileInfo" diff --git a/GitExtensionsShellEx/GitExtensionsShellEx.rc b/GitExtensionsShellEx/GitExtensionsShellEx.rc index 62234656d..961a6cec2 100644 --- a/GitExtensionsShellEx/GitExtensionsShellEx.rc +++ b/GitExtensionsShellEx/GitExtensionsShellEx.rc @@ -50,8 +50,8 @@ IDI_ICONCREATEREPOSITORY ICON "Resources\\IconRepoCreate.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,50,0,0 - PRODUCTVERSION 2,50,0,0 + FILEVERSION 2,50,01,0 + PRODUCTVERSION 2,50,01,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -67,12 +67,12 @@ BEGIN BLOCK "040904B0" BEGIN VALUE "FileDescription", "Git Extensions" - VALUE "FileVersion", "2.50" + VALUE "FileVersion", "2.50.01" VALUE "InternalName", "Git Extensions" VALUE "LegalCopyright", "Copyright 2008-2017" VALUE "OriginalFilename", "GitExtensionsShellEx.dll" VALUE "ProductName", "Git Extensions" - VALUE "ProductVersion", "2.50.00" + VALUE "ProductVersion", "2.50.01" END END BLOCK "VarFileInfo" diff --git a/GitExtensionsVSIX/source.extension.vsixmanifest b/GitExtensionsVSIX/source.extension.vsixmanifest index 796b1c99c..81472985b 100644 --- a/GitExtensionsVSIX/source.extension.vsixmanifest +++ b/GitExtensionsVSIX/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + GitExtensions Git Extensions is a graphical user interface for Git that allows you to control Git without using the command-line http://gitextensions.github.io/ diff --git a/GitUI/Resources/ChangeLog.md b/GitUI/Resources/ChangeLog.md index ceb9e906c..ed3a9f2aa 100644 --- a/GitUI/Resources/ChangeLog.md +++ b/GitUI/Resources/ChangeLog.md @@ -1,5 +1,15 @@ Changelog ========= +### [Version 2.50.01] (07 July 2017) + +#### Fixes: +* Push branch with no upstream defaults to first remote and not to "origin" - Issue [3821] +* [Bug] after 2.50 unable to use "Revert selected lines" from commit window - Issue [3819] +* [Bug / Regression] It is not possible to run an external difftool (F3) in the diff view of "Commit index / Current unstaged changes" - Issue [3814] +* Merge Conflict contextmenu items are disabled in 2.5.0 - Issue [3809] +* GitExtensions gives continuous System.ArgumentNullException - Issue [3806] +* SEG FAULT on every git operation. - Issue [3804] +* Amend Commit is not working in Version 2.5 - Issue [3786] ### [Version 2.50] (23 June 2017) @@ -1873,4 +1883,13 @@ Changelog [3761]:https://github.com/gitextensions/gitextensions/issues/3761 [3755]:https://github.com/gitextensions/gitextensions/issues/3755 -[3762]:https://github.com/gitextensions/gitextensions/pull/3762 \ No newline at end of file +[3762]:https://github.com/gitextensions/gitextensions/pull/3762 + +[Version 2.50.01]:https://github.com/gitextensions/gitextensions/releases/tag/v2.50.01 +[3821]:https://github.com/gitextensions/gitextensions/issues/3821 +[3819]:https://github.com/gitextensions/gitextensions/issues/3819 +[3814]:https://github.com/gitextensions/gitextensions/issues/3814 +[3809]:https://github.com/gitextensions/gitextensions/issues/3809 +[3806]:https://github.com/gitextensions/gitextensions/issues/3806 +[3804]:https://github.com/gitextensions/gitextensions/issues/3804 +[3786]:https://github.com/gitextensions/gitextensions/issues/3786 diff --git a/Setup/MakeInstallers.cmd b/Setup/MakeInstallers.cmd index bb3d0d50c..b960fd768 100644 --- a/Setup/MakeInstallers.cmd +++ b/Setup/MakeInstallers.cmd @@ -6,8 +6,8 @@ rem rem Update this version number with every release rem setlocal -set version=2.50.00 -set numericVersion=2.50 +set version=2.50.01 +set numericVersion=2.50.01 if not "%APPVEYOR_BUILD_VERSION%"=="" ( set version=%APPVEYOR_BUILD_VERSION% set numericVersion=%APPVEYOR_BUILD_VERSION% diff --git a/Setup/MakeMonoArchive.cmd b/Setup/MakeMonoArchive.cmd index bf39f53fd..fd4823310 100644 --- a/Setup/MakeMonoArchive.cmd +++ b/Setup/MakeMonoArchive.cmd @@ -8,7 +8,7 @@ rem rem Update this version number with every release rem setlocal -set version=2.50.00 +set version=2.50.01 if not "%APPVEYOR_BUILD_VERSION%"=="" set version=%APPVEYOR_BUILD_VERSION% set normal=GitExtensions-%version%-Mono.zip set szip="..\packages\7-Zip.CommandLine.9.20.0\tools\7za" diff --git a/appveyor.yml b/appveyor.yml index 903d86b21..67aeed01f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 2.50.00.{build} +version: 2.50.01.{build} os: Visual Studio 2015