From 2a83af6896ac33d0f6c06e567fa39f77590ae202 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 29 Sep 2023 18:04:36 -0400 Subject: [PATCH 1/3] Nuget package updates --- build/Version.props | 2 +- .../Tgstation.Server.Host.Service.csproj | 2 +- .../.config/dotnet-tools.json | 2 +- .../Tgstation.Server.Host.csproj | 22 +++++++++---------- .../Tgstation.Server.ReleaseNotes/Program.cs | 9 ++------ 5 files changed, 16 insertions(+), 21 deletions(-) diff --git a/build/Version.props b/build/Version.props index 4dd29db8a0..9e2d523199 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.21/dotnet-hosting-6.0.21-win.exe + https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/6.0.22/dotnet-hosting-6.0.22-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.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 62ef77cf57..40b77d40ca 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Tgstation.Server.Host/.config/dotnet-tools.json b/src/Tgstation.Server.Host/.config/dotnet-tools.json index 236008e3ee..c418dc80b9 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": "7.0.10", + "version": "7.0.11", "commands": [ "dotnet-ef" ] diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index e979588d4c..ea827e234e 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -75,27 +75,27 @@ - + - + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + - + @@ -115,13 +115,13 @@ - + - + - + diff --git a/tools/Tgstation.Server.ReleaseNotes/Program.cs b/tools/Tgstation.Server.ReleaseNotes/Program.cs index 2542c7b78c..21bdbc1bfa 100644 --- a/tools/Tgstation.Server.ReleaseNotes/Program.cs +++ b/tools/Tgstation.Server.ReleaseNotes/Program.cs @@ -730,11 +730,6 @@ namespace Tgstation.Server.ReleaseNotes return Tuple.Create(changelists.ToDictionary(kvp => kvp.Key, kvp => kvp.Value), await componentVersions, isReleasePR); } - class ExtendedReleaseUpdate : ReleaseUpdate - { - public bool? MakeLatest { get; set; } - } - static async Task EnsureRelease(IGitHubClient client) { Console.WriteLine("Ensuring latest release is a GitHub release..."); @@ -753,9 +748,9 @@ namespace Tgstation.Server.ReleaseNotes .First(); // this should set it as latest - await client.Repository.Release.Edit(RepoOwner, RepoName, latestRelease.Id, new ExtendedReleaseUpdate + await client.Repository.Release.Edit(RepoOwner, RepoName, latestRelease.Id, new ReleaseUpdate { - MakeLatest = true + MakeLatest = MakeLatestQualifier.True }); } From 5032e66d0c0df19bbc30d8ab05da49268a172886 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 29 Sep 2023 18:41:46 -0400 Subject: [PATCH 2/3] Add additional logging to `ControlPanelController` --- .../Controllers/ControlPanelController.cs | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs b/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs index c062420b68..c1f35f87e5 100644 --- a/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs +++ b/src/Tgstation.Server.Host/Controllers/ControlPanelController.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.StaticFiles; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; @@ -39,6 +40,11 @@ namespace Tgstation.Server.Host.Controllers /// readonly IWebHostEnvironment hostEnvironment; + /// + /// The for the . + /// + readonly ILogger logger; + /// /// The for the . /// @@ -49,10 +55,15 @@ namespace Tgstation.Server.Host.Controllers /// /// The value of . /// The containing the value of . - public ControlPanelController(IWebHostEnvironment hostEnvironment, IOptions controlPanelConfigurationOptions) + /// The value of . + public ControlPanelController( + IWebHostEnvironment hostEnvironment, + IOptions controlPanelConfigurationOptions, + ILogger logger) { this.hostEnvironment = hostEnvironment ?? throw new ArgumentNullException(nameof(hostEnvironment)); controlPanelConfiguration = controlPanelConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(controlPanelConfigurationOptions)); + this.logger = logger ?? throw new ArgumentNullException(nameof(logger)); } /// @@ -64,9 +75,14 @@ namespace Tgstation.Server.Host.Controllers public IActionResult GetChannelJson() { if (!controlPanelConfiguration.Enable) + { + logger.LogDebug("Not serving channel.json as control panel is disabled."); return NotFound(); + } var controlPanelChannel = controlPanelConfiguration.Channel; + logger.LogTrace("Generating channel.json for channel \"{channel}\"...", controlPanelChannel); + if (controlPanelChannel == "local") controlPanelChannel = ControlPanelRoute; else if (String.IsNullOrWhiteSpace(controlPanelChannel)) @@ -112,7 +128,10 @@ namespace Tgstation.Server.Host.Controllers public IActionResult Get([FromRoute] string appRoute) { if (!controlPanelConfiguration.Enable) + { + logger.LogDebug("Not serving static files as control panel is disabled."); return NotFound(); + } if (Request.Headers.ContainsKey(FetchChannelVaryHeader)) return GetChannelJson(); @@ -120,6 +139,7 @@ namespace Tgstation.Server.Host.Controllers var fileInfo = hostEnvironment.WebRootFileProvider.GetFileInfo(appRoute); if (fileInfo.Exists) { + logger.LogTrace("Serving static file \"{filename}\"...", appRoute); var contentTypeProvider = new FileExtensionContentTypeProvider(); if (!contentTypeProvider.TryGetContentType(fileInfo.Name, out var contentType)) contentType = MediaTypeNames.Application.Octet; @@ -130,6 +150,8 @@ namespace Tgstation.Server.Host.Controllers return File(appRoute, contentType); } + else + logger.LogTrace("Requested static file \"{filename}\" does not exist! Redirecting to index...", appRoute); return File("index.html", MediaTypeNames.Text.Html); } From 02cce07cd5da2bce94054318f98be855eac875c5 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 29 Sep 2023 18:42:10 -0400 Subject: [PATCH 3/3] Version bump to 5.16.1 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 4dd29db8a0..b633dbb0a0 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 5.16.0 + 5.16.1 4.7.1 9.12.0 6.0.1