From 7bebd915df5fdc22bc19a49e21ad7a79c264590c Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 10 Oct 2023 19:18:49 -0400 Subject: [PATCH 1/5] Update to .NET 8 RC2 --- build/Version.props | 2 +- .../Tgstation.Server.Host.Console.csproj | 2 +- .../Tgstation.Server.Host.Service.csproj | 8 +++---- .../Tgstation.Server.Host.Watchdog.csproj | 2 +- .../.config/dotnet-tools.json | 2 +- .../Tgstation.Server.Host.csproj | 22 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/Version.props b/build/Version.props index 782ee29423..ab8fe0760b 100644 --- a/build/Version.props +++ b/build/Version.props @@ -17,7 +17,7 @@ netstandard2.0 8 - https://download.visualstudio.microsoft.com/download/pr/f6fcf7ad-2ae2-4b26-97be-bfaff4e6d873/4005d9603269b7266bd156ad1393475c/dotnet-hosting-8.0.0-rc.1.23421.29-win.exe + https://download.visualstudio.microsoft.com/download/pr/f0a627b7-bd46-4ed2-978d-00a445174074/182420f488062f1983fc392b2fb66967/dotnet-hosting-8.0.0-rc.2.23480.2-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.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index 4ff44fedb7..89392d1fb6 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -11,7 +11,7 @@ - + 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 c9f9666e18..a7c6d3c406 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -19,15 +19,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 da8207e6a8..5428b3b848 100644 --- a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj +++ b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Tgstation.Server.Host/.config/dotnet-tools.json b/src/Tgstation.Server.Host/.config/dotnet-tools.json index 2013d181bd..7bf2190465 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.0-rc.1.23419.6", + "version": "8.0.0-rc.2.23479.6", "commands": [ "dotnet-ef" ] diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 47ea588eaf..6696452c93 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -75,25 +75,25 @@ - + - + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + @@ -115,13 +115,13 @@ - + - + - + - + From 027b8db6bdf28f394fbc4f014856d29e696739a6 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 12 Nov 2023 08:57:13 -0500 Subject: [PATCH 2/5] Nuget package updates --- build/TestCommon.props | 2 +- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- .../Tgstation.Server.ReleaseNotes.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/TestCommon.props b/build/TestCommon.props index 5562510f72..234e06735a 100644 --- a/build/TestCommon.props +++ b/build/TestCommon.props @@ -13,7 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 4d35ef1280..d3373cd28e 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -107,7 +107,7 @@ - + diff --git a/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj b/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj index 35312949ce..4c87963970 100644 --- a/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj +++ b/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj @@ -8,7 +8,7 @@ - + From de06107751513fa34b6a49e5afea08034c5f7d84 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 12 Nov 2023 08:58:13 -0500 Subject: [PATCH 3/5] Fix signals test being a special snowflake --- .../Tgstation.Server.Host.Tests.Signals.csproj | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/Tgstation.Server.Host.Tests.Signals/Tgstation.Server.Host.Tests.Signals.csproj b/tests/Tgstation.Server.Host.Tests.Signals/Tgstation.Server.Host.Tests.Signals.csproj index d515505048..7755d96945 100644 --- a/tests/Tgstation.Server.Host.Tests.Signals/Tgstation.Server.Host.Tests.Signals.csproj +++ b/tests/Tgstation.Server.Host.Tests.Signals/Tgstation.Server.Host.Tests.Signals.csproj @@ -1,16 +1,11 @@ - + $(TgsFrameworkVersion) Exe - - - - - From 159b033a1f0477bc9077028728d6b88b05d25551 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 12 Nov 2023 08:58:47 -0500 Subject: [PATCH 4/5] Update to webpanel verison 4.27.0 --- build/ControlPanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ControlPanelVersion.props b/build/ControlPanelVersion.props index 02d75e7142..559fd9eeac 100644 --- a/build/ControlPanelVersion.props +++ b/build/ControlPanelVersion.props @@ -1,6 +1,6 @@ - 4.26.2 + 4.27.0 From 34872f22c0fc86cddd05239cdb790a67b30d24fe Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 12 Nov 2023 08:50:27 -0500 Subject: [PATCH 5/5] Give into Pomelo's nightly nuget feed --- NuGet.config | 7 +++++++ src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 NuGet.config diff --git a/NuGet.config b/NuGet.config new file mode 100644 index 0000000000..95d7e9642f --- /dev/null +++ b/NuGet.config @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 0f0ab67d12..f635c053f5 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -99,7 +99,7 @@ - +