.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
|
||||
|
||||
@@ -16,22 +16,19 @@
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Drawing.Imaging;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using SkiaSharp;
|
||||
|
||||
namespace VocaluxeWeb.Services
|
||||
{
|
||||
/// Scaled JPEG versions of covers and avatars, cached on disk.
|
||||
/// Uses System.Drawing, which is fine on .NET Framework; replace it (e.g. with SkiaSharp) when moving to .NET 10 / Linux.
|
||||
public sealed class CImageService
|
||||
{
|
||||
private static readonly int[] _Sizes = { 96, 200, 400 };
|
||||
private const long _JpegQuality = 82L;
|
||||
private const int _JpegQuality = 82;
|
||||
private const int _MaxAvatarSize = 512;
|
||||
|
||||
private readonly string _CacheFolder;
|
||||
@@ -87,19 +84,16 @@ namespace VocaluxeWeb.Services
|
||||
public static byte[] CreateAvatar(byte[] uploaded)
|
||||
{
|
||||
using (var input = new MemoryStream(uploaded))
|
||||
using (var source = Image.FromStream(input))
|
||||
using (var source = _Decode(input, true))
|
||||
using (var square = _Resize(source, Math.Min(_MaxAvatarSize, Math.Min(source.Width, source.Height)), true))
|
||||
using (var output = new MemoryStream())
|
||||
{
|
||||
_ApplyExifOrientation(source);
|
||||
using (var square = _Resize(source, Math.Min(_MaxAvatarSize, Math.Min(source.Width, source.Height)), true))
|
||||
using (var output = new MemoryStream())
|
||||
{
|
||||
_SaveJpeg(square, output);
|
||||
return output.ToArray();
|
||||
}
|
||||
_SaveJpeg(square, output);
|
||||
return output.ToArray();
|
||||
}
|
||||
}
|
||||
|
||||
private static Image _Load(string path)
|
||||
private static SKBitmap _Load(string path)
|
||||
{
|
||||
//Read into memory so the file is not locked; the game may have it open at the same time
|
||||
using (var file = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))
|
||||
@@ -107,19 +101,38 @@ namespace VocaluxeWeb.Services
|
||||
var buffer = new MemoryStream();
|
||||
file.CopyTo(buffer);
|
||||
buffer.Position = 0;
|
||||
return Image.FromStream(buffer);
|
||||
return _Decode(buffer, false);
|
||||
}
|
||||
}
|
||||
|
||||
private static SKBitmap _Decode(Stream stream, bool applyOrientation)
|
||||
{
|
||||
using (var codec = SKCodec.Create(stream))
|
||||
{
|
||||
if (codec == null)
|
||||
{
|
||||
throw new ArgumentException("Unsupported image format");
|
||||
}
|
||||
|
||||
var bitmap = SKBitmap.Decode(codec);
|
||||
if (bitmap == null)
|
||||
{
|
||||
throw new ArgumentException("Invalid image");
|
||||
}
|
||||
|
||||
return applyOrientation ? _ApplyExifOrientation(bitmap, codec.EncodedOrigin) : bitmap;
|
||||
}
|
||||
}
|
||||
|
||||
/// Fits the image into size x size, or crops it to a square of that size.
|
||||
private static Bitmap _Resize(Image source, int size, bool crop)
|
||||
private static SKBitmap _Resize(SKBitmap source, int size, bool crop)
|
||||
{
|
||||
int width, height;
|
||||
var srcRect = new Rectangle(0, 0, source.Width, source.Height);
|
||||
var srcRect = new SKRect(0, 0, source.Width, source.Height);
|
||||
if (crop)
|
||||
{
|
||||
var side = Math.Min(source.Width, source.Height);
|
||||
srcRect = new Rectangle((source.Width - side) / 2, (source.Height - side) / 2, side, side);
|
||||
srcRect = SKRect.Create((source.Width - side) / 2, (source.Height - side) / 2, side, side);
|
||||
width = height = size;
|
||||
}
|
||||
else
|
||||
@@ -129,20 +142,19 @@ namespace VocaluxeWeb.Services
|
||||
height = Math.Max(1, (int)Math.Round(source.Height * scale));
|
||||
}
|
||||
|
||||
var result = new Bitmap(width, height, PixelFormat.Format24bppRgb);
|
||||
using (var g = Graphics.FromImage(result))
|
||||
var result = new SKBitmap(width, height, SKColorType.Rgba8888, SKAlphaType.Opaque);
|
||||
using (var canvas = new SKCanvas(result))
|
||||
using (var image = SKImage.FromBitmap(source))
|
||||
using (var paint = new SKPaint { IsAntialias = true })
|
||||
{
|
||||
g.Clear(Color.White);
|
||||
g.InterpolationMode = InterpolationMode.HighQualityBicubic;
|
||||
g.PixelOffsetMode = PixelOffsetMode.HighQuality;
|
||||
g.CompositingQuality = CompositingQuality.HighQuality;
|
||||
g.DrawImage(source, new Rectangle(0, 0, width, height), srcRect, GraphicsUnit.Pixel);
|
||||
canvas.Clear(SKColors.White);
|
||||
canvas.DrawImage(image, srcRect, new SKRect(0, 0, width, height), new SKSamplingOptions(SKCubicResampler.Mitchell), paint);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static void _SaveJpeg(Image image, string path)
|
||||
private static void _SaveJpeg(SKBitmap image, string path)
|
||||
{
|
||||
using (var file = File.Create(path))
|
||||
{
|
||||
@@ -150,40 +162,43 @@ namespace VocaluxeWeb.Services
|
||||
}
|
||||
}
|
||||
|
||||
private static void _SaveJpeg(Image image, Stream stream)
|
||||
private static void _SaveJpeg(SKBitmap image, Stream stream)
|
||||
{
|
||||
var codec = ImageCodecInfo.GetImageEncoders().First(c => c.FormatID == ImageFormat.Jpeg.Guid);
|
||||
using (var parameters = new EncoderParameters(1))
|
||||
{
|
||||
parameters.Param[0] = new EncoderParameter(System.Drawing.Imaging.Encoder.Quality, _JpegQuality);
|
||||
image.Save(stream, codec, parameters);
|
||||
}
|
||||
image.Encode(stream, SKEncodedImageFormat.Jpeg, _JpegQuality);
|
||||
}
|
||||
|
||||
/// Photos from phones are often stored rotated with an EXIF hint.
|
||||
private static void _ApplyExifOrientation(Image image)
|
||||
private static SKBitmap _ApplyExifOrientation(SKBitmap image, SKEncodedOrigin origin)
|
||||
{
|
||||
const int orientationId = 0x0112;
|
||||
if (!image.PropertyIdList.Contains(orientationId))
|
||||
float degrees;
|
||||
switch (origin)
|
||||
{
|
||||
return;
|
||||
case SKEncodedOrigin.BottomRight:
|
||||
degrees = 180;
|
||||
break;
|
||||
case SKEncodedOrigin.RightTop:
|
||||
degrees = 90;
|
||||
break;
|
||||
case SKEncodedOrigin.LeftBottom:
|
||||
degrees = 270;
|
||||
break;
|
||||
default:
|
||||
return image;
|
||||
}
|
||||
|
||||
var rotate = RotateFlipType.RotateNoneFlipNone;
|
||||
switch (image.GetPropertyItem(orientationId).Value[0])
|
||||
var swap = degrees != 180;
|
||||
var rotated = new SKBitmap(swap ? image.Height : image.Width, swap ? image.Width : image.Height, image.ColorType, image.AlphaType);
|
||||
using (var canvas = new SKCanvas(rotated))
|
||||
using (var source = SKImage.FromBitmap(image))
|
||||
{
|
||||
case 3:
|
||||
rotate = RotateFlipType.Rotate180FlipNone;
|
||||
break;
|
||||
case 6:
|
||||
rotate = RotateFlipType.Rotate90FlipNone;
|
||||
break;
|
||||
case 8:
|
||||
rotate = RotateFlipType.Rotate270FlipNone;
|
||||
break;
|
||||
canvas.Translate(rotated.Width / 2f, rotated.Height / 2f);
|
||||
canvas.RotateDegrees(degrees);
|
||||
canvas.Translate(-image.Width / 2f, -image.Height / 2f);
|
||||
canvas.DrawImage(source, 0, 0, new SKSamplingOptions(SKFilterMode.Linear));
|
||||
}
|
||||
|
||||
image.RotateFlip(rotate);
|
||||
image.Dispose();
|
||||
return rotated;
|
||||
}
|
||||
|
||||
private static string _Hash(string text)
|
||||
|
||||
@@ -58,10 +58,7 @@ namespace VocaluxeWeb.Services
|
||||
|
||||
private static byte[] _Pbkdf2(string pin, byte[] salt)
|
||||
{
|
||||
using (var kdf = new Rfc2898DeriveBytes(pin, salt, _Iterations, HashAlgorithmName.SHA256))
|
||||
{
|
||||
return kdf.GetBytes(_HashSize);
|
||||
}
|
||||
return Rfc2898DeriveBytes.Pbkdf2(pin, salt, _Iterations, HashAlgorithmName.SHA256, _HashSize);
|
||||
}
|
||||
|
||||
private static byte[] _LegacySha256(string pin, byte[] salt)
|
||||
|
||||
@@ -1,42 +1,25 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net481</TargetFramework>
|
||||
<LangVersion>9.0</LangVersion>
|
||||
<RootNamespace>VocaluxeWeb</RootNamespace>
|
||||
<AssemblyName>VocaluxeWeb</AssemblyName>
|
||||
<Configurations>DebugWin;ReleaseWin;InstallerWin;DebugLinux;ReleaseLinux</Configurations>
|
||||
<Platforms>AnyCPU</Platforms>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
||||
<WebAppDir>$(MSBuildThisFileDirectory)..\WebApp\</WebAppDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="$(Configuration.StartsWith('Release')) Or $(Configuration.StartsWith('Installer'))">
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.13" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.ResponseCompression" Version="2.3.13" />
|
||||
<!-- ASP.NET Core 2.3 pulls Newtonsoft.Json 11.0.2 (known vulnerability); use the version Vocaluxe uses -->
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.9.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.9.0" />
|
||||
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="System.Drawing" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.14" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<PackageReference Include="SkiaSharp" Version="4.154.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.3.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.3.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="10.3.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- The WebApp (Vue/TypeScript) is built with Node.js as part of this project.
|
||||
|
||||
Reference in new issue
Block a user