From 7d2d407da71dd73fa3042269b85dc56a2c84a251 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 13 Nov 2017 12:10:14 -0500 Subject: [PATCH 1/2] Fixes pull request merging --- TGServerService/ServerInstance/Repository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TGServerService/ServerInstance/Repository.cs b/TGServerService/ServerInstance/Repository.cs index 993da4654b..fcf15b57f5 100644 --- a/TGServerService/ServerInstance/Repository.cs +++ b/TGServerService/ServerInstance/Repository.cs @@ -928,7 +928,7 @@ namespace TGServerService } //so we'll know if this fails - var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Config.Name)); + var Result = MergeBranch(atSHA ?? LocalBranchName, String.Format("Test merge commit for pull request #{0}{1}Server Instance: {2}", PRNumber, Environment.NewLine, Config.Name)); if (Result == null) try From 99200ce130999547f3ca87760ad611439741532b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 13 Nov 2017 12:19:21 -0500 Subject: [PATCH 2/2] Version bump to 3.2.0.6 [TGSDeploy] --- AssemblyInfo.global.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AssemblyInfo.global.cs b/AssemblyInfo.global.cs index 2e9b5ff98f..614572a360 100644 --- a/AssemblyInfo.global.cs +++ b/AssemblyInfo.global.cs @@ -3,8 +3,8 @@ using System.Runtime.CompilerServices; //You cannot one definition the version number //Believe me, I've tried, the compiler hates it so much -[assembly: AssemblyVersion("3.2.0.5")] -[assembly: AssemblyFileVersion("3.2.0.5")] -[assembly: AssemblyInformationalVersion("3.2.0.5")] +[assembly: AssemblyVersion("3.2.0.6")] +[assembly: AssemblyFileVersion("3.2.0.6")] +[assembly: AssemblyInformationalVersion("3.2.0.6")] [assembly: InternalsVisibleTo("TGServiceTests")]