Skip to content

Commit c43e298

Browse files
authored
Maintenance: update packages to latest versions (#6543)
* Update to latest packages * migrate bUnit tests * update CodeAnalysis packages
1 parent 988edec commit c43e298

59 files changed

Lines changed: 490 additions & 482 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Directory.Packages.props

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,56 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
5-
65
<ItemGroup Label="General">
7-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
6+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
87
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
98
<PackageVersion Include="Blazorise.Licensing" Version="1.3.0" />
10-
<PackageVersion Include="Bogus" Version="35.6.3" />
11-
<PackageVersion Include="bunit" Version="1.34.0" />
9+
<PackageVersion Include="Bogus" Version="35.6.5" />
10+
<PackageVersion Include="bunit" Version="2.7.2" />
1211
<PackageVersion Include="ColorCode.HTML" Version="2.0.15" />
13-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
14-
<PackageVersion Include="Exceptionless.RandomData" Version="1.2.2" />
15-
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
16-
<PackageVersion Include="FluentValidation" Version="11.10.0" />
17-
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.10.0" />
18-
<PackageVersion Include="Flurl.Http" Version="4.0.0-pre2" />
12+
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
13+
<PackageVersion Include="Exceptionless.RandomData" Version="2.0.1" />
14+
<PackageVersion Include="FluentAssertions" Version="8.9.0" />
15+
<PackageVersion Include="FluentValidation" Version="12.1.1" />
16+
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
17+
<PackageVersion Include="Flurl.Http" Version="4.0.2" />
1918
<PackageVersion Include="Fody" Version="6.9.3" />
2019
<PackageVersion Include="FodyHelpers" Version="6.9.3" />
2120
<PackageVersion Include="FodyPackaging" Version="6.9.3" />
2221
<PackageVersion Include="Lambda2Js" Version="3.1.4" />
23-
<PackageVersion Include="MailKit" Version="4.8.0" />
24-
<PackageVersion Include="Markdig" Version="0.43.0" />
22+
<PackageVersion Include="MailKit" Version="4.16.0" />
23+
<PackageVersion Include="Markdig" Version="1.1.3" />
2524
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
2625
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" />
2726
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.5" />
2827
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.5" />
2928
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
3029
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
31-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
32-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
33-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
30+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
31+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
32+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
3433
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.5" />
3534
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.5" />
3635
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
3736
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
3837
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.5" />
39-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
40-
<PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.48.0" />
41-
<PackageVersion Include="MimeKit" Version="4.15.1" />
38+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
39+
<PackageVersion Include="Microsoft.Playwright.NUnit" Version="1.59.0" />
40+
<PackageVersion Include="MimeKit" Version="4.16.0" />
4241
<PackageVersion Include="Moq" Version="4.20.72" />
43-
<PackageVersion Include="ModelContextProtocol" Version="0.5.0-preview.1" />
44-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
45-
<PackageVersion Include="xunit" Version="2.9.2" />
46-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
42+
<PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
43+
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
44+
<PackageVersion Include="xunit" Version="2.9.3" />
45+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
4746
</ItemGroup>
48-
4947
<ItemGroup Label="AspNetCore Components">
5048
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.25" Condition="'$(TargetFramework)' == 'net8.0'" />
5149
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.14" Condition="'$(TargetFramework)' == 'net9.0'" />
5250
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.5" Condition="'$(TargetFramework)' == 'net10.0'" />
53-
5451
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.25" Condition="'$(TargetFramework)' == 'net8.0'" />
5552
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.14" Condition="'$(TargetFramework)' == 'net9.0'" />
5653
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.5" Condition="'$(TargetFramework)' == 'net10.0'" />
5754
</ItemGroup>
58-
5955
<ItemGroup Label="Logging">
6056
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" Condition="'$(TargetFramework)' == 'net8.0'" />
6157
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.14" Condition="'$(TargetFramework)' == 'net9.0'" />
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System.Threading.Tasks;
2+
using Bunit;
3+
using Xunit;
4+
5+
namespace Blazorise.Tests;
6+
7+
public class AsyncBunitContext : Bunit.BunitContext, IAsyncLifetime
8+
{
9+
public Task InitializeAsync()
10+
=> Task.CompletedTask;
11+
12+
async Task IAsyncLifetime.DisposeAsync()
13+
=> await base.DisposeAsync();
14+
15+
public new void Dispose()
16+
=> base.DisposeAsync().AsTask().GetAwaiter().GetResult();
17+
18+
public new ValueTask DisposeAsync()
19+
=> base.DisposeAsync();
20+
}

Tests/Blazorise.Tests/Components/AutoCompleteComponentTest.cs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Using directives
1+
#region Using directives
22
using System.Collections.Generic;
33
using System.Threading.Tasks;
44
using Blazorise;
@@ -26,7 +26,7 @@ public AutocompleteComponentTest()
2626
public void AriaAttributes_AreAppliedToDropdown()
2727
{
2828
// setup
29-
var comp = RenderComponent<Autocomplete<string, string>>( parameters => parameters
29+
var comp = Render<Autocomplete<string, string>>( parameters => parameters
3030
.Add( p => p.Data, new List<string> { "Alpha" } )
3131
.Add( p => p.TextField, item => item )
3232
.Add( p => p.ValueField, item => item )
@@ -50,7 +50,7 @@ public void AriaAttributes_AreAppliedToDropdown()
5050
[Fact]
5151
public void AriaLabelledBy_IsAppliedToDropdown_WhenProvided()
5252
{
53-
var comp = RenderComponent<Autocomplete<string, string>>( parameters => parameters
53+
var comp = Render<Autocomplete<string, string>>( parameters => parameters
5454
.Add( p => p.Data, new List<string> { "Alpha" } )
5555
.Add( p => p.TextField, item => item )
5656
.Add( p => p.ValueField, item => item )
@@ -66,7 +66,7 @@ public void AriaLabelledBy_IsAppliedToDropdown_WhenProvided()
6666
[Fact]
6767
public async Task FreeTypingNotFoundTemplate_Should_DisplayDefinedContent_WhenFreeTypingIsTrue()
6868
{
69-
var comp = RenderComponent<AutocompleteComponent>(
69+
var comp = Render<AutocompleteComponent>(
7070
p => p.Add( x => x.FreeTyping, true ) );
7171

7272
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -83,7 +83,7 @@ public async Task FreeTypingNotFoundTemplate_Should_DisplayDefinedContent_WhenFr
8383
[Fact]
8484
public async Task NotfoundContent_Should_DisplayDefinedContent_When_FreeTypingIsFalse()
8585
{
86-
var comp = RenderComponent<AutocompleteComponent>(
86+
var comp = Render<AutocompleteComponent>(
8787
p => p.Add( x => x.FreeTyping, false ) );
8888

8989
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -101,7 +101,7 @@ public async Task NotfoundContent_Should_DisplayDefinedContent_When_FreeTypingIs
101101
public async Task SearchTextChanged_ShouldTrigger_Once()
102102
{
103103
var changedCount = 0;
104-
var comp = RenderComponent<AutocompleteComponent>( p =>
104+
var comp = Render<AutocompleteComponent>( p =>
105105
p.Add( x => x.SearchTextChanged, ( x ) => changedCount++ ) );
106106

107107
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -114,11 +114,11 @@ public async Task SearchTextChanged_ShouldTrigger_Once()
114114
public async Task SearchKeyDown_ShouldTrigger_Once()
115115
{
116116
var changedCount = 0;
117-
var comp = RenderComponent<AutocompleteComponent>( p =>
117+
var comp = Render<AutocompleteComponent>( p =>
118118
p.Add( x => x.SearchKeyDown, ( x ) => changedCount++ ) );
119119

120120
var autoComplete = comp.Find( ".b-is-autocomplete input" );
121-
await autoComplete.KeyDownAsync( new() { Key = "S" } );
121+
await autoComplete.KeyDownAsync( Key.Get( 'S' ) );
122122

123123
Assert.Equal( 1, changedCount );
124124
}
@@ -127,7 +127,7 @@ public async Task SearchKeyDown_ShouldTrigger_Once()
127127
public async Task SearchBlur_ShouldTrigger_Once()
128128
{
129129
var changedCount = 0;
130-
var comp = RenderComponent<AutocompleteComponent>( p =>
130+
var comp = Render<AutocompleteComponent>( p =>
131131
p.Add( x => x.SearchBlur, ( x ) => changedCount++ ) );
132132

133133
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -141,7 +141,7 @@ public async Task SearchBlur_ShouldTrigger_Once()
141141
public async Task SearchFocus_ShouldTrigger_Once()
142142
{
143143
var changedCount = 0;
144-
var comp = RenderComponent<AutocompleteComponent>( p =>
144+
var comp = Render<AutocompleteComponent>( p =>
145145
p.Add( x => x.SearchFocus, ( x ) => changedCount++ ) );
146146

147147
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -155,7 +155,7 @@ public async Task SearchFocus_ShouldTrigger_Once()
155155
public async Task Opened_ShouldTrigger_Once()
156156
{
157157
var changedCount = 0;
158-
var comp = RenderComponent<AutocompleteComponent>( p =>
158+
var comp = Render<AutocompleteComponent>( p =>
159159
p.Add( x => x.Opened, ( x ) => changedCount++ ) );
160160

161161
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -170,7 +170,7 @@ public async Task Opened_ShouldTrigger_Once()
170170
public async Task Closed_ShouldTrigger_OnAutocompleteClosed_Once()
171171
{
172172
var changedCount = 0;
173-
var comp = RenderComponent<AutocompleteComponent>( p =>
173+
var comp = Render<AutocompleteComponent>( p =>
174174
p.Add( x => x.Closed, ( x ) => changedCount++ ) );
175175

176176
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -185,7 +185,7 @@ public async Task Closed_ShouldTrigger_OnAutocompleteClosed_Once()
185185
public async Task SelectedValueChanged_ShouldOnlyTrigger_WhenValueHasBeenFound()
186186
{
187187
var changedCount = 0;
188-
var comp = RenderComponent<AutocompleteComponent>( p =>
188+
var comp = Render<AutocompleteComponent>( p =>
189189
p.Add( x => x.SelectedValueChanged, ( x ) => changedCount++ ) );
190190

191191
var autoComplete = comp.Find( ".b-is-autocomplete input" );
@@ -201,7 +201,7 @@ public async Task SelectedValueChanged_OnBackspace_ShouldNotTrigger_IfSameValue_
201201
{
202202
var changedCount = 0;
203203
var selectedValue = string.Empty;
204-
var comp = RenderComponent<AutocompleteComponent>( p =>
204+
var comp = Render<AutocompleteComponent>( p =>
205205
p.Add( x => x.SelectedValueChanged, ( x ) =>
206206
{
207207
selectedValue = x;
@@ -213,16 +213,16 @@ public async Task SelectedValueChanged_OnBackspace_ShouldNotTrigger_IfSameValue_
213213

214214
await Input( autoComplete, input, true );
215215

216-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
216+
await autoComplete.KeyDownAsync( Key.Backspace );
217217
await autoComplete.InputAsync( "Portuga" );
218-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
218+
await autoComplete.KeyDownAsync( Key.Backspace );
219219
await autoComplete.InputAsync( "Portug" );
220220

221221
Assert.Equal( 1, changedCount );
222222
Assert.Equal( "PT", selectedValue );
223223

224224
//Selects first item in dropdown, shouldn't retrigger ValueChanged
225-
await autoComplete.KeyDownAsync( new() { Code = "Enter" } );
225+
await autoComplete.KeyDownAsync( Key.Enter );
226226
Assert.Equal( 1, changedCount );
227227
Assert.Equal( "PT", selectedValue );
228228
}
@@ -232,7 +232,7 @@ public async Task SelectedValueChanged_OnBackspace_ShouldTriggerNull_OnBlur()
232232
{
233233
var changedCount = 0;
234234
var selectedValue = string.Empty;
235-
var comp = RenderComponent<AutocompleteComponent>( p =>
235+
var comp = Render<AutocompleteComponent>( p =>
236236
p.Add( x => x.SelectedValueChanged, ( x ) =>
237237
{
238238
selectedValue = x;
@@ -244,9 +244,9 @@ public async Task SelectedValueChanged_OnBackspace_ShouldTriggerNull_OnBlur()
244244

245245
await Input( autoComplete, input, true );
246246

247-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
247+
await autoComplete.KeyDownAsync( Key.Backspace );
248248
await autoComplete.InputAsync( "Portuga" );
249-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
249+
await autoComplete.KeyDownAsync( Key.Backspace );
250250
await autoComplete.InputAsync( "Portug" );
251251

252252
Assert.Equal( 1, changedCount );
@@ -262,7 +262,7 @@ public async Task SelectedValueChanged_OnBackspace_ShouldTriggerNull_IfNoValue_O
262262
{
263263
var changedCount = 0;
264264
var selectedValue = string.Empty;
265-
var comp = RenderComponent<AutocompleteComponent>( p =>
265+
var comp = Render<AutocompleteComponent>( p =>
266266
p.Add( x => x.SelectedValueChanged, ( x ) =>
267267
{
268268
selectedValue = x;
@@ -274,17 +274,17 @@ public async Task SelectedValueChanged_OnBackspace_ShouldTriggerNull_IfNoValue_O
274274

275275
await Input( autoComplete, input, true );
276276

277-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
277+
await autoComplete.KeyDownAsync( Key.Backspace );
278278
await autoComplete.InputAsync( "Portuga" );
279-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
279+
await autoComplete.KeyDownAsync( Key.Backspace );
280280
await autoComplete.InputAsync( "Portug" );
281281
await autoComplete.InputAsync( "Portugl" );
282282

283283
Assert.Equal( 1, changedCount );
284284
Assert.Equal( "PT", selectedValue );
285285

286286
//Selects first item in dropdown, shouldn't retrigger ValueChanged
287-
await autoComplete.KeyDownAsync( new() { Code = "Enter" } );
287+
await autoComplete.KeyDownAsync( Key.Enter );
288288
Assert.Equal( 2, changedCount );
289289
Assert.Null( selectedValue );
290290
}
@@ -294,7 +294,7 @@ public async Task SelectedValueChanged_OnBackspace_ShouldTriggerNull_IfNoValue_O
294294
{
295295
var changedCount = 0;
296296
var selectedValue = string.Empty;
297-
var comp = RenderComponent<AutocompleteComponent>( p =>
297+
var comp = Render<AutocompleteComponent>( p =>
298298
p.Add( x => x.SelectedValueChanged, ( x ) =>
299299
{
300300
selectedValue = x;
@@ -306,9 +306,9 @@ public async Task SelectedValueChanged_OnBackspace_ShouldTriggerNull_IfNoValue_O
306306

307307
await Input( autoComplete, input, true );
308308

309-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
309+
await autoComplete.KeyDownAsync( Key.Backspace );
310310
await autoComplete.InputAsync( "Portuga" );
311-
await autoComplete.KeyDownAsync( new() { Code = "Backspace" } );
311+
await autoComplete.KeyDownAsync( Key.Backspace );
312312
await autoComplete.InputAsync( "Portug" );
313313
await autoComplete.InputAsync( "Portugl" );
314314

@@ -326,7 +326,7 @@ public async Task SelectedValueChanged_OnAnyEntry_ShouldOnlyTrigger_OnCommit()
326326
var changedCount = 0;
327327
var selectedValue = string.Empty;
328328

329-
var comp = RenderComponent<AutocompleteComponent>( p =>
329+
var comp = Render<AutocompleteComponent>( p =>
330330
p.Add( x => x.SelectedValueChanged, ( x ) =>
331331
{
332332
selectedValue = x;
@@ -351,7 +351,7 @@ public async Task SelectedValueChanged_OnAnyEntry_ShouldOnlyTrigger_OnCommit()
351351
public async Task SelectedValueChanged_ShouldOnlyTrigger_WhenValueHasBeenFoundAndCommitted()
352352
{
353353
var changedCount = 0;
354-
var comp = RenderComponent<AutocompleteComponent>( p =>
354+
var comp = Render<AutocompleteComponent>( p =>
355355
{
356356
p.Add( x => x.SelectedValueChanged, ( x ) => changedCount++ );
357357
p.Add( x => x.Countries,
@@ -372,7 +372,7 @@ public async Task SelectedValueChanged_ShouldOnlyTrigger_IfValueIsAlreadySet_But
372372
{
373373
var changedCount = 0;
374374
var selectedValue = "PT";
375-
var comp = RenderComponent<AutocompleteComponent>( p =>
375+
var comp = Render<AutocompleteComponent>( p =>
376376
{
377377
p.Add( x => x.SelectedValue, selectedValue );
378378
p.Add( x => x.SelectedValueChanged, ( x ) => { selectedValue = x; changedCount++; } );
@@ -393,7 +393,7 @@ public async Task SelectedValueChanged_ShouldOnlyTrigger_IfValueIsAlreadySet_But
393393
public async Task SelectedTextChanged_ShouldOnlyTrigger_WhenValueHasBeenFound()
394394
{
395395
var changedCount = 0;
396-
var comp = RenderComponent<AutocompleteComponent>( p =>
396+
var comp = Render<AutocompleteComponent>( p =>
397397
{
398398
p.Add( x => x.SelectedTextChanged, ( x ) => changedCount++ );
399399
p.Add( x => x.FreeTyping, false );
@@ -411,7 +411,7 @@ public async Task SelectedTextChanged_ShouldOnlyTrigger_WhenValueHasBeenFound()
411411
public async Task SelectedTextChanged_FreeTyping_ShouldOnlyTrigger_OnEveryKeyStroke()
412412
{
413413
var changedCount = 0;
414-
var comp = RenderComponent<AutocompleteComponent>( p =>
414+
var comp = Render<AutocompleteComponent>( p =>
415415
{
416416
p.Add( x => x.SelectedTextChanged, ( x ) => changedCount++ );
417417
p.Add( x => x.FreeTyping, true );
@@ -430,7 +430,7 @@ public async Task SelectedTextChanged_NoFreeTyping_ShouldOnlyTrigger_IfValueIsAl
430430
{
431431
var changedCount = 0;
432432
var selectedText = "Portugal";
433-
var comp = RenderComponent<AutocompleteComponent>( p =>
433+
var comp = Render<AutocompleteComponent>( p =>
434434
{
435435
p.Add( x => x.FreeTyping, false );
436436
p.Add( x => x.SelectedText, selectedText );

0 commit comments

Comments
 (0)