Skip to content

Commit f83f0e9

Browse files
NeoCoderMatrix86NeoCoderMatrix86
authored
Merge pull request #542 from NeoCoderMatrix86/512-update-to-net-10
Update to net 10
2 parents 056ec1a + 5ca3079 commit f83f0e9

30 files changed

Lines changed: 203 additions & 251 deletions

‎.editorconfig‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
[*.cs]
2-
3-
# IDE0016: throw-Ausdruck verwenden
4-
csharp_style_throw_expression = false:suggestion
5-
6-
# IDE0057: Bereichsoperator verwenden
7-
csharp_style_prefer_range_operator = false:suggestion
1+
[*.cs]

‎.github/workflows/build_pipeline.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

20-
# version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/9.0
20+
# version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/10.0
2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@v4
22+
uses: actions/setup-dotnet@v5
2323
with:
24-
dotnet-version: 9.0.x
24+
dotnet-version: 10.0.x
2525

2626
- name: Install wasm-tools
27-
run: dotnet workload install wasm-tools-net9
27+
run: dotnet workload install wasm-tools
2828

2929
- name: Build release
3030
run: dotnet publish AudioCuesheetEditor --configuration Release --output release
3131

3232
- name: Upload Build Artifact
33-
uses: actions/upload-artifact@v4
33+
uses: actions/upload-artifact@v6
3434
with:
3535
name: AudioCuesheetEditor-Release
3636
path: ./release
@@ -45,7 +45,7 @@ jobs:
4545
}}
4646
steps:
4747
- name: Download Build Artifact
48-
uses: actions/download-artifact@v4
48+
uses: actions/download-artifact@v7
4949
with:
5050
name: AudioCuesheetEditor-Release
5151
- name: Deploy to Netlify

‎.github/workflows/run_tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ jobs:
99
run-tests:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4.2.2
12+
- uses: actions/checkout@v6
1313

1414
- name: Set timestamp variable
1515
id: timestamp
1616
run: echo "datetime=$(date +'%Y-%m-%d_%H-%M-%S')" >> $GITHUB_OUTPUT
1717

18-
# version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/9.0
18+
# version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/10.0
1919
- name: Setup .NET
20-
uses: actions/setup-dotnet@v4
20+
uses: actions/setup-dotnet@v5
2121
with:
22-
dotnet-version: 9.0.x
22+
dotnet-version: 10.0.x
2323

2424
- name: Install wasm-tools
25-
run: dotnet workload install wasm-tools-net9
25+
run: dotnet workload install wasm-tools
2626

2727
- name: Build & Install
2828
run: dotnet build
2929
- name: Ensure browsers are installed
30-
run: pwsh AudioCuesheetEditor.End2EndTests/bin/Debug/net9.0/playwright.ps1 install --with-deps
30+
run: pwsh AudioCuesheetEditor.End2EndTests/bin/Debug/net10.0/playwright.ps1 install --with-deps
3131

3232
- name: Start App
3333
run: dotnet run --project AudioCuesheetEditor &
@@ -59,8 +59,8 @@ jobs:
5959

6060
- name: Upload traces
6161
if: always()
62-
uses: actions/upload-artifact@v4
62+
uses: actions/upload-artifact@v6
6363
with:
6464
name: playwright-traces-${{ steps.timestamp.outputs.datetime }}
65-
path: AudioCuesheetEditor.End2EndTests/bin/Debug/net9.0/playwright-traces/
65+
path: AudioCuesheetEditor.End2EndTests/bin/Debug/net10.0/playwright-traces/
6666
if-no-files-found: ignore

‎AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>

‎AudioCuesheetEditor.End2EndTests/MSTestSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
1+
[assembly: Parallelize()]

‎AudioCuesheetEditor.End2EndTests/Models/AppBar.cs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,32 @@
1818

1919
namespace AudioCuesheetEditor.End2EndTests.Models
2020
{
21-
partial class AppBar
21+
partial class AppBar(IPage page)
2222
{
2323
[GeneratedRegex("^Open$")]
2424
private static partial Regex OpenRegex();
2525

26-
private readonly IPage _page;
27-
private readonly ILocator _menuButton;
26+
private readonly IPage _page = page;
27+
internal ILocator MenuButton => _page.GetByRole(AriaRole.Toolbar).GetByRole(AriaRole.Button, new() { Name = "More" });
2828

2929
internal ILocator UndoButton => _page.GetByRole(AriaRole.Button, new() { Name = "undo" });
3030

3131
internal ILocator RedoButton => _page.GetByRole(AriaRole.Button, new() { Name = "redo" });
3232

3333
internal ILocator HomeButton => _page.Locator(".mud-button-root").First;
3434

35-
internal AppBar(IPage page)
36-
{
37-
_page = page;
38-
_menuButton = _page.GetByRole(AriaRole.Button, new() { Name = "More" });
39-
}
40-
4135
internal async Task OpenSettingsAsync()
4236
{
43-
await _menuButton.ClickAsync();
37+
await MenuButton.ClickAsync();
4438
await _page.GetByText("Settings").ClickAsync();
4539
}
4640

4741
internal async Task ChangeLanguageAsync(string language)
4842
{
4943
await _page.GetByRole(AriaRole.Button, new() { Name = "Change language" }).ClickAsync();
5044
await _page.GetByText(language).ClickAsync();
45+
await _page.WaitForLoadStateAsync(LoadState.NetworkIdle);
46+
await _page.WaitForFunctionAsync(@"() => window.Blazor !== undefined");
5147
}
5248

5349
internal async Task UndoAsync()
@@ -81,7 +77,7 @@ internal async Task OpenExportDialogAsync(string exportType, string fileMenuName
8177

8278
internal async Task OpenDisplayHotkeysAsync()
8379
{
84-
await _page.GetByRole(AriaRole.Button, new() { Name = "More" }).ClickAsync();
80+
await MenuButton.ClickAsync();
8581
await _page.GetByText("Hotkeys").ClickAsync();
8682
}
8783
}

‎AudioCuesheetEditor.End2EndTests/Tests/Desktop/ExportTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
8383
await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
8484
await detailView.EditTrackAsync("Track Artist 1", "Track Title 1");
8585
await bar.OpenExportDialogAsync("Textfile");
86-
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next" }).ClickAsync();
86+
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next", Exact = true }).ClickAsync();
8787
var downloadTask = TestPage.WaitForDownloadAsync();
8888
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Download-YouTube.txt" }).ClickAsync();
8989
var download = await downloadTask;

‎AudioCuesheetEditor.End2EndTests/Tests/Smartphone/ExportTestSmartphone.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
8383
await detailView.AudiofileInput.SetInputFilesAsync("Kalimba.mp3");
8484
await detailView.EditTrackAsync("Track Artist 1", "Track Title 1");
8585
await bar.OpenExportDialogAsync("Textfile");
86-
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next" }).ClickAsync();
86+
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Next", Exact = true }).ClickAsync();
8787
var downloadTask = TestPage.WaitForDownloadAsync();
8888
await TestPage.GetByRole(AriaRole.Button, new() { Name = "Download-YouTube.txt" }).ClickAsync();
8989
var download = await downloadTask;

‎AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
6-
<Nullable>enable</Nullable>
6+
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
<EnableMSTestRunner>true</EnableMSTestRunner>
99
<OutputType>Exe</OutputType>

‎AudioCuesheetEditor/AudioCuesheetEditor.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
99
<RazorLangVersion>3.0</RazorLangVersion>
10-
<Version>10.4.0</Version>
10+
<Version>11.0.0</Version>
1111
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
1212
<PublishTrimmed>true</PublishTrimmed>
1313
<RunAOTCompilation>true</RunAOTCompilation>
@@ -22,13 +22,13 @@
2222
<ItemGroup>
2323
<PackageReference Include="HtmlSanitizer" Version="9.0.892" />
2424
<PackageReference Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.13" />
26-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.13" PrivateAssets="all" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
26+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all" />
2727
<PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
2828
<PackageReference Include="Howler.Blazor" Version="0.10.0" />
29-
<PackageReference Include="Markdig" Version="0.45.0" />
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.13" />
31-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.13" />
29+
<PackageReference Include="Markdig" Version="1.1.0" />
30+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.3" />
3232
<PackageReference Include="MudBlazor" Version="8.15.0" />
3333
<PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.2.0" />
3434
<PackageReference Include="z440.atl.core" Version="7.11.0" />

0 commit comments

Comments
 (0)