Skip to content

Update Sample app packages to 4.11.0-Beta.1 #3023

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
dvoituron merged 1 commit into from
Dec 6, 2024
Merged

Update Sample app packages to 4.11.0-Beta.1 #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>
<ItemGroup>
<!-- For Sample Apps -->
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.4" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.10.4" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.0-beta.1" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.0-beta.1" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.0-beta.1" />
<!-- Test dependencies -->
<PackageVersion Include="bunit" Version="1.31.3" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
Expand Down
6 changes: 3 additions & 3 deletions examples/Demo/AssetExplorer/Components/Controls/PreviewCard.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
@TopLeftLabel
</FluentLabel>
<FluentIcon Class="image"
Value="@Icons.GetInstance(Icon)"
Value="@IconsExtensions.GetInstance(Icon)"
Color="@IconColor"
Title="@Icon?.Name" />
}

@if (Emoji is not null)
{
<FluentEmoji Class="image"
Value="@Emojis.GetInstance(Emoji)"
Value="@EmojiExtensions.GetInstance(Emoji)"
Width="64px"
Title="@Emoji?.Name" />
}
Expand All @@ -27,4 +27,4 @@
@Icon?.Name
@Emoji?.Name
</FluentLabel>
</div>
</div>
2 changes: 1 addition & 1 deletion examples/Demo/AssetExplorer/Components/Pages/EmojiExplorer.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ private async Task StartNewSearchAsync()

EmojisFound =
[
.. Emojis.AllEmojis
.. EmojiExtensions.AllEmojis
.Where(i => i.Style == Criteria.Style
&& (string.IsNullOrWhiteSpace(Criteria.SearchTerm) ? true : i.Name.Contains(Criteria.SearchTerm, StringComparison.InvariantCultureIgnoreCase)))
.OrderBy(i => i.Name)
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/AssetExplorer/Components/Pages/IconExplorer.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private async Task StartNewSearchAsync(string property)

IconsFound =
[
.. Icons.AllIcons
.. IconsExtensions.AllIcons
.Where(i => i.Variant == Criteria.Variant
&& (Criteria.Size > 0 ? (int)i.Size == Criteria.Size : true)
&& (string.IsNullOrWhiteSpace(Criteria.SearchTerm) ? true : i.Name.Contains(Criteria.SearchTerm, StringComparison.InvariantCultureIgnoreCase)))
Expand Down
4 changes: 3 additions & 1 deletion examples/Demo/AssetExplorer/Components/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
@using Microsoft.JSInterop
@using FluentUI.Demo.AssetExplorer
@using FluentUI.Demo.AssetExplorer.Components
@using Microsoft.FluentUI.AspNetCore.Components
@using Microsoft.FluentUI.AspNetCore.Components
@using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons
@using Emojis = Microsoft.FluentUI.AspNetCore.Components.Emojis
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Shared/DemoNavProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ------------------------------------------------------------------------

using Microsoft.AspNetCore.Components.Routing;
using Microsoft.FluentUI.AspNetCore.Components;
using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;

namespace FluentUI.Demo.Shared;

Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Shared/Shared/NavItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public abstract record NavItem
public string Title { get; init; } = string.Empty;
public string? Href { get; init; }
public NavLinkMatch Match { get; init; } = NavLinkMatch.Prefix;
public Icon Icon { get; init; } = new Icons.Regular.Size20.Document();
public Icon Icon { get; init; } = new Microsoft.FluentUI.AspNetCore.Components.Icons.Regular.Size20.Document();
}

public record NavLink : NavItem
Expand Down
1 change: 1 addition & 0 deletions examples/Demo/Shared/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
@using Microsoft.FluentUI.AspNetCore.Components.Extensions
@using Microsoft.FluentUI.AspNetCore.Components.DesignTokens
@using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons
@using Emojis = Microsoft.FluentUI.AspNetCore.Components.Emojis

@using Microsoft.JSInterop
Loading