From 4ee06717e51fe97a1ba9cdbb742870c8d9b2ce80 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 8 Oct 2024 19:12:15 -0400 Subject: [PATCH 1/4] Bump webpanel to 6.4.0 --- build/WebpanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/WebpanelVersion.props b/build/WebpanelVersion.props index 017492de5d..d3c0595003 100644 --- a/build/WebpanelVersion.props +++ b/build/WebpanelVersion.props @@ -1,6 +1,6 @@ - 6.3.0 + 6.4.0 From e95361ed1fc1c0c5c0b93a36f92fe5a96c33d336 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 8 Oct 2024 19:18:31 -0400 Subject: [PATCH 2/4] Pre-empt the patch tuesday PRs --- .../Tgstation.Server.Api.csproj | 2 +- .../Tgstation.Server.Client.csproj | 4 ++-- .../Tgstation.Server.Host.Console.csproj | 4 ++-- .../Tgstation.Server.Host.Service.csproj | 8 ++++---- .../Tgstation.Server.Host.Watchdog.csproj | 2 +- .../Tgstation.Server.Host.csproj | 14 +++++++------- .../Tgstation.Server.Shared.csproj | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj index 129035ad21..73092b2ba6 100644 --- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj +++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj index 3bca360847..5046c091a8 100644 --- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index a405553d55..ff23533a16 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -12,9 +12,9 @@ - + - + diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 5dd0bd9553..417e03092c 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -20,15 +20,15 @@ - + - + - + - + diff --git a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj index 04f187c08e..dad6a14454 100644 --- a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj +++ b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index c97953fa70..c7fbcf9007 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -114,21 +114,21 @@ - + - + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive - + - + @@ -156,7 +156,7 @@ - + diff --git a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj index 7ca42e280a..14c6e89981 100644 --- a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj +++ b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj @@ -10,7 +10,7 @@ - + From e4ce4aecc489391913ebc1c200e934389f150b64 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 8 Oct 2024 19:20:36 -0400 Subject: [PATCH 3/4] Update to HotChocolate 14RC3 --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index c7fbcf9007..23c527b527 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -102,15 +102,15 @@ - + - + - + - + - + From e4d64d6954229e30a31adccc86d0611e2366eca3 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 8 Oct 2024 19:32:19 -0400 Subject: [PATCH 4/4] Fix dotnet-ef version --- src/Tgstation.Server.Host/.config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/.config/dotnet-tools.json b/src/Tgstation.Server.Host/.config/dotnet-tools.json index a3847dcdfb..6b7095305f 100644 --- a/src/Tgstation.Server.Host/.config/dotnet-tools.json +++ b/src/Tgstation.Server.Host/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "8.0.8", + "version": "8.0.10", "commands": [ "dotnet-ef" ]