Merge branch 'dev'

microsoft · Jul 23, 2024 · fda45b4 · fda45b4
2 parents e803492 + 921dc78
commit fda45b4
Show file tree

Hide file tree

Showing 13 changed files with 368 additions and 186 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -12,8 +12,8 @@
 		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
-		<VersionFile>4.9.2</VersionFile>
-		<VersionPrefix>4.9.2</VersionPrefix>
+		<VersionFile>4.9.3</VersionFile>
+		<VersionPrefix>4.9.3</VersionPrefix>
 		<VersionSuffix></VersionSuffix>
 		<AssemblyVersion>$(VersionFile)</AssemblyVersion>
 		<FileVersion>$(VersionFile)</FileVersion>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,15 +2,14 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <RuntimeVersion>8.0.0</RuntimeVersion>
-    <AspNetCoreVersion>8.0.6</AspNetCoreVersion>
-    <EfCoreVersion>8.0.6</EfCoreVersion>
+    <AspNetCoreVersion>8.0.7</AspNetCoreVersion>
+    <EfCoreVersion>8.0.7</EfCoreVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- For Sample Apps -->
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.0" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.2" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.9.2" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.9.0" />
-
     <!-- Build dependencies -->
     <PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
@@ -26,17 +25,17 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfCoreVersion)" />
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0-beta1.24219.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48" />
     <PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.3" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <!-- Test dependencies -->
     <PackageVersion Include="bunit" Version="1.28.9" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageVersion Include="xunit" Version="2.8.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -1,3 +1,13 @@
+## v4.9.3
+### Components
+- [General] Inject LibraryConfiguring into DesignToken ([#2426](https://github.com/microsoft/fluentui-blazor/pull/2426))
+- [Accordion] Add Id ([#2420](https://github.com/microsoft/fluentui-blazor/pull/2420))
+- [Templates] Replace faulty `Appearance.Filled` with `Appearance.Accent` for buttons ([#2436](https://github.com/microsoft/fluentui-blazor/pull/2436))
+
+### Demo site and documentation
+- [Docs] Fix broken GitHub link ([#2442](https://github.com/microsoft/fluentui-blazor/pull/2442))
+
+
 ## v4.9.2
 ### Components
 - [General] JavaScript Cache management ([#2388](https://github.com/microsoft/fluentui-blazor/pull/2388))

diff --git a/eng/pipelines/version.yml b/eng/pipelines/version.yml
@@ -2,5 +2,5 @@ variables:
   # File and Package version
   # dev  branch: 1.2.4-Preview-23282-1'    (PackageSuffix is always ignored in Dev branch)
   # main branch: 1.2.4-RC.1'               (PackageSuffix is ignored, if empty, in Main branch)
-  FileVersion: '4.9.2'   # Set the next final version here.
+  FileVersion: '4.9.3'   # Set the next final version here.
   PackageSuffix: ''
diff --git a/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml b/examples/Demo/Shared/Microsoft.FluentUI.AspNetCore.Components.xml
diff --git a/examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor b/examples/Demo/Shared/Pages/SplashScreen/SplashScreenPage.razor
@@ -2,7 +2,7 @@
 
 @using FluentUI.Demo.Shared.Pages.SplashScreen.Examples;
 
-<PageTitle>@App.PageTitle("SlashScreen")</PageTitle>
+<PageTitle>@App.PageTitle("SplashScreen")</PageTitle>
 
 <h1>SplashScreen</h1>
 

diff --git a/examples/Demo/Shared/wwwroot/docs/WhatsNew.md b/examples/Demo/Shared/wwwroot/docs/WhatsNew.md
@@ -1,3 +1,13 @@
+## v4.9.3
+### Components
+- [General] Inject LibraryConfiguring into DesignToken ([#2426](https://github.com/microsoft/fluentui-blazor/pull/2426))
+- [Accordion] Add Id ([#2420](https://github.com/microsoft/fluentui-blazor/pull/2420))
+- [Templates] Replace faulty `Appearance.Filled` with `Appearance.Accent` for buttons ([#2436](https://github.com/microsoft/fluentui-blazor/pull/2436))
+
+### Demo site and documentation
+- [Docs] Fix broken GitHub link ([#2442](https://github.com/microsoft/fluentui-blazor/pull/2442))
+
+
 ## v4.9.2
 ### Components
 - [General] JavaScript Cache management ([#2388](https://github.com/microsoft/fluentui-blazor/pull/2388))
@@ -7,7 +17,7 @@
 - [MultiSplitter] Fix RTL direction ([#2380](https://github.com/microsoft/fluentui-blazor/pull/2380))
 - [Overflow] Add `Fixed` parameter ([#2393](https://github.com/microsoft/fluentui-blazor/pull/2393))
 - [Overflow] Add `Fixed` enumeration ([#2401](https://github.com/microsoft/fluentui-blazor/pull/2401))
-- [Search] Add `AutoComplete` parameter ([#2397]((https://github.com/microsoft/fluentui-blazor/pull/2397)))
+- [Search] Add `AutoComplete` parameter ([#2397](https://github.com/microsoft/fluentui-blazor/pull/2397))
 - [Select] Fix logic when setting new option ([#2384](https://github.com/microsoft/fluentui-blazor/pull/2384))
 - [SortableList] Adding Properties `FromListId` and `ToListId` ([#2385](https://github.com/microsoft/fluentui-blazor/pull/2385))
 - [SplashScreen] Pass parameters.Modal to `ShowSplashScreen...` methods ([#2398](https://github.com/microsoft/fluentui-blazor/pull/2398))

diff --git a/src/Core.Assets/Microsoft.FluentUI.AspNetCore.Components.Assets.esproj b/src/Core.Assets/Microsoft.FluentUI.AspNetCore.Components.Assets.esproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.1259970">
+<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.1327710">
 	<PropertyGroup>
 		<DebugAssetsDirectory>dist\</DebugAssetsDirectory>
 		<StaticWebAssetSourceId>Microsoft.FluentUI.AspNetCore.Components</StaticWebAssetSourceId>

diff --git a/src/Core/Components/Accordion/FluentAccordion.razor b/src/Core/Components/Accordion/FluentAccordion.razor
@@ -1,7 +1,8 @@
-@namespace Microsoft.FluentUI.AspNetCore.Components
+@namespace Microsoft.FluentUI.AspNetCore.Components
 @inherits FluentComponentBase
 <CascadingValue Value="this" IsFixed="true">
     <fluent-accordion @ref=Element
+                      id="@Id"
                       class="@Class"
                       style="@Style"
                       expand-mode="@ExpandMode.ToAttributeValue()"

diff --git a/src/Core/DesignTokens/DesignToken.razor.cs b/src/Core/DesignTokens/DesignToken.razor.cs
@@ -51,9 +51,10 @@ public DesignToken()
     /// <summary>
     /// Constructs an instance of a DesignToken.
     /// </summary>
-    public DesignToken(IJSRuntime jsRuntime)
+    public DesignToken(IJSRuntime jsRuntime, LibraryConfiguration libraryConfiguration)
     {
         JSRuntime = jsRuntime;
+        LibraryConfiguration = libraryConfiguration;
     }
 
     /// <inheritdoc/>

diff --git a/src/Extensions/DesignToken.Generator/DesignTokenGenerator.cs b/src/Extensions/DesignToken.Generator/DesignTokenGenerator.cs
@@ -66,7 +66,8 @@ public void GenerateSource(SourceProductionContext context, string? assemblyName
             sb.AppendLine($"\t/// Constructs an instance of the {name} design token");
             sb.AppendLine("\t/// </summary>");
             sb.AppendLine("\t/// <param name=\"jsRuntime\">IJSRuntime reference</param>");
-            sb.AppendLine($"\tpublic {name}(IJSRuntime jsRuntime) : base(jsRuntime)");
+            sb.AppendLine("\t/// <param name=\"libraryConfiguration\">LibraryConfiguration reference</param>");
+            sb.AppendLine($"\tpublic {name}(IJSRuntime jsRuntime, LibraryConfiguration libraryConfiguration) : base(jsRuntime, libraryConfiguration)");
             sb.AppendLine("\t{");
             sb.AppendLine($"\t\tName = Constants.{name};");
             sb.AppendLine("\t}");

diff --git a/...orWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor b/...orWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
@@ -33,7 +33,7 @@ else
     <div>
         <form @formname="generate-recovery-codes" @onsubmit="OnSubmitAsync" method="post">
             <AntiforgeryToken />
-            <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Filled">Generate Recovery Codes</FluentButton>
+            <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Generate Recovery Codes</FluentButton>
         </form>
     </div>
 }

diff --git a/...lazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor b/...lazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ResetAuthenticator.razor
@@ -26,7 +26,7 @@
 <div>
     <form @formname="reset-authenticator" @onsubmit="OnSubmitAsync" method="post">
         <AntiforgeryToken />
-        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Filled">Reset authenticator key</FluentButton>
+        <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Reset authenticator key</FluentButton>
     </form>
 </div>