From e560f90c6f2f43fb001a38f96ffb9ae77165330b Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 21 Jun 2023 11:32:31 -0400
Subject: [PATCH 1/3] Fix incorrect Discord embed error messages

---
 .../Components/Chat/Providers/DiscordProvider.cs              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
index 1fbdf6ed53..3aa001dbc3 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
@@ -975,7 +975,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 						embedErrors.Add(
 							String.Format(
 								CultureInfo.InvariantCulture,
-								"Null or whitespace field author at index {0}!",
+								"Null or whitespace field name at index {0}!",
 								i));
 						invalid = true;
 					}
@@ -985,7 +985,7 @@ namespace Tgstation.Server.Host.Components.Chat.Providers
 						embedErrors.Add(
 							String.Format(
 								CultureInfo.InvariantCulture,
-								"Null or whitespace field author at index {0}!",
+								"Null or whitespace field value at index {0}!",
 								i));
 						invalid = true;
 					}

From 0bcf6b1a7f12b315bbdb72ef7257f296a93bb528 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 21 Jun 2023 11:34:02 -0400
Subject: [PATCH 2/3] Fix potential deadlock when a directory copy gets
 cancelled

---
 src/Tgstation.Server.Host/IO/DefaultIOManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/IO/DefaultIOManager.cs b/src/Tgstation.Server.Host/IO/DefaultIOManager.cs
index 85dd4ce31d..ed4d5532d0 100644
--- a/src/Tgstation.Server.Host/IO/DefaultIOManager.cs
+++ b/src/Tgstation.Server.Host/IO/DefaultIOManager.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
+using Tgstation.Server.Host.Extensions;
 using Tgstation.Server.Host.Utils;
 
 namespace Tgstation.Server.Host.IO
@@ -387,7 +388,7 @@ namespace Tgstation.Server.Host.IO
 
 				async Task CopyThisFile()
 				{
-					await subdirCreationTask;
+					await subdirCreationTask.WithToken(cancellationToken);
 					using var lockContext = semaphore != null
 						? await SemaphoreSlimContext.Lock(semaphore, cancellationToken)
 						: null;

From 581c06bb16ff1296fa3d306889de3ce21a587bf0 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Wed, 21 Jun 2023 18:39:59 -0400
Subject: [PATCH 3/3] Remove unnecessary manifest entry

---
 src/Tgstation.Server.Host/manifest.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/manifest.xml b/src/Tgstation.Server.Host/manifest.xml
index 6374470a86..5173bf8331 100644
--- a/src/Tgstation.Server.Host/manifest.xml
+++ b/src/Tgstation.Server.Host/manifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-	<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
 		<security>
 			<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">