Maintenance release 2.51.03

* Update versions * Update changelog * Update contributors
gitextensions · Jun 26, 2018 · c4ac0de · c4ac0de
1 parent 82aace5
commit c4ac0de
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 28 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -19,6 +19,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.51.02")]
-[assembly: AssemblyFileVersion("2.51.02")]
-[assembly: AssemblyInformationalVersion("2.51.02")]
+[assembly: AssemblyVersion("2.51.03")]
+[assembly: AssemblyFileVersion("2.51.03")]
+[assembly: AssemblyInformationalVersion("2.51.03")]
diff --git a/GitExtSshAskPass/SshAskPass.rc2 b/GitExtSshAskPass/SshAskPass.rc2
@@ -13,8 +13,8 @@
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,51,02,0
- PRODUCTVERSION 2,51,02,0
+ FILEVERSION 2,51,03,0
+ PRODUCTVERSION 2,51,03,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -30,12 +30,12 @@ BEGIN
         BLOCK "040904B0"
         BEGIN
             VALUE "FileDescription", "Git Extensions"
-            VALUE "FileVersion", "2.51.02"
+            VALUE "FileVersion", "2.51.03"
             VALUE "InternalName", "Git Extensions"
             VALUE "LegalCopyright", "Copyright 2013-2018"
             VALUE "OriginalFilename", "GitExtSshAskPass.exe"
             VALUE "ProductName", "Git Extensions"
-            VALUE "ProductVersion", "2.51.02"
+            VALUE "ProductVersion", "2.51.03"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/GitExtensionsDoc b/GitExtensionsDoc
diff --git a/GitExtensionsShellEx/GitExtensionsShellEx.rc b/GitExtensionsShellEx/GitExtensionsShellEx.rc
@@ -50,8 +50,8 @@ IDI_ICONCREATEREPOSITORY ICON                   "Resources\\IconRepoCreate.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,51,02,0
- PRODUCTVERSION 2,51,02,0
+ FILEVERSION 2,51,03,0
+ PRODUCTVERSION 2,51,03,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,12 +67,12 @@ BEGIN
         BLOCK "040904B0"
         BEGIN
             VALUE "FileDescription", "Git Extensions"
-            VALUE "FileVersion", "2.51.02"
+            VALUE "FileVersion", "2.51.03"
             VALUE "InternalName", "Git Extensions"
             VALUE "LegalCopyright", "Copyright 2008-2018"
             VALUE "OriginalFilename", "GitExtensionsShellEx.dll"
             VALUE "ProductName", "Git Extensions"
-            VALUE "ProductVersion", "2.51.02"
+            VALUE "ProductVersion", "2.51.03"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/GitExtensionsVSIX/source.extension.vsixmanifest b/GitExtensionsVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-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 Publisher="GitExt Team" Version="2.51.02" Language="en-US" Id="GitExtensions..550013F4-337C-4750-8967-DDEEEC2EB497" />
+        <Identity Publisher="GitExt Team" Version="2.51.03" Language="en-US" Id="GitExtensions..550013F4-337C-4750-8967-DDEEEC2EB497" />
         <DisplayName>GitExtensions</DisplayName>
         <Description xml:space="preserve" >Git Extensions is a graphical user interface for Git that allows you to control Git without using the command-line</Description>
         <MoreInfo>http://gitextensions.github.io/</MoreInfo>

diff --git a/GitUI/Properties/Resources.resx b/GitUI/Properties/Resources.resx
@@ -676,7 +676,7 @@ EbenZhang, Erik Leo, Gabriele Pongelli, GavriYashar, Gerhard Olsson, Julius Vitk
 Katelyn Gigante, Levente Koncz, Lucas Trzesniewski, Lysogorskiy Aleksey, Matt Si, Matthias Serfling,
 Oleksandr Redko, Ondrej Novak, Orgad Shaneh, RaMMicHaeL, Rui Lopes, Sebastien ROBERT, Tao Gomez Gil,
 agabden, crypto_rsa, gpongelli, ierof, leak, liiws, mserfli, palver123, Andrey Helldar, Evgeny Morozov, Vladimir Shimanskiy,
-aivanov-oneinc, chun, pmme, Ákos Szabados, Glen Nicol, Szali Szali</value>
+aivanov-oneinc, chun, pmme, Ákos Szabados, Glen Nicol, Szali Szali, Michael Seibt, Michael Werle, Mihai Pantea, Ori Ashual</value>
   </data>
   <data name="Designers" xml:space="preserve">
     <value>Andréj Telle, Oliver Friedrich</value>

diff --git a/GitUI/Resources/ChangeLog.md b/GitUI/Resources/ChangeLog.md
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+### [Version 2.51.03] (26 June 2018)
+
+#### Features:
+* Set recommended version Git version to 2.17.1 - PR [5095]
+* RTF round-trip bug causes System.ArgumentException: File format is not valid - Issue [5005]
+* Recheck filter against displayed file name when working in the fileNameOnlyMode mode. - Issue [4991]
+* Crash on opening repository in Recent list. - Issue [4549]
+* Add Atom Editor to Git Config section - Issue [2507]
+
+#### Fixes:
+* Repository init dialog shows incorrect location - Issue [5107]
+* Git-status in the background should use --no-optional-locks - Issue [5066]
+* Typing 'b' or 'h' into the Diff Filter Files text box doesn't insert the character - Issue [5065]
+* Customized window size is not kept - Issue [5021]
+* Commit index count dissapears on refresh - Issue [4483]
+
+
 ### [Version 2.51.02] (24 May 2018)
 
 #### Highlights:
@@ -2531,3 +2548,16 @@ Changelog
 [4174]:https://github.com/gitextensions/gitextensions/issues/4174
 [4099]:https://github.com/gitextensions/gitextensions/issues/4099
 [3828]:https://github.com/gitextensions/gitextensions/issues/3828
+
+
+[Version 2.51.03]:https://github.com/gitextensions/gitextensions/releases/tag/v2.51.03
+[5107]:https://github.com/gitextensions/gitextensions/issues/5107
+[5095]:https://github.com/gitextensions/gitextensions/pull/5095
+[5066]:https://github.com/gitextensions/gitextensions/issues/5066
+[5065]:https://github.com/gitextensions/gitextensions/issues/5065
+[5021]:https://github.com/gitextensions/gitextensions/issues/5021
+[5005]:https://github.com/gitextensions/gitextensions/issues/5005
+[4991]:https://github.com/gitextensions/gitextensions/issues/4991
+[4549]:https://github.com/gitextensions/gitextensions/issues/4549
+[4483]:https://github.com/gitextensions/gitextensions/issues/4483
+[2507]:https://github.com/gitextensions/gitextensions/issues/2507
diff --git a/Setup/MakeInstallers.cmd b/Setup/MakeInstallers.cmd
@@ -4,8 +4,8 @@ rem
 rem Update this version number with every release
 rem
 setlocal
-set version=2.51.02
-set numericVersion=2.51.02
+set version=2.51.03
+set numericVersion=2.51.03
 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
@@ -6,7 +6,7 @@ rem
 rem Update this version number with every release
 rem
 setlocal
-set version=2.51.02
+set version=2.51.03
 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/Setup/Prepare-Release.ps1 b/Setup/Prepare-Release.ps1
@@ -4,11 +4,11 @@
 
 [CmdletBinding()]
 Param(
-    #[Parameter(Mandatory=$True, Position=1)]
+    [Parameter(Mandatory=$True, Position=1)]
     [string] $oldVersion,
-    #[Parameter(Mandatory=$True, Position=2)]
+    [Parameter(Mandatory=$True, Position=2)]
     [string] $newVersion,
-    #[Parameter(Mandatory=$True, Position=3)]
+    [Parameter(Mandatory=$True, Position=3)]
     [string] $milestones
 )
 
@@ -68,19 +68,19 @@ function Generate-Changelog {
 		$issueLinks += "[$($issue.number)]:$($issue.html_url)"
 	}
 
-	"### Version $milestoneTitle ($milestoneDue)" | Out-File $changelogFile
-	"`r`n#### Features:" | Out-File $changelogFile -Append
+	"### Version $milestoneTitle ($milestoneDue)" | Out-File $changelogFile -Encoding utf8
+	"`r`n#### Features:" | Out-File $changelogFile -Append -Encoding utf8
 	$pullrequests | ForEach-Object {
 		$issue = $_;
-		"* $($issue.title) - $($issue.customTitle) [$($issue.number)]" | Out-File $changelogFile -Append
+		"* $($issue.title) - $($issue.customTitle) [$($issue.number)]" | Out-File $changelogFile -Append -Encoding utf8
 	}
-	"`r`n#### Fixes:" | Out-File $changelogFile -Append
+	"`r`n#### Fixes:" | Out-File $changelogFile -Append -Encoding utf8
 	$issues | ForEach-Object {
 		$issue = $_;
-		"* $($issue.title) - $($issue.customTitle) [$($issue.number)]" | Out-File $changelogFile -Append
+		"* $($issue.title) - $($issue.customTitle) [$($issue.number)]" | Out-File $changelogFile -Append -Encoding utf8
 	}
-	"`r`n" | Out-File $changelogFile -Append
-	$issueLinks | Out-File $changelogFile -Append
+	"`r`n" | Out-File $changelogFile -Append -Encoding utf8
+	$issueLinks | Out-File $changelogFile -Append -Encoding utf8
 }
 
 function Update-Contributors {
@@ -95,6 +95,7 @@ function Update-Contributors {
     # \r=13, \n=10, comma=44
     $contributors = $rawContributors.Split(13, 10, 44).Trim() | Where { $_ } 
 
+    [Console]::OutputEncoding = [Text.UTF8Encoding]::UTF8
     $cmd = "git shortlog v$originalVersion..HEAD -s --no-merges";
     Write-Host "Getting contributors by running: $cmd";
     $result = iex $cmd
@@ -205,7 +206,7 @@ try {
     Write-Host ----------------------------------------------------------------------
     # preparing the build artifacts
     $env:SKIP_PAUSE=1
-    .\BuildInstallers.VS2015.cmd
+    .\BuildInstallers.VS2017.cmd
 
     Write-Host ----------------------------------------------------------------------
     Write-Host Package PDBs