Skip to content

Commit 816812a

Browse files
vnbaaijvnbaaij
committed
Merge branch 'dev'
2 parents 395b667 + 2e606ab commit 816812a

File tree

87 files changed

+2040
-631
lines changed

Some content is hidden

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

87 files changed

+2040
-631
lines changed

‎Directory.Packages.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<RuntimeVersion8>8.0.0</RuntimeVersion8>
5-
<AspNetCoreVersion8>8.0.20</AspNetCoreVersion8>
6-
<EfCoreVersion8>8.0.20</EfCoreVersion8>
7-
<RuntimeVersion9>9.0.9</RuntimeVersion9>
8-
<AspNetCoreVersion9>9.0.9</AspNetCoreVersion9>
9-
<EfCoreVersion9>9.0.9</EfCoreVersion9>
10-
<RuntimeVersion10>10.0.0</RuntimeVersion10>
11-
<AspNetCoreVersion10>10.0.0</AspNetCoreVersion10>
12-
<EfCoreVersion10>10.0.0</EfCoreVersion10>
5+
<AspNetCoreVersion8>8.0.22</AspNetCoreVersion8>
6+
<EfCoreVersion8>8.0.22</EfCoreVersion8>
7+
<RuntimeVersion9>9.0.11</RuntimeVersion9>
8+
<AspNetCoreVersion9>9.0.11</AspNetCoreVersion9>
9+
<EfCoreVersion9>9.0.11</EfCoreVersion9>
10+
<RuntimeVersion10>10.0.1</RuntimeVersion10>
11+
<AspNetCoreVersion10>10.0.1</AspNetCoreVersion10>
12+
<EfCoreVersion10>10.0.1</EfCoreVersion10>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<!-- For Sample Apps -->
1616
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.12.0" />
17-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.12.1" />
18-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.12.1" />
17+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.13.2" />
18+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.13.2" />
1919
<!-- Test dependencies -->
2020
<PackageVersion Include="bunit" Version="1.38.5" />
21-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
21+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2222
<PackageVersion Include="xunit" Version="2.9.3" />
23-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
24-
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
23+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
24+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
2525
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
2626
<!-- Shared dependencies -->
27-
<PackageVersion Include="Markdig.Signed" Version="0.41.3" />
27+
<PackageVersion Include="Markdig.Signed" Version="0.44.0" />
2828
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
30-
<PackageVersion Include="Microsoft.OData.Client" Version="8.4.0" />
29+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
30+
<PackageVersion Include="Microsoft.OData.Client" Version="8.4.3" />
3131
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
3232
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
3333
</ItemGroup>
@@ -88,4 +88,4 @@
8888
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
8989
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
9090
</ItemGroup>
91-
</Project>
91+
</Project>

‎README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@
1010
[![Validate Security](https://github.com/microsoft/fluentui-blazor/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/microsoft/fluentui-blazor/actions/workflows/codeql-analysis.yml)
1111
-->
1212

13+
> ## Reporting an issue?
14+
> Please supply us with **ready-to-run** reproduction code in the form of something we can copy/paste, a (zipped) project structure or a GitHub repository.
15+
>
16+
> We do not have capacity to craft or compose a reproduction for every issue that gets raised.
17+
>
18+
> If no code or repository is provided, the issues will be closed after 3 days.
19+
>
20+
> Help us to help you. Thanks.
21+
>
22+
> With 💖, the Fluent UI crew.
23+
1324
## Demo
1425
Explore the Demo: visit https://www.fluentui-blazor.net to kickstart your first project, browse the documentation, and test all components live.
1526
If you encounter any problems, you can use the [backup site](https://fluentui-blazor.azurewebsites.net).

‎WHATSNEW.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
## V4.14.0
2+
3+
### General
4+
- \[General\] Pimp the publish local script ([#4363](https://github.com/microsoft/fluentui-blazor/pull/4363))
5+
- \[General\] Apply fix for using latest SDKs when publishing ([#4429](https://github.com/microsoft/fluentui-blazor/pull/4429))
6+
7+
### Demo site and documentation
8+
- Update issue reporting guidelines in README ([#4502](https://github.com/microsoft/fluentui-blazor/pull/4502))
9+
- \[Docs\] Typos on RebootPage ([#4389](https://github.com/microsoft/fluentui-blazor/pull/4389))
10+
- \[Docs\] Fix notification center demo issues ([#4493](https://github.com/microsoft/fluentui-blazor/pull/4493))
11+
- \[Docs\] Update docs for MessageBox result return values ([#4403](https://github.com/microsoft/fluentui-blazor/pull/4403))
12+
- \[Docs\] Add note about multiple parameter in listbox ([#4514](https://github.com/microsoft/fluentui-blazor/pull/4514))
13+
14+
### Components
15+
- \[AppBar\] Fix AppBarItem OnClick not being handled in popover ([#4421](https://github.com/microsoft/fluentui-blazor/pull/4421))
16+
- \[DataGrid\] Add Hierarchical DataGrid functionality ([#4484](https://github.com/microsoft/fluentui-blazor/pull/4484))
17+
- \[DataGrid\] Fix resize indicator height (when ResizeColumnOnAllRows is true) ([#4383](https://github.com/microsoft/fluentui-blazor/pull/4383))
18+
- \[DataGrid\] Fix RTL resize behavior ([#4453](https://github.com/microsoft/fluentui-blazor/pull/4453))
19+
- \[DataGrid\] Fix SelectColumn issue ([#4491](https://github.com/microsoft/fluentui-blazor/pull/4491))
20+
- \[DataGrid\] Improve Script ([#4500](https://github.com/microsoft/fluentui-blazor/pull/4500))
21+
- \[DatePicker\] Prevent silently ignoring date formatting failures ([#4496](https://github.com/microsoft/fluentui-blazor/pull/4496))
22+
- \[MessageBar\] HTML and Script can be injected into MessageBar Title ([#4414](https://github.com/microsoft/fluentui-blazor/pull/4414))
23+
- \[Overlay\] Use CultureInfo.InvariantCulture for background-color and z-index ([#4366](https://github.com/microsoft/fluentui-blazor/pull/4366))
24+
- \[ProfileMenu\] Change tabindex to 0 ([#4398](https://github.com/microsoft/fluentui-blazor/pull/4398))
25+
- \[Templates\] Remove NotFound components from the .NET 10 Microsoft.NET.Sdk.BlazorW… ([#4417](https://github.com/microsoft/fluentui-blazor/pull/4417))
26+
27+
### Icons and Emoji
28+
- Update to Fluent UI System Icons 1.1.318
29+
See the commit history in the Fluent UI System Icons repository [commit history](https://github.com/microsoft/fluentui-system-icons/commits/main/) for the full list of changes.
30+
31+
--------------
32+
133
## V4.13.2
234

335
### General

‎_PublishDemoLocally.ps1‎

Lines changed: 121 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,25 @@ if ($dotnetVersionChoice -eq "" -or $dotnetVersionChoice -eq "9") {
1616
}
1717

1818
# Ask for build number
19-
$buildNumber = Read-Host "❓ What is the BuildNumber version to use? (e.g., 4.13.0)"
20-
if ([string]::IsNullOrWhiteSpace($buildNumber)) {
21-
Write-Host "⛔ Build number cannot be empty." -ForegroundColor Red
22-
exit 1
19+
# Get the version number from the eng/pipelines/version.yml file if it exists
20+
$versionFilePath = "./eng/pipelines/version.yml"
21+
if (Test-Path $versionFilePath) {
22+
$versionFileContent = Get-Content $versionFilePath -Raw
23+
$versionMatch = $versionFileContent -match "FileVersion:\s*'([0-9]+\.[0-9]+\.[0-9]+)'"
24+
if ($versionMatch) {
25+
$pipelineVersion = $Matches[1]
26+
Write-Host "ℹ️ Found version in version.yml: $pipelineVersion" -ForegroundColor Cyan
27+
$buildNumber = $pipelineVersion
28+
} else {
29+
Write-Host "⚠️ Could not find a version in version.yml." -ForegroundColor Yellow
30+
}
31+
} else {
32+
Write-Host "⚠️ version.yml file not found at $versionFilePath." -ForegroundColor Yellow
33+
$buildNumber = Read-Host "❓ What is the BuildNumber version to use? (e.g., 4.13.2)"
34+
if ([string]::IsNullOrWhiteSpace($buildNumber)) {
35+
Write-Host "⛔ Build number cannot be empty." -ForegroundColor Red
36+
exit 1
37+
}
2338
}
2439

2540
Write-Host ""
@@ -55,11 +70,67 @@ if (Test-Path "./src/Extensions/DesignToken.Generator/obj/") {
5570
Remove-Item -Path "./src/Extensions/DesignToken.Generator/obj" -Recurse -Force
5671
}
5772

73+
# If a 'global.json' file exists, back it up
74+
$globalJsonPath = "./global.json"
75+
$globalJsonBackupPath = "./global.json.localpublishbackup"
76+
if (Test-Path $globalJsonPath) {
77+
Write-Host "👉 Backing up existing global.json file..." -ForegroundColor Yellow
78+
Copy-Item -Path $globalJsonPath -Destination $globalJsonBackupPath -Force
79+
Remove-Item -Path $globalJsonPath -Force
80+
$restoreGlobalJson = $true
81+
}
82+
83+
# If a 'global.json.local' file exists, copy it to 'global.json'
84+
$globalJsonLocalPath = "./global.json.local"
85+
if (Test-Path $globalJsonLocalPath) {
86+
Write-Host "👉 Using specific global.json for publish..." -ForegroundColor Yellow
87+
Copy-Item -Path $globalJsonLocalPath -Destination "./global.json" -Force
88+
$deleteLocalGlobalJson = $true
89+
}
90+
91+
#search through all .csproj files and replace <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks> with <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
92+
Write-Host "👉 Adjusting TargetFrameworks in project files..." -ForegroundColor Yellow
93+
$csprojFiles = Get-ChildItem -Path "." -Recurse -Filter "*.csproj"
94+
foreach ($file in $csprojFiles) {
95+
#if the project file is in the Templates folder, skip it
96+
if ($file.PSPath -like "*Templates*") {
97+
continue
98+
}
99+
$originalContent = Get-Content $file.PSPath -Raw
100+
$newContent = $originalContent -replace '<TargetFrameworks>(.*?);net10.0</TargetFrameworks>', '<TargetFrameworks>$1</TargetFrameworks>'
101+
if ($originalContent -ne $newContent) {
102+
Set-Content $file.PSPath ($newContent.TrimEnd("`r", "`n"))
103+
}
104+
$newContent = $originalContent -replace '<TargetFramework>net10.0</TargetFramework>', '<TargetFramework>net9.0</TargetFramework>'
105+
if ($originalContent -ne $newContent) {
106+
Set-Content $file.PSPath ($newContent.TrimEnd("`r", "`n"))
107+
}
108+
}
109+
110+
# Search through Directory.Packages.props and replace the following package version from 4.14.0 to 4.13.0 for the following packages:
111+
# - Microsoft.CodeAnalysis.Analyzers
112+
# - Microsoft.CodeAnalysis.CSharp
113+
Write-Host "👉 Setting CodeAnalysis packages versions to 4.13.0..." -ForegroundColor Yellow
114+
$directoryPackagesFile = "./Directory.Packages.props"
115+
if (Test-Path $directoryPackagesFile) {
116+
$originalContent = Get-Content $directoryPackagesFile -Raw
117+
$newContent = $originalContent -replace '<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />', '<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.13.0" />'
118+
$newContent = $newContent -replace '<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />', '<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />'
119+
if ($originalContent -ne $newContent) {
120+
Set-Content $directoryPackagesFile ($newContent.TrimEnd("`r", "`n"))
121+
}
122+
} else {
123+
Write-Host "⚠️ Directory.Packages.props file not found at $directoryPackagesFile." -ForegroundColor Red
124+
}
125+
126+
58127
# Publish the demo
128+
Write-Host ""
59129
Write-Host "👉 Publishing demo..." -ForegroundColor Yellow
60130
dotnet publish "./examples/Demo/Client/FluentUI.Demo.Client.csproj" -c Release -o "./examples/Demo/Client/bin/Publish" -f $dotnetVersion -r linux-x64 --self-contained=true -p:BuildNumber=$buildNumber
61131

62132
# Verify that the bundle JS file has the expected size
133+
Write-Host ""
63134
Write-Host "👉 Verifying bundle JS file size..." -ForegroundColor Yellow
64135
$bundleFilePath = "./examples/Demo/Client/bin/Publish/wwwroot/_content/Microsoft.FluentUI.AspNetCore.Components/Microsoft.FluentUI.AspNetCore.Components.lib.module.js.br"
65136

@@ -80,11 +151,56 @@ if (Test-Path $bundleFilePath) {
80151
Write-Host "⛔ This may indicate a build issue with the JS bundle generation." -ForegroundColor Red
81152
exit 1
82153
}
83-
154+
Write-Host ""
84155
Write-Host "✅ Demo publish process completed successfully!" -ForegroundColor Green
156+
Write-Host ""
157+
158+
# Delete the local global.json.local file if it was used
159+
if ($deleteLocalGlobalJson) {
160+
Write-Host "👉 Delete the publish specific global.json file..." -ForegroundColor Yellow
161+
Remove-Item -Path $globalJsonPath -Force
162+
}
163+
164+
# Restore the original global.json file if it was backed up
165+
if ($restoreGlobalJson) {
166+
Write-Host "👉 Restoring original global.json file..." -ForegroundColor Yellow
167+
Move-Item -Path $globalJsonBackupPath -Destination $globalJsonPath -Force
168+
}
85169

170+
# Undo the TargetFrameworks changes
171+
Write-Host "👉 Restoring TargetFrameworks in project files..." -ForegroundColor Yellow
172+
foreach ($file in $csprojFiles) {
173+
#if the project file is in the Templates folder, skip it
174+
if ($file.PSPath -like "*Templates*") {
175+
continue
176+
}
177+
$originalContent = Get-Content $file.PSPath -Raw
178+
$newContent = $originalContent -replace '<TargetFrameworks>net8.0;net9.0</TargetFrameworks>', '<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>'
179+
if ($originalContent -ne $newContent) {
180+
Set-Content $file.PSPath ($newContent.TrimEnd("`r", "`n"))
181+
}
182+
$newContent = $originalContent -replace '<TargetFramework>net9.0</TargetFramework>', '<TargetFramework>net10.0</TargetFramework>'
183+
if ($originalContent -ne $newContent) {
184+
Set-Content $file.PSPath ($newContent.TrimEnd("`r", "`n"))
185+
}
186+
}
187+
188+
# Undo the CodeAnalysis package version changes
189+
Write-Host "👉 Restoring CodeAnalysis packages versions to 4.14.0..." -ForegroundColor Yellow
190+
if (Test-Path $directoryPackagesFile) {
191+
$originalContent = Get-Content $directoryPackagesFile -Raw
192+
$newContent = $originalContent -replace '<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.13.0" />', '<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />'
193+
$newContent = $newContent -replace '<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />', '<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />'
194+
if ($originalContent -ne $newContent) {
195+
Set-Content $directoryPackagesFile ($newContent.TrimEnd("`r", "`n"))
196+
}
197+
}
198+
199+
Write-Host ""
200+
Write-Host "----------------------------------------------------"
86201
Write-Host "👉 You can deploy to Azure using a command like:" -ForegroundColor Green
87202
Write-Host "▶️ swa deploy --output-location ./examples/Demo/Client/bin/Publish/wwwroot --env production --deployment-token <TOKEN>" -ForegroundColor Green
203+
Write-Host "----------------------------------------------------"
88204

89205
# Ask user if they want to run the website
90206
# Require 'dotnet tool install --global dotnet-serve'

‎examples/Demo/Shared/Components/NotificationCenterPanel.razor‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55

66
<FluentStack>
77
<FluentSpacer />
8-
<FluentAnchor Appearance="@Appearance.Hypertext" Href="" OnClick="@(e => MessageService.Clear(App.MESSAGES_NOTIFICATION_CENTER) )">
9-
Dismiss all
10-
</FluentAnchor>
8+
@if (MessageService.Count(App.MESSAGES_NOTIFICATION_CENTER) > 0)
9+
{
10+
<FluentAnchor Appearance="@Appearance.Hypertext" Href="#" OnClick="@(e => MessageService.Clear(App.MESSAGES_NOTIFICATION_CENTER))">
11+
Dismiss all
12+
</FluentAnchor>
13+
}
1114
</FluentStack>
1215

1316
<br />

0 commit comments

Comments
 (0)