Skip to content

Update FluentUI to 4.11.9 #9417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmoseley merged 2 commits into from
May 20, 2025
Merged

Update FluentUI to 4.11.9 #9417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3da5452
Update FluentUI to 4.11.9
JamesNK May 20, 2025
a63de24
Fix test
JamesNK May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<PackageVersion Include="KubernetesClient" Version="16.0.7" />
<PackageVersion Include="JsonPatch.Net" Version="3.3.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.6" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.6" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.9" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.9" />
<PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1" />
<PackageVersion Include="MongoDB.Driver" Version="3.4.0" />
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.0.0" />
Expand Down
8 changes: 0 additions & 8 deletions src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/Aspire.Dashboard/Components/Controls/FixedFluentCombobox.razor.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/Aspire.Dashboard/Components/Dialogs/FilterDialog.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</div>

<div class="filter-input-container">
<FixedFluentCombobox TOption="SelectViewModel<FieldValue>"
<FluentCombobox TOption="SelectViewModel<FieldValue>"
@bind-Value="_formModel.Value"
@bind-Value:after="ValueChanged"
Items="@_filteredValues"
Expand All @@ -53,7 +53,7 @@
</FluentBadge>
<FluentHighlighter Text="@optionContext.Name" HighlightedText="@_formModel.Value" />
</OptionTemplate>
</FixedFluentCombobox>
</FluentCombobox>
<ValidationMessage For="() => _formModel.Value" />
</div>

Expand Down
22 changes: 7 additions & 15 deletions src/Aspire.Dashboard/Model/IconResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,13 @@ private sealed record IconKey(string IconName, IconSize DesiredIconSize, IconVar

private static bool TryGetIcon(IconKey key, IconSize size, [NotNullWhen(true)] out CustomIcon? icon)
{
try
var iconInfo = new IconInfo
{
icon = (new IconInfo
{
Name = key.IconName,
Variant = key.IconVariant,
Size = size
}).GetInstance();
return true;
}
catch
{
// Icon name or size couldn't be found.
icon = null;
return false;
}
Name = key.IconName,
Variant = key.IconVariant,
Size = size
};

return iconInfo.TryGetInstance(out icon);
}
}
1 change: 1 addition & 0 deletions tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ private void SetupConsoleLogsServices(TestDashboardClient? dashboardClient = nul
Services.AddSingleton<BrowserTimeProvider>(timeProvider ?? new TestTimeProvider());
Services.AddSingleton<IMessageService, MessageService>();
Services.AddSingleton<IToastService, ToastService>();
Services.AddSingleton<GlobalState>();
Services.AddSingleton<IOptions<DashboardOptions>>(Options.Create(new DashboardOptions()));
Services.AddSingleton<DimensionManager>();
Services.AddSingleton<TelemetryRepository>();
Expand Down