cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 21:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server
2023-06-22 01:32:50 +00:00
parent 59eeebb640 b52bdee866
commit 4cf8d7ff84
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/Providers/DiscordProvider.cs
+2 -2
View File
@@ -962,7 +962,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;
}
@@ -972,7 +972,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;
}
src/Tgstation.Server.Host/IO/DefaultIOManager.cs
+2 -1
View File
@@ -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
@@ -388,7 +389,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;
src/Tgstation.Server.Host/manifest.xml
-1
View File
@@ -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">