cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-07-19 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into V6

Browse Source
This commit is contained in:
Jordan Dominion
2023-09-30 14:13:25 -04:00
parent fa80aa16ad f7ce860b64
commit fed8eeae9c
5 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
+1 -1
View File
@@ -17,7 +17,7 @@
<!-- Usage: Installing service programatically -->
<PackageReference Include="Core.System.ServiceProcess" Version="2.0.1" />
<!-- Usage: Command line argument support -->
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
<!-- Usage: Identifies when we are running in the context of the Windows SCM -->
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0-preview.7.23375.6" />
<!-- Usage: Windows event log logging plugin -->
src/Tgstation.Server.Host/.config/dotnet-tools.json
+1 -1
View File
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "7.0.10",
"version": "7.0.11",
"commands": [
"dotnet-ef"
]
src/Tgstation.Server.Host/Controllers/ControlPanelController.cs
+23 -1
View File
@@ -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
/// </summary>
readonly IWebHostEnvironment hostEnvironment;
/// <summary>
/// The <see cref="ILogger"/> for the <see cref="ControlPanelController"/>.
/// </summary>
readonly ILogger<ControlPanelController> logger;
/// <summary>
/// The <see cref="ControlPanelConfiguration"/> for the <see cref="ControlPanelController"/>.
/// </summary>
@@ -49,10 +55,15 @@ namespace Tgstation.Server.Host.Controllers
/// </summary>
/// <param name="hostEnvironment">The value of <see cref="hostEnvironment"/>.</param>
/// <param name="controlPanelConfigurationOptions">The <see cref="IOptions{TOptions}"/> containing the value of <see cref="controlPanelConfiguration"/>.</param>
public ControlPanelController(IWebHostEnvironment hostEnvironment, IOptions<ControlPanelConfiguration> controlPanelConfigurationOptions)
/// <param name="logger">The value of <see cref="logger"/>.</param>
public ControlPanelController(
IWebHostEnvironment hostEnvironment,
IOptions<ControlPanelConfiguration> controlPanelConfigurationOptions,
ILogger<ControlPanelController> 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));
}
/// <summary>
@@ -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);
}
src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+7 -7
View File
@@ -79,23 +79,23 @@
<!-- Usage: Support ""legacy"" Newotonsoft.Json in HTTP pipeline. The rest of our codebase uses Newtonsoft. -->
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0-preview.7.23375.9" />
<!-- Usage: Database ORM -->
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<!-- Usage: Automatic migration generation using command line -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.10">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Sqlite ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
<!-- Usage: MSSQL ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
<!-- Usage: POSIX support for syscalls, signals, and symlinks -->
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<!-- Usage: YAML config plugin -->
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<!-- Usage: PostgresSQL ORM plugin -->
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
<!-- Usage: GitHub.com interop -->
<PackageReference Include="Octokit" Version="7.1.0" />
<PackageReference Include="Octokit" Version="8.0.1" />
<!-- Usage: MYSQL/MariaDB ORM plugin -->
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
<!-- Usage: Discord interop -->
@@ -121,7 +121,7 @@
<!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
<PackageReference Include="System.Security.Permissions" Version="8.0.0-preview.7.23375.6" />
<!-- Usage: .DeleteAsync() support for IQueryable<T>s -->
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="7.22.6" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="7.100.0.2" />
</ItemGroup>
<ItemGroup>
tools/Tgstation.Server.ReleaseNotes/Program.cs
+2 -7
View File
@@ -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<int> 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
});
}