Merge pull request #333 from NeoCoderMatrix86/master

Deploy v4.0
NeoCoderMatrix86 · Apr 3, 2024 · c9091aa · c9091aa
2 parents ab26593 + e74a2d6
commit c9091aa
Show file tree

Hide file tree

Showing 132 changed files with 5,814 additions and 4,353 deletions.
diff --git a/.github/workflows/deploy_github_pages.yml b/.github/workflows/deploy_github_pages.yml
diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml
@@ -10,14 +10,17 @@ jobs:
     # use ubuntu-latest image to run steps on
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v4.1.2
 
     # sets up .NET
-    # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/6.0
+    # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/7.0
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.0.1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '6.0.401'
+        dotnet-version: '7.0.101'
+
+    - name: Install wasm-tools
+      run: dotnet workload install wasm-tools-net7
 
     # Only publish when unit tests are ok
     - name: Run Unit Tests

diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 **/obj
 **/.vs
 *.user
+*.user
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+	<TargetFramework>net7.0</TargetFramework>
 	<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
+	<Nullable>enable</Nullable>
+	<ImplicitUsings>enable</ImplicitUsings>
 	<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
 	<RazorLangVersion>3.0</RazorLangVersion>
-    <Version>3.3.0</Version>
+	<Version>4.0.0</Version>
 	<PublishTrimmed>true</PublishTrimmed>
+	<RunAOTCompilation>true</RunAOTCompilation>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,21 +21,20 @@
     <Content Remove="Resources\Localization\CatalogueNumber\en.json" />
     <Content Remove="Resources\Localization\CuesheetData\de.json" />
     <Content Remove="Resources\Localization\CuesheetData\en.json" />
+    <Content Remove="Resources\Localization\EditSplitpoints\de.json" />
+    <Content Remove="Resources\Localization\EditSplitpoints\en.json" />
     <Content Remove="Resources\Localization\EditTrackModal\de.json" />
     <Content Remove="Resources\Localization\EditTrackModal\en.json" />
-    <Content Remove="Resources\Localization\ExportProfilesDialog\de.json" />
-    <Content Remove="Resources\Localization\ExportProfilesDialog\en.json" />
     <Content Remove="Resources\Localization\MainLayout\de.json" />
     <Content Remove="Resources\Localization\MainLayout\en.json" />
     <Content Remove="Resources\Localization\ModalDialog\de.json" />
     <Content Remove="Resources\Localization\ModalDialog\en.json" />
+    <Content Remove="Resources\Localization\ModalExportdialog\de.json" />
+    <Content Remove="Resources\Localization\ModalExportdialog\en.json" />
     <Content Remove="Resources\Localization\OptionsDialog\de.json" />
     <Content Remove="Resources\Localization\OptionsDialog\en.json" />
-    <Content Remove="Resources\Localization\ProcessingHints\de.json" />
-    <Content Remove="Resources\Localization\ProcessingHints\en.json" />
     <Content Remove="Resources\Localization\TracksTable\de.json" />
     <Content Remove="Resources\Localization\TracksTable\en.json" />
-    <Content Remove="Resources\Localization\ValidationMessage\de.json" />
     <Content Remove="Resources\Localization\CultureSelector\de.json" />
     <Content Remove="Resources\Localization\CultureSelector\en.json" />
     <Content Remove="Resources\Localization\FileEdit\de.json" />
@@ -43,6 +43,7 @@
     <Content Remove="Resources\Localization\Help\en.json" />
     <Content Remove="Resources\Localization\Index\de.json" />
     <Content Remove="Resources\Localization\Index\en.json" />
+    <Content Remove="Resources\Localization\ValidationMessage\de.json" />
     <Content Remove="Resources\Localization\ValidationMessage\en.json" />
     <Content Remove="Resources\Localization\ViewModeImport\de.json" />
     <Content Remove="Resources\Localization\ViewModeImport\en.json" />
@@ -59,22 +60,20 @@
     <EmbeddedResource Include="Resources\Localization\CatalogueNumber\de.json" />
     <EmbeddedResource Include="Resources\Localization\CuesheetData\de.json" />
     <EmbeddedResource Include="Resources\Localization\CuesheetData\en.json" />
+    <EmbeddedResource Include="Resources\Localization\EditSplitpoints\de.json" />
+    <EmbeddedResource Include="Resources\Localization\EditSplitpoints\en.json" />
     <EmbeddedResource Include="Resources\Localization\EditTrackModal\de.json" />
     <EmbeddedResource Include="Resources\Localization\EditTrackModal\en.json" />
-    <EmbeddedResource Include="Resources\Localization\ExportProfilesDialog\de.json" />
-    <EmbeddedResource Include="Resources\Localization\ExportProfilesDialog\en.json" />
     <EmbeddedResource Include="Resources\Localization\MainLayout\en.json" />
     <EmbeddedResource Include="Resources\Localization\MainLayout\de.json" />
     <EmbeddedResource Include="Resources\Localization\ModalDialog\en.json" />
     <EmbeddedResource Include="Resources\Localization\ModalDialog\de.json" />
+    <EmbeddedResource Include="Resources\Localization\ModalExportdialog\de.json" />
+    <EmbeddedResource Include="Resources\Localization\ModalExportdialog\en.json" />
     <EmbeddedResource Include="Resources\Localization\OptionsDialog\de.json" />
     <EmbeddedResource Include="Resources\Localization\OptionsDialog\en.json" />
-    <EmbeddedResource Include="Resources\Localization\ProcessingHints\en.json" />
-    <EmbeddedResource Include="Resources\Localization\ProcessingHints\de.json" />
     <EmbeddedResource Include="Resources\Localization\TracksTable\de.json" />
     <EmbeddedResource Include="Resources\Localization\TracksTable\en.json" />
-    <EmbeddedResource Include="Resources\Localization\ValidationMessage\en.json" />
-    <EmbeddedResource Include="Resources\Localization\ValidationMessage\de.json" />
     <EmbeddedResource Include="Resources\Localization\CultureSelector\de.json" />
     <EmbeddedResource Include="Resources\Localization\CultureSelector\en.json" />
     <EmbeddedResource Include="Resources\Localization\FileEdit\de.json" />
@@ -83,6 +82,8 @@
     <EmbeddedResource Include="Resources\Localization\Help\en.json" />
     <EmbeddedResource Include="Resources\Localization\Index\en.json" />
     <EmbeddedResource Include="Resources\Localization\Index\de.json" />
+    <EmbeddedResource Include="Resources\Localization\ValidationMessage\de.json" />
+    <EmbeddedResource Include="Resources\Localization\ValidationMessage\en.json" />
     <EmbeddedResource Include="Resources\Localization\ViewModeImport\de.json" />
     <EmbeddedResource Include="Resources\Localization\ViewModeImport\en.json" />
     <EmbeddedResource Include="Resources\Localization\ViewModeRecord\de.json" />
@@ -95,19 +96,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.2" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.5" />
     <PackageReference Include="MetaBrainz.MusicBrainz" Version="5.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.10" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.1" PrivateAssets="all" />
 	  <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
-    <PackageReference Include="Blazorise.Components" Version="1.1.2" />
+    <PackageReference Include="Blazorise.Components" Version="1.1.5" />
     <PackageReference Include="Howler.Blazor" Version="0.9.8" />
     <PackageReference Include="Markdig" Version="0.30.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
-    <PackageReference Include="Toolbelt.Blazor.HotKeys" Version="13.0.0" />
-    <PackageReference Include="z440.atl.core" Version="4.13.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
+    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="1.0.0" />
+    <PackageReference Include="z440.atl.core" Version="4.17.0" />
   </ItemGroup>
 
 </Project>
diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj.user b/AudioCuesheetEditor/AudioCuesheetEditor.csproj.user
diff --git a/AudioCuesheetEditor/Controller/CuesheetController.cs b/AudioCuesheetEditor/Controller/CuesheetController.cs
diff --git a/AudioCuesheetEditor/Data/Options/LocalStorageOptionsProvider.cs b/AudioCuesheetEditor/Data/Options/LocalStorageOptionsProvider.cs
@@ -35,7 +35,7 @@ public LocalStorageOptionsProvider(IJSRuntime jsRuntime)
             _jsRuntime = jsRuntime;
         }
 
-        public async ValueTask<T> GetOptions<T>() where T : IOptions
+        public async Task<T> GetOptions<T>() where T : IOptions
         {
             var type = typeof(T);
             IOptions? options = (IOptions?)Activator.CreateInstance(type);
@@ -45,14 +45,7 @@ public async ValueTask<T> GetOptions<T>() where T : IOptions
                 try
                 {
                     options = (IOptions?)JsonSerializer.Deserialize(optionsJson, typeof(T));
-                    if (options != null)
-                    {
-                        options.SetDefaultValues();
-                    }
-                    else
-                    {
-                        options = (IOptions?)Activator.CreateInstance(typeof(T));
-                    }
+                    options ??= (IOptions?)Activator.CreateInstance(typeof(T));
                 }
                 catch (JsonException)
                 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     **/obj
     **/.vs
     *.user
+    *.user