From 79d7d929fe7c1ae93cc47332c27062953cf636e5 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 13 Oct 2023 21:14:57 -0400 Subject: [PATCH 1/2] Nuget package updates --- build/TestCommon.props | 4 ++-- build/Version.props | 2 +- .../Tgstation.Server.Host.csproj | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/TestCommon.props b/build/TestCommon.props index 4e1b3add13b..5ee30f11474 100644 --- a/build/TestCommon.props +++ b/build/TestCommon.props @@ -8,12 +8,12 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/build/Version.props b/build/Version.props index a9f9f2dd7c0..ae9b61b8d14 100644 --- a/build/Version.props +++ b/build/Version.props @@ -17,7 +17,7 @@ netstandard2.0 6 - https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.22/dotnet-hosting-6.0.22-win.exe + https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.23/dotnet-hosting-6.0.23-win.exe 10.11.5 https://ftp.osuosl.org/pub/mariadb//mariadb-10.11.5/winx64-packages/mariadb-10.11.5-winx64.msi diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index ea827e234e6..f2844ae82bc 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -75,19 +75,19 @@ - + - + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive - + - + @@ -95,7 +95,7 @@ - + @@ -121,7 +121,7 @@ - + From 3740c4d89388ce3c0d62807a41cb0502941028e9 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 14 Oct 2023 14:02:14 -0400 Subject: [PATCH 2/2] Update webpanel version --- build/ControlPanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ControlPanelVersion.props b/build/ControlPanelVersion.props index 375980c5027..c2a4c37602f 100644 --- a/build/ControlPanelVersion.props +++ b/build/ControlPanelVersion.props @@ -1,6 +1,6 @@ - 4.25.2 + 4.25.5