Update to net 10

.editorconfig

@@ -1,7 +1 @@
-[*.cs]
-
-# IDE0016: throw-Ausdruck verwenden
-csharp_style_throw_expression = false:suggestion
-
-# IDE0057: Bereichsoperator verwenden
-csharp_style_prefer_range_operator = false:suggestion
+[*.cs]

.github/workflows/build_pipeline.yml

@@ -15,22 +15,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
-    # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/9.0
+    # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/10.0
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install wasm-tools
-      run: dotnet workload install wasm-tools-net9
+      run: dotnet workload install wasm-tools
 
     - name: Build release
       run: dotnet publish AudioCuesheetEditor --configuration Release --output release
 
     - name: Upload Build Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: AudioCuesheetEditor-Release
         path: ./release
@@ -45,7 +45,7 @@ jobs:
       }}
     steps:
     - name: Download Build Artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v7
       with:
         name: AudioCuesheetEditor-Release
     - name: Deploy to Netlify

.github/workflows/run_tests.yml

@@ -9,25 +9,25 @@ jobs:
   run-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v6
 
     - name: Set timestamp variable
       id: timestamp
       run: echo "datetime=$(date +'%Y-%m-%d_%H-%M-%S')" >> $GITHUB_OUTPUT
 
-    # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/9.0
+    # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/10.0
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install wasm-tools
-      run: dotnet workload install wasm-tools-net9
+      run: dotnet workload install wasm-tools
 
     - name: Build & Install
       run: dotnet build
     - name: Ensure browsers are installed
-      run: pwsh AudioCuesheetEditor.End2EndTests/bin/Debug/net9.0/playwright.ps1 install --with-deps
+      run: pwsh AudioCuesheetEditor.End2EndTests/bin/Debug/net10.0/playwright.ps1 install --with-deps
 
     - name: Start App
       run: dotnet run --project AudioCuesheetEditor &
@@ -59,8 +59,8 @@ jobs:
 
     - name: Upload traces
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: playwright-traces-${{ steps.timestamp.outputs.datetime }}
-        path: AudioCuesheetEditor.End2EndTests/bin/Debug/net9.0/playwright-traces/
+        path: AudioCuesheetEditor.End2EndTests/bin/Debug/net10.0/playwright-traces/
         if-no-files-found: ignore

AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

AudioCuesheetEditor.End2EndTests/MSTestSettings.cs

@@ -1 +1 @@
-[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+[assembly: Parallelize()]

AudioCuesheetEditor.End2EndTests/Models/AppBar.cs

@@ -18,36 +18,32 @@
 
 namespace AudioCuesheetEditor.End2EndTests.Models
 {
-    partial class AppBar
+    partial class AppBar(IPage page)
     {
         [GeneratedRegex("^Open$")]
         private static partial Regex OpenRegex();
 
-        private readonly IPage _page;
-        private readonly ILocator _menuButton;
+        private readonly IPage _page = page;
+        internal ILocator MenuButton => _page.GetByRole(AriaRole.Toolbar).GetByRole(AriaRole.Button, new() { Name = "More" });
 
         internal ILocator UndoButton => _page.GetByRole(AriaRole.Button, new() { Name = "undo" });
 
         internal ILocator RedoButton => _page.GetByRole(AriaRole.Button, new() { Name = "redo" });
 
         internal ILocator HomeButton => _page.Locator(".mud-button-root").First;
 
-        internal AppBar(IPage page)
-        {
-            _page = page;
-            _menuButton = _page.GetByRole(AriaRole.Button, new() { Name = "More" });
-        }
-
         internal async Task OpenSettingsAsync()
         {
-            await _menuButton.ClickAsync();
+            await MenuButton.ClickAsync();
             await _page.GetByText("Settings").ClickAsync();
         }
 
         internal async Task ChangeLanguageAsync(string language)
         {
             await _page.GetByRole(AriaRole.Button, new() { Name = "Change language" }).ClickAsync();
             await _page.GetByText(language).ClickAsync();
+            await _page.WaitForLoadStateAsync(LoadState.NetworkIdle);
+            await _page.WaitForFunctionAsync(@"() => window.Blazor !== undefined");
         }
 
         internal async Task UndoAsync()
@@ -81,7 +77,7 @@ internal async Task OpenExportDialogAsync(string exportType, string fileMenuName
 
         internal async Task OpenDisplayHotkeysAsync()
         {
-            await _page.GetByRole(AriaRole.Button, new() { Name = "More" }).ClickAsync();
+            await MenuButton.ClickAsync();
             await _page.GetByText("Hotkeys").ClickAsync();
         }
     }

AudioCuesheetEditor.End2EndTests/Tests/Desktop/ExportTest.cs

@@ -83,7 +83,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
             await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
             await detailView.EditTrackAsync("Track Artist 1", "Track Title 1");
             await bar.OpenExportDialogAsync("Textfile");
-            await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next" }).ClickAsync();
+            await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next", Exact = true }).ClickAsync();
             var downloadTask = TestPage.WaitForDownloadAsync();
             await TestPage.GetByRole(AriaRole.Button, new() { Name = "Download-YouTube.txt" }).ClickAsync();
             var download = await downloadTask;

AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ExportTestSmartphone.cs

@@ -83,7 +83,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
             await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
             await detailView.EditTrackAsync("Track Artist 1", "Track Title 1");
             await bar.OpenExportDialogAsync("Textfile");
-            await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next" }).ClickAsync();
+            await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next", Exact = true }).ClickAsync();
             var downloadTask = TestPage.WaitForDownloadAsync();
             await TestPage.GetByRole(AriaRole.Button, new() { Name = "Download-YouTube.txt" }).ClickAsync();
             var download = await downloadTask;

AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-	<Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <EnableMSTestRunner>true</EnableMSTestRunner>
     <OutputType>Exe</OutputType>

AudioCuesheetEditor/AudioCuesheetEditor.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-	<TargetFramework>net9.0</TargetFramework>
+	<TargetFramework>net10.0</TargetFramework>
 	<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
 	<Nullable>enable</Nullable>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
 	<RazorLangVersion>3.0</RazorLangVersion>
-	<Version>10.4.0</Version>
+	<Version>11.0.0</Version>
 	<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
 	<PublishTrimmed>true</PublishTrimmed>
 	<RunAOTCompilation>true</RunAOTCompilation>
@@ -22,13 +22,13 @@
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="9.0.892" />
     <PackageReference Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.13" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.13" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all" />
     <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
     <PackageReference Include="Howler.Blazor" Version="0.10.0" />
-    <PackageReference Include="Markdig" Version="0.45.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.13" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.13" />
+    <PackageReference Include="Markdig" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.3" />
     <PackageReference Include="MudBlazor" Version="8.15.0" />
     <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.0" />
     <PackageReference Include="z440.atl.core" Version="7.11.0" />

AudioCuesheetEditor/Model/AudioCuesheet/Track.cs

@@ -60,7 +60,7 @@ public Track() { }
         /// Create object with copied values from input
         /// </summary>
         /// <param name="track">Object to copy values from</param>
-        /// /// <param name="copyCuesheetReference">Copy cuesheet reference from track also?</param>
+        /// <param name="copyCuesheetReference">Copy cuesheet reference from track also?</param>
         public Track(ITrack track, Boolean copyCuesheetReference = true) : this()
         {
             CopyValues(track, copyCuesheetReference);

AudioCuesheetEditor/Program.cs

@@ -27,8 +27,6 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using MudBlazor.Services;
-using System.Globalization;
-using System.Reflection;
 using Toolbelt.Blazor.Extensions.DependencyInjection;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
@@ -73,29 +71,8 @@
 
 builder.Services.AddHotKeys2();
 
-// TODO: Remove this when https://github.com/dotnet/aspnetcore/issues/56824 is fixed
-
-// Get current localization culture
-var currentCulture = CultureInfo.DefaultThreadCurrentCulture;
-
-// Get WASM culture provider via reflection
-var type = Assembly.GetAssembly(typeof(WebAssemblyHost))!.GetType("Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyCultureProvider");
-var instance = type
-    !.GetProperty("Instance", BindingFlags.Public | BindingFlags.Static)
-    ?.GetValue(null);
-
-// Swap out the "current culture" for the UI (localization) culture
-CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("de-DE");
-// Load the satellite assemblies
-await (ValueTask)instance!
-    .GetType()
-    .GetMethod("LoadCurrentCultureResourcesAsync", BindingFlags.Public | BindingFlags.Instance)!
-    .Invoke(instance, [])!;
-// Swap the culture back
-CultureInfo.DefaultThreadCurrentCulture = currentCulture;
-
 var host = builder.Build();
 
 await host.SetCultureFromConfigurationAsync();
 
-await host.RunAsync();
+await host.RunAsync();

AudioCuesheetEditor/Services/IO/FileInputManager.cs

@@ -17,6 +17,7 @@
 using AudioCuesheetEditor.Model.IO;
 using AudioCuesheetEditor.Model.IO.Audio;
 using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.WebAssembly.Http;
 using Microsoft.JSInterop;
 
 namespace AudioCuesheetEditor.Services.IO
@@ -54,15 +55,18 @@ public bool IsValidAudiofile(IBrowserFile browserFile)
 
         public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, IEnumerable<String> fileExtensions)
         {
-            _logger.LogDebug("CheckFileMimeType called with file: file.Name: '{FileName}', file.ContentType: '{ContentType}', mimeType: '{MimeType}', fileExtensions: '{fileExtensions}'", file.Name, file.ContentType, mimeType, fileExtensions);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("CheckFileMimeType called with file: file.Name: '{FileName}', file.ContentType: '{ContentType}', mimeType: '{MimeType}', fileExtensions: '{fileExtensions}'", file.Name, file.ContentType, mimeType, fileExtensions);
+            }
             Boolean fileMimeTypeMatches = false;
             if ((file != null) && (String.IsNullOrEmpty(mimeType) == false))
             {
                 if (String.IsNullOrEmpty(file.ContentType) == false)
                 {
                     if (mimeType.EndsWith("/*"))
                     {
-                        var mainType = mimeType.Substring(0, mimeType.Length - 1);
+                        var mainType = mimeType[..^1];
                         fileMimeTypeMatches = file.ContentType.StartsWith(mainType, StringComparison.CurrentCultureIgnoreCase);
                     }
                     else
@@ -93,7 +97,12 @@ public Boolean CheckFileMimeType(IBrowserFile file, String mimeType, IEnumerable
                     audiofile = new Audiofile(browserFile.Name, audioFileObjectURL, codec);
                     if (String.IsNullOrEmpty(audioFileObjectURL) == false)
                     {
-                        var loadContentStreamTask = _httpClient.GetStreamAsync(audioFileObjectURL)
+                        var request = new HttpRequestMessage(HttpMethod.Get, audioFileObjectURL);
+                        //TODO: Enable when https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/524 gets done
+                        request.SetBrowserRequestStreamingEnabled(false);
+
+                        var response = await _httpClient.SendAsync(request);
+                        var loadContentStreamTask = response.Content.ReadAsStreamAsync()
                                 .ContinueWith(x => audiofile.ContentStream = x.Result);
                         if (afterContentStreamLoaded != null)
                         {

AudioCuesheetEditor/Services/IO/ImportManager.cs

@@ -52,7 +52,10 @@ public void ImportData(String? data)
                 FileType = ImportFileType.Textfile
             };
             stopwatch.Stop();
-            _logger.LogDebug("ImportData duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("ImportData duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            }
         }
 
         public async Task AnalyseImportfile()
@@ -94,7 +97,10 @@ public async Task AnalyseImportfile()
                 }
             }
             stopwatch.Stop();
-            _logger.LogDebug("ImportTextAsync duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("ImportTextAsync duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            }
         }
 
         public void ImportCuesheet()
@@ -109,7 +115,10 @@ public void ImportCuesheet()
             }
             _sessionStateContainer.ResetImport();
             stopwatch.Stop();
-            _logger.LogDebug("ImportCuesheet duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("ImportCuesheet duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            }
         }
 
         public async Task UploadFilesAsync(IEnumerable<IBrowserFile> files, String? fileInputId = null)
@@ -175,7 +184,10 @@ public async Task UploadFilesAsync(IEnumerable<IBrowserFile> files, String? file
             }
             UploadFilesFinished?.Invoke(this, invalidFiles);
             stopwatch.Stop();
-            _logger.LogDebug("UploadFilesAsync duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            if (_logger.IsEnabled(LogLevel.Debug))
+            {
+                _logger.LogDebug("UploadFilesAsync duration: {stopwatch.Elapsed}", stopwatch.Elapsed);
+            }
         }
 
         private static async Task<MemoryStream> ReadFileContentAsync(IBrowserFile file)