Skip to content

Commit 2b4e317

Browse files
vnbaaijdvoituron
andauthored
Fix #3068 (#3090)
Co-authored-by: Denis Voituron <[email protected]>
1 parent a48be2f commit 2b4e317

File tree

3 files changed

+26
-15
lines changed

3 files changed

+26
-15
lines changed

Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<RuntimeVersion8>8.0.0</RuntimeVersion8>
5-
<AspNetCoreVersion8>8.0.10</AspNetCoreVersion8>
6-
<EfCoreVersion8>8.0.10</EfCoreVersion8>
5+
<AspNetCoreVersion8>8.0.11</AspNetCoreVersion8>
6+
<EfCoreVersion8>8.0.11</EfCoreVersion8>
77
<RuntimeVersion9>9.0.0</RuntimeVersion9>
88
<AspNetCoreVersion9>9.0.0</AspNetCoreVersion9>
99
<EfCoreVersion9>9.0.0</EfCoreVersion9>
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<!-- For Sample Apps -->
13-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.0-beta.1" />
14-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.0-beta.1" />
15-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.0-beta.1" />
13+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.0" />
14+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.0" />
15+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.0" />
1616
<!-- Test dependencies -->
1717
<PackageVersion Include="bunit" Version="1.31.3" />
1818
<PackageVersion Include="FluentAssertions" Version="6.12.0" />

src/Templates/templates/blazorweb-csharp/BlazorWeb-CSharp/Components/Pages/Weather.razor

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99

1010
<p>This component demonstrates showing data.</p>
1111

12+
@*#if (InteractiveAtRoot) -->
1213
@if (forecasts == null)
1314
{
1415
<p><em>Loading...</em></p>
1516
}
1617
else
1718
{
18-
@*#if (InteractiveAtRoot) -->
1919
<FluentDataGrid Id="weathergrid" Items="@forecasts" GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem="WeatherForecast">
2020
<PropertyColumn Title="Date" Property="@(c => c!.Date)" Sortable="true" Align="Align.Start"/>
2121
<PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Sortable="true" Align="Align.Center"/>
2222
<PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Sortable="true" Align="Align.Center"/>
2323
<PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
2424
</FluentDataGrid>
25-
##else
26-
<!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
27-
<FluentDataGrid Id="weathergrid" Items="@forecasts" GridTemplateColumns="1fr 1fr 1fr 2fr" TGridItem="WeatherForecast">
28-
<PropertyColumn Title="Date" Property="@(c => c!.Date)" Align="Align.Start"/>
29-
<PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
30-
<PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
31-
<PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
32-
</FluentDataGrid>
33-
##endif*@
3425
}
26+
##else
27+
<!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
28+
<FluentDataGrid Id="weathergrid" Items="@forecasts" GridTemplateColumns="1fr 1fr 1fr 2fr" Loading="@(forecasts == null)" Style="height:204px;" TGridItem="WeatherForecast">
29+
<PropertyColumn Title="Date" Property="@(c => c!.Date)" Align="Align.Start"/>
30+
<PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
31+
<PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
32+
<PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
33+
</FluentDataGrid>
34+
##endif*@
3535

3636
@code {
3737
private IQueryable<WeatherForecast>? forecasts;

src/Templates/templates/maui-blazor-solution/MauiApp.1.Shared/Pages/Weather.razor

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<p>This component demonstrates showing data.</p>
1111

12+
@*#if (InteractiveAtRoot) -->
1213
@if (forecasts == null)
1314
{
1415
<p><em>Loading...</em></p>
@@ -22,6 +23,16 @@ else
2223
<PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Sortable="true" Align="Align.End"/>
2324
</FluentDataGrid>
2425
}
26+
##else
27+
<!-- This page is rendered in SSR mode, so the FluentDataGrid component does not offer any interactivity (like sorting). -->
28+
<FluentDataGrid Id="weathergrid" Items="@forecasts" GridTemplateColumns="1fr 1fr 1fr 2fr" Loading="@(forecasts == null)" Style="height:204px;" TGridItem="WeatherForecast">
29+
<PropertyColumn Title="Date" Property="@(c => c!.Date)" Align="Align.Start"/>
30+
<PropertyColumn Title="Temp. (C)" Property="@(c => c!.TemperatureC)" Align="Align.Center"/>
31+
<PropertyColumn Title="Temp. (F)" Property="@(c => c!.TemperatureF)" Align="Align.Center"/>
32+
<PropertyColumn Title="Summary" Property="@(c => c!.Summary)" Align="Align.End"/>
33+
</FluentDataGrid>
34+
##endif*@
35+
2536

2637
@code {
2738
private IQueryable<WeatherForecast>? forecasts;

0 commit comments

Comments
 (0)