Skip to content

Commit b505cf8

Browse files
vnbaaijvnbaaij
committed
Merge branch 'dev'
2 parents 116d700 + 13ca8a9 commit b505cf8

File tree

100 files changed

+1399
-371
lines changed

Some content is hidden

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

100 files changed

+1399
-371
lines changed

‎Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
1313
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
1414

15-
<VersionFile>4.11.6</VersionFile>
16-
<VersionPrefix>4.11.6</VersionPrefix>
15+
<VersionFile>4.11.7</VersionFile>
16+
<VersionPrefix>4.11.7</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

‎Directory.Packages.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<RuntimeVersion8>8.0.0</RuntimeVersion8>
5-
<AspNetCoreVersion8>8.0.13</AspNetCoreVersion8>
6-
<EfCoreVersion8>8.0.13</EfCoreVersion8>
7-
<RuntimeVersion9>9.0.2</RuntimeVersion9>
8-
<AspNetCoreVersion9>9.0.2</AspNetCoreVersion9>
9-
<EfCoreVersion9>9.0.2</EfCoreVersion9>
5+
<AspNetCoreVersion8>8.0.14</AspNetCoreVersion8>
6+
<EfCoreVersion8>8.0.14</EfCoreVersion8>
7+
<RuntimeVersion9>9.0.3</RuntimeVersion9>
8+
<AspNetCoreVersion9>9.0.3</AspNetCoreVersion9>
9+
<EfCoreVersion9>9.0.3</EfCoreVersion9>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<!-- For Sample Apps -->
1313
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.0" />
14-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.3" />
15-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.3" />
14+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.6" />
15+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.6" />
1616
<!-- Test dependencies -->
1717
<PackageVersion Include="bunit" Version="1.33.3" />
1818
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
1919
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2020
<PackageVersion Include="xunit" Version="2.9.2" />
21-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
21+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
2222
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
2323
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
2424
<!-- Shared dependencies -->
2525
<PackageVersion Include="Markdig.Signed" Version="0.34.0" />
2626
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
27-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
2828
<PackageVersion Include="Microsoft.OData.Client" Version="8.2.3" />
29-
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" />
29+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" />
3030
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
3131
</ItemGroup>
3232
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
@@ -66,4 +66,4 @@
6666
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
6767
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
6868
</ItemGroup>
69-
</Project>
69+
</Project>

‎WHATSNEW.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
## V4.11.7
2+
3+
### Components
4+
- \[General\] Enable having multiple paginators ([#3487](https://github.com/microsoft/fluentui-blazor/pull/3487))
5+
- \[CounterBadge\] Add support for additional attributes ([#3542](https://github.com/microsoft/fluentui-blazor/pull/3542))
6+
- \[CounterBadge\] Fix `HorizontalPosition`/`VerticalPosition` not being used ([#3490](https://github.com/microsoft/fluentui-blazor/pull/3490))
7+
- \[DataGrid\] Add method to close column options programmatically ([#3501](https://github.com/microsoft/fluentui-blazor/pull/3501))
8+
- \[DataGrid\] Fix styling when using `Virtualize` with `DataGridDisplayMode.Table` ([#3497](https://github.com/microsoft/fluentui-blazor/pull/3497))
9+
- \[DesignTheme\] Add support for setting/getting NuetralBaseColor ([#3530](https://github.com/microsoft/fluentui-blazor/pull/3530))
10+
- \[DesignTheme\] Fix the document.body.dataset.theme from the web component ([#3516](https://github.com/microsoft/fluentui-blazor/pull/3516))
11+
- \[DesignTokens\] Make `AccentBaseColor` and `NeutralBaseColor` work with WithDefault ([#3517](https://github.com/microsoft/fluentui-blazor/pull/3517))
12+
- \[NumberField\] Fix invalid class styling ([#3531](https://github.com/microsoft/fluentui-blazor/pull/3531))
13+
- \[Overlay\] Make default background color follow neutral base color ([#3537](https://github.com/microsoft/fluentui-blazor/pull/3537))
14+
- \[Stack\] Add `Reversed` parameter ([#3505](https://github.com/microsoft/fluentui-blazor/pull/3505))
15+
16+
### Demo site and documentation
17+
- \[Docs\] Add cookie consent ([#3507](https://github.com/microsoft/fluentui-blazor/pull/3507))
18+
- \[Docs\] IconExplorer: Reset current page to 0 when searching ([#3536](https://github.com/microsoft/fluentui-blazor/pull/3536))
19+
- \[Docs]\ Typo in Templates.md file. ([#3503](https://github.com/microsoft/fluentui-blazor/pull/3503))
20+
21+
### Icons and Emoji
22+
- Update to Fluent UI System Icons 1.1.292 (changes since 1.1.278).
23+
24+
We do not have an update on the individual new/changed icons at this time
25+
26+
127
## V4.11.6
228

329
### Components

‎eng/pipelines/version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ variables:
22
# File and Package version
33
# dev branch: 1.2.4-Preview-23282-1' (PackageSuffix is always ignored in Dev branch)
44
# main branch: 1.2.4-RC.1' (PackageSuffix is ignored, if empty, in Main branch)
5-
FileVersion: '4.11.6' # Set the next final version here.
5+
FileVersion: '4.11.7' # Set the next final version here.
66
PackageSuffix: ''

‎examples/Demo/AssetExplorer/Components/Pages/EmojiExplorer.razor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ .. EmojiExtensions.AllEmojis
5656
,
5757
];
5858

59+
await PaginationState.SetCurrentPageIndexAsync(0);
60+
5961
await PaginationState.SetTotalItemCountAsync(EmojisFound.Length);
6062

6163
_searchResultMessage = EmojisFound.Length == 0 ? "No emoji found." : string.Empty;

‎examples/Demo/AssetExplorer/Components/Pages/IconExplorer.razor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ .. IconsExtensions.AllIcons
6363
,
6464
];
6565

66+
await PaginationState.SetCurrentPageIndexAsync(0);
67+
6668
await PaginationState.SetTotalItemCountAsync(IconsFound.Length);
6769

6870
_searchResultMessage = IconsFound.Length == 0 ? "No icons found." : string.Empty;

‎examples/Demo/Client/Program.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
// ------------------------------------------------------------------------
2+
// MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
3+
// ------------------------------------------------------------------------
4+
15
using FluentUI.Demo.Shared;
2-
using FluentUI.Demo.Shared.SampleData;
6+
37
using Microsoft.AspNetCore.Components.Web;
48
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
59
using Microsoft.FluentUI.AspNetCore.Components;
@@ -13,6 +17,4 @@
1317
builder.Services.AddFluentUIComponents();
1418
builder.Services.AddFluentUIDemoClientServices();
1519

16-
builder.Services.AddScoped<DataSource>();
17-
1820
await builder.Build().RunAsync();

‎examples/Demo/Client/wwwroot/index.html

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,11 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<meta name="description" content="Microsoft Fluent UI Blazor components library. For use with ASP.NET Core Blazor applications">
88
<meta name="keywords" content="Blazor, Fluent UI, demo, components, Microsoft, asp.net core, fluentui">
9-
<title>Fluent UI Blazor Demo site</title>
9+
<title>Fluent UI Blazor Documentation & Demo site</title>
1010
<base href="/" />
1111
<link href="_content/FluentUI.Demo.Shared/css/site.css" rel="stylesheet" />
1212
<link href="FluentUI.Demo.Client.styles.css" rel="stylesheet" />
1313
<link href="_content/FluentUI.Demo.Shared/css/site.css" rel="stylesheet" />
14-
15-
<!-- Statistics -->
16-
<script async src="https://www.googletagmanager.com/gtag/js?id=G-VML6BZWWTC"></script>
17-
<script>
18-
window.dataLayer = window.dataLayer || [];
19-
function gtag() { dataLayer.push(arguments); }
20-
gtag('js', new Date());
21-
22-
gtag('config', 'G-VML6BZWWTC');
23-
</script>
24-
<script type="text/javascript">
25-
(function(c, l, a, r, i, t, y) {
26-
c[a] = c[a] || function() { (c[a].q = c[a].q || []).push(arguments) };
27-
t = l.createElement(r); t.async = 1; t.src = "https://www.clarity.ms/tag/" + i;
28-
y = l.getElementsByTagName(r)[0]; y.parentNode.insertBefore(t, y);
29-
})(window, document, "clarity", "script", "hnr14wvzj8");
30-
</script>
3114
</head>
3215

3316
<body>
@@ -46,6 +29,13 @@
4629

4730
</svg>
4831
<div class="loading-progress-text"></div>
32+
33+
<div class="loading-info">
34+
<em style="display: block;">Welcome to the</em>
35+
<h1 style="margin: 1em 0;">Fluent UI Blazor</h1>
36+
<em style="display: block; margin-bottom: 1em;">demo and documentation site!</em>
37+
<a style="font-size: initial;" href="https://github.com/microsoft/fluentui-blazor" target="_blank">GitHub repository</a>
38+
</div>
4939
</div>
5040

5141
<div id="blazor-error-ui">

‎examples/Demo/Client/wwwroot/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎examples/Demo/Server/FluentUI.Demo.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
1010
</PropertyGroup>
1111

12-
<ItemGroup>
12+
<ItemGroup>
1313
<ProjectReference Include="..\Shared\FluentUI.Demo.Shared.csproj" />
1414
</ItemGroup>
1515

‎examples/Demo/Server/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// ------------------------------------------------------------------------
2+
// MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
3+
// ------------------------------------------------------------------------
4+
15
using FluentUI.Demo.Shared;
26
using FluentUI.Demo.Shared.SampleData;
37
using Microsoft.AspNetCore.Hosting.StaticWebAssets;

‎examples/Demo/Server/wwwroot/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎examples/Demo/Shared/Components/Cookies/CookieConsent.razor

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
@if (_showBanner)
2+
{
3+
<div id="cookieconsent" role="alert">
4+
<div class="info">
5+
<div class="infoicon">
6+
<FluentIcon Value="@(new Microsoft.FluentUI.AspNetCore.Components.Icons.Regular.Size28.Info())" />
7+
</div>
8+
<p class="infomessage">
9+
We use optional cookies to improve your experience on our websites, such as through social media connections, and to display personalized advertising based on your online activity. If you reject optional cookies, only cookies necessary to provide you the services will be used. You may change your selection by clicking “Manage Cookies”.
10+
<a target="_blank" href="https://go.microsoft.com/fwlink/?LinkId=521839">Privacy Statement</a>
11+
<a target="_blank" href="https://aka.ms/3rdpartycookies">Third-Party Cookies</a>
12+
</p>
13+
</div>
14+
<div class="buttons">
15+
<FluentButton Class="button" @onclick="AcceptPolicyAsync" Title="Accept" Appearance="Appearance.Outline">Accept</FluentButton>
16+
<FluentButton Class="button" @onclick="RejectPolicyAsync" Title="Reject" Appearance="Appearance.Outline">Reject</FluentButton>
17+
<FluentButton Class="button" @onclick="ManageCookiesAsync" Title="Manage cookies" Appearance="Appearance.Outline">Manage cookies</FluentButton>
18+
</div>
19+
</div>
20+
}

0 commit comments

Comments
 (0)