.NET10 Migration (#946)
Runtime and build - Move all projects to .NET 10 with SDK-style project files and a shared Directory.Build.props (WIN/LINUX, x86/x64 defines) - Load managed and unmanaged dependencies from libs/managed and libs/unmanaged through assembly and native library resolvers - Compile party modes with Roslyn instead of CodeDom - Update AppVeyor to the .NET 10 SDK and dotnet test - Download the FFmpeg and gstreamer runtimes from the dependencies repository during the build - Remove the VC++ 2015-2022 runtime check, no dependency needs it anymore Graphics and windowing - Replace the Direct3D 9 renderer with Direct3D 11 (Vortice) - Pace Direct3D 11 frames with a frame latency waitable swap chain - Move window, input and message boxes to SDL3 - Replace System.Drawing with SkiaSharp and WinForms with SDL3 and a software renderer Video and audio - Replace Acinerella with FFmpeg 8.1.3 (FFmpeg.AutoGen) - Add hardware accelerated video decoding (D3D11VA, DXVA2, VideoToolbox, VAAPI, VDPAU) with software fallback - Convert YUV video frames to RGB on the GPU in Direct3D 11 and OpenGL - Add the video options HardwareDecoding, GpuColorConversion, DecoderThreads and VideoDownscaleResolution - Update OpenAL to OpenTK 4 and NAudio recording to WasapiRecorder Fixes - Fix the song preview start and shorten the reporter buttons - Fix a crash when opening the highscore without a selected song - Use the options slide highlight in the party mode screens to avoid brightness flicker on VRR displays - Disable GameInput in the x86 build, SDL3 crashes in GameInputCreate on 32-bit systems with the GameInput runtime installed - Fix a truncation warning in PitchTracker
This commit is contained in:
1 parent
5767914372
commit
cf2fa796e2
176 files changed
+5218
-8042
No files matched your search
@@ -37,7 +37,7 @@ namespace VocaluxeWeb.Hosting
|
||||
{
|
||||
try
|
||||
{
|
||||
var existing = new X509Certificate2(File.ReadAllBytes(path), (string)null, X509KeyStorageFlags.UserKeySet);
|
||||
var existing = X509CertificateLoader.LoadPkcs12(File.ReadAllBytes(path), null, X509KeyStorageFlags.UserKeySet);
|
||||
if (existing.NotAfter > DateTime.Now.AddDays(7) && _Covers(existing, hostName, addresses))
|
||||
{
|
||||
return existing;
|
||||
@@ -57,7 +57,7 @@ namespace VocaluxeWeb.Hosting
|
||||
}
|
||||
|
||||
File.WriteAllBytes(path, pfx);
|
||||
return new X509Certificate2(pfx, (string)null, X509KeyStorageFlags.UserKeySet);
|
||||
return X509CertificateLoader.LoadPkcs12(pfx, null, X509KeyStorageFlags.UserKeySet);
|
||||
}
|
||||
|
||||
private static bool _Covers(X509Certificate2 cert, string hostName, IEnumerable<IPAddress> addresses)
|
||||
|
||||
@@ -20,12 +20,11 @@ using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.AspNetCore.ResponseCompression;
|
||||
using Microsoft.AspNetCore.StaticFiles;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.FileProviders;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using Microsoft.OpenApi;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using VocaluxeWeb.Api;
|
||||
using VocaluxeWeb.Dispatching;
|
||||
@@ -58,13 +57,12 @@ namespace VocaluxeWeb.Hosting
|
||||
compression.Providers.Add<GzipCompressionProvider>();
|
||||
});
|
||||
|
||||
// The entry assembly is Vocaluxe.exe, so MVC would not find our controllers on its own
|
||||
// The entry assembly is Vocaluxe, so MVC would not find our controllers on its own
|
||||
services.AddMvcCore(mvc => mvc.Filters.Add(new CExceptionFilter(options.OnError)))
|
||||
.AddApplicationPart(typeof(CStartup).Assembly)
|
||||
.AddApiExplorer()
|
||||
.AddDataAnnotations()
|
||||
.AddJsonFormatters(json => json.Converters.Add(new StringEnumConverter()))
|
||||
.SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
|
||||
.AddNewtonsoftJson(json => json.SerializerSettings.Converters.Add(new StringEnumConverter()));
|
||||
|
||||
services.AddSwaggerGen(swagger =>
|
||||
{
|
||||
@@ -89,7 +87,8 @@ namespace VocaluxeWeb.Hosting
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI(ui => ui.SwaggerEndpoint("/swagger/v1/swagger.json", "Vocaluxe API v1"));
|
||||
|
||||
app.UseMvc();
|
||||
app.UseRouting();
|
||||
app.UseEndpoints(endpoints => endpoints.MapControllers());
|
||||
|
||||
if (!string.IsNullOrEmpty(options.WebRoot) && Directory.Exists(options.WebRoot))
|
||||
{
|
||||
|
||||
@@ -21,6 +21,7 @@ using System.Net;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Server.Kestrel.Core;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using VocaluxeWeb.Dispatching;
|
||||
using VocaluxeWeb.Remote;
|
||||
using VocaluxeWeb.Services;
|
||||
@@ -32,7 +33,7 @@ namespace VocaluxeWeb.Hosting
|
||||
{
|
||||
private readonly IVocaluxeRemote _Remote;
|
||||
private readonly CWebServerOptions _Options;
|
||||
private IWebHost _Host;
|
||||
private IHost _Host;
|
||||
private CLiveMonitor _Monitor;
|
||||
private CQueueService _Queue;
|
||||
private bool _QueuePlaylistReady;
|
||||
@@ -69,11 +70,12 @@ namespace VocaluxeWeb.Hosting
|
||||
var lanAddresses = CNetworkAddress.GetLanAddresses();
|
||||
var certificate = _Options.UseHttps ? CCertificateProvider.GetOrCreate(_Options.CertificatePath, hostName, lanAddresses) : null;
|
||||
|
||||
var host = new WebHostBuilder()
|
||||
.UseKestrel(kestrel => _ConfigureKestrel(kestrel, certificate))
|
||||
var host = new HostBuilder()
|
||||
.UseContentRoot(AppDomain.CurrentDomain.BaseDirectory)
|
||||
.ConfigureServices(services => CStartup.ConfigureServices(services, this, _Remote, Dispatcher, Settings, _Options))
|
||||
.Configure(app => CStartup.Configure(app, _Options))
|
||||
.ConfigureWebHost(web => web
|
||||
.UseKestrel(kestrel => _ConfigureKestrel(kestrel, certificate))
|
||||
.ConfigureServices(services => CStartup.ConfigureServices(services, this, _Remote, Dispatcher, Settings, _Options))
|
||||
.Configure(app => CStartup.Configure(app, _Options)))
|
||||
.Build();
|
||||
|
||||
try
|
||||
|
||||
Reference in new issue
Block a user