Skip to content

Commit fda45b4

Browse files
vnbaaijvnbaaij
committed
Merge branch 'dev'
2 parents e803492 + 921dc78 commit fda45b4

File tree

13 files changed

+368
-186
lines changed

13 files changed

+368
-186
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.9.2</VersionFile>
16-
<VersionPrefix>4.9.2</VersionPrefix>
15+
<VersionFile>4.9.3</VersionFile>
16+
<VersionPrefix>4.9.3</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

‎Directory.Packages.props

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<RuntimeVersion>8.0.0</RuntimeVersion>
5-
<AspNetCoreVersion>8.0.6</AspNetCoreVersion>
6-
<EfCoreVersion>8.0.6</EfCoreVersion>
5+
<AspNetCoreVersion>8.0.7</AspNetCoreVersion>
6+
<EfCoreVersion>8.0.7</EfCoreVersion>
77
</PropertyGroup>
88
<ItemGroup>
99
<!-- For Sample Apps -->
10-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.0" />
10+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.2" />
11+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.9.2" />
1112
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
12-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.9.0" />
13-
1413
<!-- Build dependencies -->
1514
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
1615
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
@@ -26,17 +25,17 @@
2625
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfCoreVersion)" />
2726
<PackageVersion Include="Markdig.Signed" Version="0.34.0" />
2827
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24219.2" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
3029
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48" />
3130
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
32-
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
31+
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
3332
<!-- Test dependencies -->
3433
<PackageVersion Include="bunit" Version="1.28.9" />
3534
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
3635
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
37-
<PackageVersion Include="xunit" Version="2.8.0" />
38-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
36+
<PackageVersion Include="xunit" Version="2.9.0" />
37+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
3938
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
40-
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
39+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
4140
</ItemGroup>
42-
</Project>
41+
</Project>

‎WHATSNEW.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## v4.9.3
2+
### Components
3+
- [General] Inject LibraryConfiguring into DesignToken ([#2426](https://github.com/microsoft/fluentui-blazor/pull/2426))
4+
- [Accordion] Add Id ([#2420](https://github.com/microsoft/fluentui-blazor/pull/2420))
5+
- [Templates] Replace faulty `Appearance.Filled` with `Appearance.Accent` for buttons ([#2436](https://github.com/microsoft/fluentui-blazor/pull/2436))
6+
7+
### Demo site and documentation
8+
- [Docs] Fix broken GitHub link ([#2442](https://github.com/microsoft/fluentui-blazor/pull/2442))
9+
10+
111
## v4.9.2
212
### Components
313
- [General] JavaScript Cache management ([#2388](https://github.com/microsoft/fluentui-blazor/pull/2388))

‎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.9.2' # Set the next final version here.
5+
FileVersion: '4.9.3' # Set the next final version here.
66
PackageSuffix: ''

‎examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml

Lines changed: 324 additions & 164 deletions
Large diffs are not rendered by default.

‎examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor

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

33
@using FluentUI.Demo.Shared.Pages.SplashScreen.Examples;
44

5-
<PageTitle>@App.PageTitle("SlashScreen")</PageTitle>
5+
<PageTitle>@App.PageTitle("SplashScreen")</PageTitle>
66

77
<h1>SplashScreen</h1>
88

‎examples/Demo/Shared/wwwroot/docs/WhatsNew.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## v4.9.3
2+
### Components
3+
- [General] Inject LibraryConfiguring into DesignToken ([#2426](https://github.com/microsoft/fluentui-blazor/pull/2426))
4+
- [Accordion] Add Id ([#2420](https://github.com/microsoft/fluentui-blazor/pull/2420))
5+
- [Templates] Replace faulty `Appearance.Filled` with `Appearance.Accent` for buttons ([#2436](https://github.com/microsoft/fluentui-blazor/pull/2436))
6+
7+
### Demo site and documentation
8+
- [Docs] Fix broken GitHub link ([#2442](https://github.com/microsoft/fluentui-blazor/pull/2442))
9+
10+
111
## v4.9.2
212
### Components
313
- [General] JavaScript Cache management ([#2388](https://github.com/microsoft/fluentui-blazor/pull/2388))
@@ -7,7 +17,7 @@
717
- [MultiSplitter] Fix RTL direction ([#2380](https://github.com/microsoft/fluentui-blazor/pull/2380))
818
- [Overflow] Add `Fixed` parameter ([#2393](https://github.com/microsoft/fluentui-blazor/pull/2393))
919
- [Overflow] Add `Fixed` enumeration ([#2401](https://github.com/microsoft/fluentui-blazor/pull/2401))
10-
- [Search] Add `AutoComplete` parameter ([#2397]((https://github.com/microsoft/fluentui-blazor/pull/2397)))
20+
- [Search] Add `AutoComplete` parameter ([#2397](https://github.com/microsoft/fluentui-blazor/pull/2397))
1121
- [Select] Fix logic when setting new option ([#2384](https://github.com/microsoft/fluentui-blazor/pull/2384))
1222
- [SortableList] Adding Properties `FromListId` and `ToListId` ([#2385](https://github.com/microsoft/fluentui-blazor/pull/2385))
1323
- [SplashScreen] Pass parameters.Modal to `ShowSplashScreen...` methods ([#2398](https://github.com/microsoft/fluentui-blazor/pull/2398))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.1259970">
1+
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.1327710">
22
<PropertyGroup>
33
<DebugAssetsDirectory>dist\</DebugAssetsDirectory>
44
<StaticWebAssetSourceId>Microsoft.FluentUI.AspNetCore.Components</StaticWebAssetSourceId>

‎src/Core/Components/Accordion/FluentAccordion.razor

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
@namespace Microsoft.FluentUI.AspNetCore.Components
1+
@namespace Microsoft.FluentUI.AspNetCore.Components
22
@inherits FluentComponentBase
33
<CascadingValue Value="this" IsFixed="true">
44
<fluent-accordion @ref=Element
5+
id="@Id"
56
class="@Class"
67
style="@Style"
78
expand-mode="@ExpandMode.ToAttributeValue()"

‎src/Core/DesignTokens/DesignToken.razor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ public DesignToken()
5151
/// <summary>
5252
/// Constructs an instance of a DesignToken.
5353
/// </summary>
54-
public DesignToken(IJSRuntime jsRuntime)
54+
public DesignToken(IJSRuntime jsRuntime, LibraryConfiguration libraryConfiguration)
5555
{
5656
JSRuntime = jsRuntime;
57+
LibraryConfiguration = libraryConfiguration;
5758
}
5859

5960
/// <inheritdoc/>

0 commit comments

Comments
 (0)