From 65d9785c240cda3f124fa24725fb56d8f2bff614 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 20 Oct 2023 21:41:14 -0400
Subject: [PATCH 1/3] Fix merge build errors

---
 tests/Tgstation.Server.Tests/Live/TestLiveServer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
index 358d20edb72..260a9c457d2 100644
--- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
+++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -1027,7 +1027,7 @@ await ioManager.CopyDirectory(
 							if (postWriteHandler.NeedsPostWrite(src))
 								postWriteHandler.HandleWrite(dest);
 
-							return Task.CompletedTask;
+							return ValueTask.CompletedTask;
 						},
 						ioManager.ConcatPath(
 							localRepoPath,
@@ -1080,7 +1080,7 @@ async ValueTask RunGitCommand(string args)
 					jobWaitTask = jobsTest.WaitForJob(repoResponse.ActiveJob, 300, false, null, cancellationToken);
 				}
 
-				await Task.WhenAll(jobWaitTask, ddUpdateTask, dmUpdateTask);
+				await Task.WhenAll(jobWaitTask, ddUpdateTask.AsTask(), dmUpdateTask.AsTask());
 
 				var depsBytesTask = ioManager.ReadAllBytes(
 					ioManager.ConcatPath(repoPath, "dependencies.sh"),
@@ -1093,7 +1093,7 @@ async ValueTask RunGitCommand(string args)
 						if (postWriteHandler.NeedsPostWrite(src))
 							postWriteHandler.HandleWrite(dest);
 
-						return Task.CompletedTask;
+						return ValueTask.CompletedTask;
 					},
 					ioManager.ConcatPath(
 						repoPath,
@@ -1120,7 +1120,7 @@ async ValueTask RunGitCommand(string args)
 
 				var byondJobTask = jobsTest.WaitForJob(byondJob.InstallJob, 60, false, null, cancellationToken);
 
-				await Task.WhenAll(scriptsCopyTask, byondJobTask);
+				await Task.WhenAll(scriptsCopyTask.AsTask(), byondJobTask);
 
 				var compileJob = await instanceClient.DreamMaker.Compile(cancellationToken);
 

From 232aa679c2f50475c098a3cff25d36a340899e98 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 20 Oct 2023 19:46:39 -0400
Subject: [PATCH 2/3] Version bump client and common library versions

---
 build/Version.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index ae9b61b8d14..b2f8d5265bd 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -6,9 +6,9 @@
     <TgsCoreVersion>5.16.2</TgsCoreVersion>
     <TgsConfigVersion>4.7.1</TgsConfigVersion>
     <TgsApiVersion>9.12.0</TgsApiVersion>
-    <TgsCommonLibraryVersion>6.0.1</TgsCommonLibraryVersion>
+    <TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
     <TgsApiLibraryVersion>11.1.2</TgsApiLibraryVersion>
-    <TgsClientVersion>12.1.2</TgsClientVersion>
+    <TgsClientVersion>13.0.0</TgsClientVersion>
     <TgsDmapiVersion>6.5.3</TgsDmapiVersion>
     <TgsInteropVersion>5.6.1</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.4.0</TgsHostWatchdogVersion>

From 6d674a71c1d298b19292697bbf524d74f285f65e Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 20 Oct 2023 19:56:54 -0400
Subject: [PATCH 3/3] Add explicit dependency on common csproj to client

---
 src/Tgstation.Server.Client/Tgstation.Server.Client.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
index af89800112b..6868098fa69 100644
--- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
@@ -11,6 +11,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Tgstation.Server.Api\Tgstation.Server.Api.csproj" />
+    <ProjectReference Include="..\Tgstation.Server.Common\Tgstation.Server.Common.csproj" /> <!-- Needed for explicit nuget versioning -->
   </ItemGroup>
 
 </Project>