Skip to content

Commit 7b274d3

Browse files
NeoCoderMatrix86NeoCoderMatrix86
authored
Merge pull request #518 from NeoCoderMatrix86/513-prepare-version
Prepare version
2 parents f3e9d52 + 9a0e92d commit 7b274d3

8 files changed

Lines changed: 29 additions & 24 deletions

File tree

‎AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
20-
<PackageReference Include="Microsoft.Playwright.MSTest" Version="1.55.0" />
21-
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.4" />
22-
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
23-
<PackageReference Include="MSTest" Version="3.10.4" />
19+
<PackageReference Include="Microsoft.Playwright.MSTest.v4" Version="1.57.0" />
20+
<PackageReference Include="MSTest" Version="4.0.2" />
2421
</ItemGroup>
2522

2623
<ItemGroup>

‎AudioCuesheetEditor.End2EndTests/MSTestSettings.cs‎

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task DownloadCuesheet_GeneratesCuesheetFile_WhenCuesheetIsValid()
3838
var download = await downloadTask;
3939
using var stream = await download.CreateReadStreamAsync();
4040
using var reader = new StreamReader(stream);
41-
var content = await reader.ReadToEndAsync(TestContext.CancellationTokenSource.Token);
41+
var content = await reader.ReadToEndAsync(TestContext.CancellationToken);
4242
content = content.Replace("\n", Environment.NewLine);
4343
Assert.AreEqual(@"TITLE ""Cuesheet Title 1""
4444
PERFORMER ""Cuesheet Artist 1""
@@ -67,7 +67,7 @@ public async Task DownloadProject_GeneratesProjectFile_WhenCuesheetIsValidAsync(
6767
var download = await downloadTask;
6868
using var stream = await download.CreateReadStreamAsync();
6969
using var reader = new StreamReader(stream);
70-
var content = await reader.ReadToEndAsync(TestContext.CancellationTokenSource.Token);
70+
var content = await reader.ReadToEndAsync(TestContext.CancellationToken);
7171
Assert.AreEqual("{\"Tracks\":[{\"Position\":1,\"Artist\":\"Track Artist 1\",\"Title\":\"Track Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:05:48\",\"Flags\":[],\"IsLinkedToPreviousTrack\":true}],\"Artist\":\"Cuesheet Artist 1\",\"Title\":\"Cuesheet Title 1\",\"Audiofile\":{\"Name\":\"Kalimba.mp3\",\"Duration\":\"00:05:48\",\"AudioCodec\":{\"MimeType\":\"audio/mpeg\",\"FileExtension\":\".mp3\",\"Name\":\"AudioCodec MP3\"}},\"Sections\":[]}", content);
7272
}
7373

@@ -89,7 +89,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
8989
var download = await downloadTask;
9090
using var stream = await download.CreateReadStreamAsync();
9191
using var reader = new StreamReader(stream);
92-
var content = await reader.ReadToEndAsync(TestContext.CancellationTokenSource.Token);
92+
var content = await reader.ReadToEndAsync(TestContext.CancellationToken);
9393
content = content.Replace("\n", Environment.NewLine);
9494
Assert.AreEqual(@"Cuesheet Artist 1 - Cuesheet Title 1
9595
Track Artist 1 - Track Title 1 00:00:00

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task DownloadCuesheet_GeneratesCuesheetFile_WhenCuesheetIsValid()
3838
var download = await downloadTask;
3939
using var stream = await download.CreateReadStreamAsync();
4040
using var reader = new StreamReader(stream);
41-
var content = await reader.ReadToEndAsync(TestContext.CancellationTokenSource.Token);
41+
var content = await reader.ReadToEndAsync(TestContext.CancellationToken);
4242
content = content.Replace("\n", Environment.NewLine);
4343
Assert.AreEqual(@"TITLE ""Cuesheet Title 1""
4444
PERFORMER ""Cuesheet Artist 1""
@@ -67,7 +67,7 @@ public async Task DownloadProject_GeneratesProjectFile_WhenCuesheetIsValidAsync(
6767
var download = await downloadTask;
6868
using var stream = await download.CreateReadStreamAsync();
6969
using var reader = new StreamReader(stream);
70-
var content = await reader.ReadToEndAsync(TestContext.CancellationTokenSource.Token);
70+
var content = await reader.ReadToEndAsync(TestContext.CancellationToken);
7171
Assert.AreEqual("{\"Tracks\":[{\"Position\":1,\"Artist\":\"Track Artist 1\",\"Title\":\"Track Title 1\",\"Begin\":\"00:00:00\",\"End\":\"00:05:48\",\"Flags\":[],\"IsLinkedToPreviousTrack\":true}],\"Artist\":\"Cuesheet Artist 1\",\"Title\":\"Cuesheet Title 1\",\"Audiofile\":{\"Name\":\"Kalimba.mp3\",\"Duration\":\"00:05:48\",\"AudioCodec\":{\"MimeType\":\"audio/mpeg\",\"FileExtension\":\".mp3\",\"Name\":\"AudioCodec MP3\"}},\"Sections\":[]}", content);
7272
}
7373

@@ -89,7 +89,7 @@ public async Task DownloadText_GeneratesTextFile_WhenCuesheetIsValidAsync()
8989
var download = await downloadTask;
9090
using var stream = await download.CreateReadStreamAsync();
9191
using var reader = new StreamReader(stream);
92-
var content = await reader.ReadToEndAsync(TestContext.CancellationTokenSource.Token);
92+
var content = await reader.ReadToEndAsync(TestContext.CancellationToken);
9393
content = content.Replace("\n", Environment.NewLine);
9494
Assert.AreEqual(@"Cuesheet Artist 1 - Cuesheet Title 1
9595
Track Artist 1 - Track Title 1 00:00:00

‎AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
56
<Nullable>enable</Nullable>
67
<IsPackable>false</IsPackable>
8+
<EnableMSTestRunner>true</EnableMSTestRunner>
9+
<OutputType>Exe</OutputType>
10+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
711
</PropertyGroup>
812

913
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1114
<PackageReference Include="Moq" Version="4.20.72" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
13-
<PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
1415
<PackageReference Include="coverlet.collector" Version="6.0.4">
1516
<PrivateAssets>all</PrivateAssets>
1617
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1718
</PackageReference>
19+
<PackageReference Include="MSTest" Version="4.0.2" />
1820
</ItemGroup>
1921

2022
<ItemGroup>

‎AudioCuesheetEditor/AudioCuesheetEditor.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ImplicitUsings>enable</ImplicitUsings>
88
<PackageProjectUrl>https://github.com/NeoCoderMatrix86/AudioCuesheetEditor</PackageProjectUrl>
99
<RazorLangVersion>3.0</RazorLangVersion>
10-
<Version>10.2.0</Version>
10+
<Version>10.3.0</Version>
1111
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
1212
<PublishTrimmed>true</PublishTrimmed>
1313
<RunAOTCompilation>true</RunAOTCompilation>
@@ -20,18 +20,18 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="HtmlSanitizer" Version="9.0.886" />
23+
<PackageReference Include="HtmlSanitizer" Version="9.0.889" />
2424
<PackageReference Include="MetaBrainz.MusicBrainz" Version="7.0.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
26-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.9" PrivateAssets="all" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.11" />
26+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.11" 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.42.0" />
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
31-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.9" />
32-
<PackageReference Include="MudBlazor" Version="8.13.0" />
29+
<PackageReference Include="Markdig" Version="0.44.0" />
30+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.11" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.11" />
32+
<PackageReference Include="MudBlazor" Version="8.15.0" />
3333
<PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.1" />
34-
<PackageReference Include="z440.atl.core" Version="7.5.0" />
34+
<PackageReference Include="z440.atl.core" Version="7.9.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎AudioCuesheetEditor/Services/UI/ApplicationOptionsTimeSpanParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ApplicationOptionsTimeSpanParser
2626
private readonly ILocalStorageOptionsProvider _localStorageOptionsProvider;
2727

2828
private ApplicationOptions? applicationOptions;
29-
private Task? _initTask;
29+
private readonly Task? _initTask;
3030
private bool disposedValue;
3131

3232
public ApplicationOptionsTimeSpanParser(ILocalStorageOptionsProvider localStorageOptionsProvider)

‎global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"test": {
3+
"runner": "Microsoft.Testing.Platform"
4+
}
5+
}

0 commit comments

Comments
 (0)