Skip to content

Commit 2012be1

Browse files
dvoiturondvoituron
authored
[dev-v5] Update to bUnit v2 and all nuget to latest version (#4400)
* Update Packages.props and rename unit.TestContext by Bunit.BunitContext * Update the code to be compatible with bUnit v2 * Update nuget.config
1 parent 5faaa16 commit 2012be1

File tree

101 files changed

+281
-228
lines changed

Some content is hidden

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

101 files changed

+281
-228
lines changed

‎Directory.Packages.props‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,40 @@
1616
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.13.1" />
1717
<PackageVersion Include="LoxSmoke.DocXml" Version="3.8.0" />
1818
<!-- Test dependencies -->
19-
<PackageVersion Include="bunit" Version="1.38.5" />
20-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
19+
<PackageVersion Include="bunit" Version="2.2.2" />
2120
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2221
<PackageVersion Include="xunit" Version="2.9.3" />
23-
<PackageVersion Include="xunit.v3" Version="3.2.0" />
22+
<PackageVersion Include="xunit.v3" Version="3.2.1" />
2423
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
25-
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
24+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
2625
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
27-
<PackageVersion Include="Microsoft.Playwright" Version="1.56.0" />
28-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.3" />
26+
<PackageVersion Include="Microsoft.Playwright" Version="1.57.0" />
27+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
2928
<!-- Shared dependencies -->
30-
<PackageVersion Include="Markdig.Signed" Version="0.43.0" />
31-
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.162" />
29+
<PackageVersion Include="Markdig.Signed" Version="0.44.0" />
30+
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.257" />
3231
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
33-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.final" />
32+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
3433
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
3534
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
3635
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
37-
<PackageVersion Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.12.0-beta1.25155.1" />
38-
</ItemGroup>
39-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
40-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion9)" />
41-
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
42-
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
36+
<PackageVersion Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="5.0.0-1.25277.114" />
4337
</ItemGroup>
4438
<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
4539
<!-- Build dependencies -->
4640
<PackageVersion Include="Microsoft.AspNetCore.Components.Analyzers" Version="$(AspNetCoreVersion9)" />
47-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.3" />
48-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.3" />
41+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion9)" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion9)" />
4943
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(AspNetCoreVersion9)" />
5044
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(AspNetCoreVersion9)" />
5145
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion9)" />
5246
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EfCoreVersion9)" />
5347
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion9)" />
5448
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfCoreVersion9)" />
5549
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(RuntimeVersion9)" />
56-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.3" />
57-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.3" />
58-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.3" />
50+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(RuntimeVersion9)" />
51+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(RuntimeVersion9)" />
52+
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(RuntimeVersion9)" />
5953
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
6054
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
6155
<PackageVersion Include="System.IO.Pipelines" Version="$(RuntimeVersion9)" />

‎src/Core.Scripts/Microsoft.FluentUI.AspNetCore.Components.Scripts.esproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.4110890">
1+
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.4338480">
22
<PropertyGroup>
33
<DebugAssetsDirectory>dist\</DebugAssetsDirectory>
44
<StaticWebAssetSourceId>Microsoft.FluentUI.AspNetCore.Components</StaticWebAssetSourceId>
@@ -10,4 +10,4 @@
1010
<ItemGroup>
1111
<Folder Include="dist\" />
1212
</ItemGroup>
13-
</Project>
13+
</Project>

‎src/Core/Components/DateTime/CalendarTitles.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ public string Label
6969
{
7070
return View switch
7171
{
72+
#pragma warning disable MA0011
7273
CalendarViews.Days => CalendarExtended.GetMonthNameAndYear(),
7374
CalendarViews.Months => CalendarExtended.GetYear(),
7475
CalendarViews.Years => CalendarExtended.GetYearsRangeLabel(Date.GetYear(_calendar.Culture)),
76+
#pragma warning restore MA0011
7577
_ => string.Empty
7678
};
7779
}
@@ -101,7 +103,9 @@ public bool PreviousDisabled
101103
{
102104
get
103105
{
106+
#pragma warning disable MA0011
104107
var minDate = _calendar.Culture.Calendar.MinSupportedDateTime.AddMonths(1);
108+
#pragma warning restore MA0011
105109

106110
return View switch
107111
{

‎tests/Core/Components/Accordion/FluentAccordionItemTests.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@using Microsoft.FluentUI.AspNetCore.Components.Tests.Extensions
33
@using Microsoft.FluentUI.AspNetCore.Components.Utilities
44
@using Xunit
5-
@inherits Bunit.TestContext
5+
@inherits FluentUITestContext
66

77
@code {
88
public FluentAccordionItemTests()

‎tests/Core/Components/Accordion/FluentAccordionTests.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@using Microsoft.FluentUI.AspNetCore.Components.Tests.Extensions
33
@using Microsoft.FluentUI.AspNetCore.Components.Utilities
44
@using Xunit
5-
@inherits Bunit.TestContext
5+
@inherits FluentUITestContext
66

77
@code {
88
public FluentAccordionTests()

‎tests/Core/Components/Avatar/FluentAvatarTests.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@using Microsoft.FluentUI.AspNetCore.Components.Utilities
44
@using Xunit;
55
@using static Microsoft.FluentUI.AspNetCore.Components.Tests.Samples.Icons;
6-
@inherits Bunit.TestContext
6+
@inherits FluentUITestContext
77

88
@code
99
{

‎tests/Core/Components/Badge/FluentBadgeTests.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@using Microsoft.FluentUI.AspNetCore.Components.Tests.Extensions
22
@using Microsoft.FluentUI.AspNetCore.Components.Utilities
33
@using Xunit;
4-
@inherits Bunit.TestContext
4+
@inherits FluentUITestContext
55

66
@code
77
{

‎tests/Core/Components/Base/CachedServicesTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Microsoft.FluentUI.AspNetCore.Components.Tests.Components.Base;
1010

11-
public class CachedServicesTests : Bunit.TestContext
11+
public class CachedServicesTests : Bunit.BunitContext
1212
{
1313
public CachedServicesTests()
1414
{

‎tests/Core/Components/Base/ComponentBaseTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace Microsoft.FluentUI.AspNetCore.Components.Tests.Components.Base;
1616

17-
public class ComponentBaseTests : Bunit.TestContext
17+
public class ComponentBaseTests : Bunit.BunitContext
1818
{
1919
/// <summary>
2020
/// List of components to exclude from the test.
@@ -102,7 +102,7 @@ public void ComponentBase_DefaultProperties(string blazor, string html)
102102
// Arrange and Act
103103
try
104104
{
105-
var renderedComponent = RenderComponent<DynamicComponent>(parameters =>
105+
var renderedComponent = Render<DynamicComponent>(parameters =>
106106
{
107107
parameters.Add(p => p.Type, type);
108108

@@ -169,7 +169,7 @@ public void ComponentBase_TooltipInterface_CorrectRendering()
169169
: componentType;
170170

171171
// Arrange and Act
172-
var renderedComponent = RenderComponent<FluentStack>(stack =>
172+
var renderedComponent = Render<FluentStack>(stack =>
173173
{
174174
stack.AddChildContent<DynamicComponent>(parameters =>
175175
{
@@ -254,7 +254,7 @@ public void ComponentBase_JsModule()
254254
module.Mode = JSRuntimeMode.Loose;
255255

256256
// Act
257-
var cut = RenderComponent<MyComponent>(parameter =>
257+
var cut = Render<MyComponent>(parameter =>
258258
{
259259
parameter.Add(p => p.OnBreakpointEnter, EventCallback.Factory.Create<GridItemSize>(this, e => { }));
260260
});
@@ -278,9 +278,9 @@ public void ComponentBase_JsModule_Undefined()
278278
Assert.Throws<InvalidOperationException>(() =>
279279
{
280280
// Act: no OnBreakpointEnter
281-
var cut = RenderComponent<MyComponent>(parameter =>
281+
var cut = Render<MyComponent>((Action<ComponentParameterCollectionBuilder<MyComponent>>)(parameter =>
282282
{
283-
});
283+
}));
284284

285285
var module = cut.Instance.GetJSModule();
286286
});

‎tests/Core/Components/Base/InputBaseTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace Microsoft.FluentUI.AspNetCore.Components.Tests.Components.Base;
1717

18-
public class InputBaseTests : Bunit.TestContext
18+
public class InputBaseTests : Bunit.BunitContext
1919
{
2020
/// <summary>
2121
/// List of components to exclude from the test.
@@ -45,7 +45,7 @@ public class InputBaseTests : Bunit.TestContext
4545
public InputBaseTests(ITestOutputHelper testOutputHelper)
4646
{
4747
Output = testOutputHelper;
48-
Services.AddFluentUIComponents();
48+
Services.AddFluentUIComponents();
4949
}
5050

5151
/// <summary>
@@ -100,7 +100,7 @@ public void InputBase_DefaultProperties(string attributeName, object attributeVa
100100
: componentType;
101101

102102
// Arrange and Act
103-
var renderedComponent = RenderComponent<DynamicComponent>(parameters =>
103+
var renderedComponent = Render<DynamicComponent>(parameters =>
104104
{
105105
var attributes = new Dictionary<string, object>
106106
{

0 commit comments

Comments
 (0)