Skip to content

Commit 16869fb

Browse files
authored
[General] Add .NET 10 Preview 2 support (#3641)
* Add .NET 10 preview 2 support * Spell check WhatsNew * Include .NET 10 SDK in workflows (both GH and ADO) Process review comments * - Update version - Add .NET package feed - Fix small code comment warning * - Deploy preview site on .NET 10 * Update publish step * Fix forgetting to set DOTNET_VERSIOJN * Undo temp .NET 9 SDK addition * Small home banner change
1 parent a9166ad commit 16869fb

21 files changed

+257
-190
lines changed

.github/workflows/build-core-lib.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@ jobs:
5353
dotnet-version: 9.0.x
5454
dotnet-quality: ga
5555

56+
- name: Setup .NET 10.0
57+
uses: actions/setup-dotnet@v4
58+
with:
59+
dotnet-version: 10.0.x
60+
dotnet-quality: preview
61+
5662
# Build
5763

5864
- name: Restore
@@ -149,7 +155,7 @@ jobs:
149155
runs-on: ubuntu-latest
150156
name: Build and Deploy Demo site
151157
env:
152-
DOTNET_VERSION: "net9.0"
158+
DOTNET_VERSION: "net10.0"
153159
DOTNET_CLI_TELEMETRY_OPTOUT: 1
154160
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
155161
DOTNET_NOLOGO: true
@@ -167,8 +173,8 @@ jobs:
167173
- name: .NET Setup SDKs
168174
uses: actions/setup-dotnet@v4
169175
with:
170-
dotnet-version: 9.0.x
171-
dotnet-quality: ga
176+
dotnet-version: 10.0.x
177+
dotnet-quality: preview
172178

173179
- name: .NET Builld
174180
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ jobs:
4343
dotnet-version: |
4444
8.0.x
4545
9.0.x
46-
dotnet-quality: ga
46+
10.0.x
47+
dotnet-quality: preview
4748

4849
- name: Initialize CodeQL
4950
uses: github/codeql-action/init@v2

.github/workflows/deploy_preview.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
name: Build and deploy Demo site
1919
env:
20-
DOTNET_VERSION: "net9.0"
20+
DOTNET_VERSION: "net10.0"
2121
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2222
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2323
DOTNET_NOLOGO: true
@@ -44,6 +44,12 @@ jobs:
4444
dotnet-version: 9.0.x
4545
dotnet-quality: ga
4646

47+
- name: .NET Setup SDKs
48+
uses: actions/setup-dotnet@v4
49+
with:
50+
dotnet-version: 10.0.x
51+
dotnet-quality: preview
52+
4753
- name: .NET Builld
4854
run: dotnet build ${{ env.PROJECT }} -c ${{ env.BUILD_CONFIG }} -o publish -f ${{ env.DOTNET_VERSION }} -r linux-x64 --self-contained=true -p:BuildNumber=$BUILD_NUMBER -p:SourceRevisionId=$GITHUB_SHA -p:ContinuousIntegrationBuild=true
4955

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.7</VersionFile>
16-
<VersionPrefix>4.11.7</VersionPrefix>
15+
<VersionFile>4.11.8</VersionFile>
16+
<VersionPrefix>4.11.8</VersionPrefix>
1717
<VersionSuffix></VersionSuffix>
1818
<AssemblyVersion>$(VersionFile)</AssemblyVersion>
1919
<FileVersion>$(VersionFile)</FileVersion>

Directory.Packages.props

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<RuntimeVersion9>9.0.3</RuntimeVersion9>
88
<AspNetCoreVersion9>9.0.3</AspNetCoreVersion9>
99
<EfCoreVersion9>9.0.3</EfCoreVersion9>
10+
<RuntimeVersion10>10.0.0-preview.2.25163.2</RuntimeVersion10>
11+
<AspNetCoreVersion10>10.0.0-preview.2.25164.1</AspNetCoreVersion10>
12+
<EfCoreVersion10>10.0.0-preview.2.25163.8</EfCoreVersion10>
1013
</PropertyGroup>
1114
<ItemGroup>
1215
<!-- For Sample Apps -->
@@ -68,4 +71,21 @@
6871
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion9)" />
6972
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
7073
</ItemGroup>
74+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
75+
<!-- Build dependencies -->
76+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion10)" />
77+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion10)" />
78+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(AspNetCoreVersion10)" />
79+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(RuntimeVersion10)" />
80+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="$(RuntimeVersion10)" />
81+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(RuntimeVersion10)" />
82+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(RuntimeVersion10)" />
83+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(RuntimeVersion10)" />
84+
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(RuntimeVersion10)" />
85+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EfCoreVersion10)" />
86+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion10)" />
87+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EfCoreVersion10)" />
88+
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
89+
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
90+
</ItemGroup>
7191
</Project>

WHATSNEW.md

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
- Chat / 28, 32, 48 / Color
3131
- People Chat / 24 / Color
3232
- Person Add / 24 / Color
33-
- Share iOS / 24 / Color
34-
33+
- Share iOS / 24 / Color
34+
35+
3536
## V4.11.7
3637

3738
### Components
@@ -40,8 +41,8 @@
4041
- \[CounterBadge\] Fix `HorizontalPosition`/`VerticalPosition` not being used ([#3490](https://github.com/microsoft/fluentui-blazor/pull/3490))
4142
- \[DataGrid\] Add method to close column options programmatically ([#3501](https://github.com/microsoft/fluentui-blazor/pull/3501))
4243
- \[DataGrid\] Fix styling when using `Virtualize` with `DataGridDisplayMode.Table` ([#3497](https://github.com/microsoft/fluentui-blazor/pull/3497))
43-
- \[DesignTheme\] Add support for setting/getting NuetralBaseColor ([#3530](https://github.com/microsoft/fluentui-blazor/pull/3530))
44-
- \[DesignTheme\] Fix the document.body.dataset.theme from the web component ([#3516](https://github.com/microsoft/fluentui-blazor/pull/3516))
44+
- \[DesignTheme\] Add support for setting/getting NeutralBaseColor ([#3530](https://github.com/microsoft/fluentui-blazor/pull/3530))
45+
- \[DesignTheme\] Fix the accompanying web component ([#3516](https://github.com/microsoft/fluentui-blazor/pull/3516))
4546
- \[DesignTokens\] Make `AccentBaseColor` and `NeutralBaseColor` work with WithDefault ([#3517](https://github.com/microsoft/fluentui-blazor/pull/3517))
4647
- \[NumberField\] Fix invalid class styling ([#3531](https://github.com/microsoft/fluentui-blazor/pull/3531))
4748
- \[Overlay\] Make default background color follow neutral base color ([#3537](https://github.com/microsoft/fluentui-blazor/pull/3537))
@@ -52,6 +53,7 @@
5253
- \[Docs\] IconExplorer: Reset current page to 0 when searching ([#3536](https://github.com/microsoft/fluentui-blazor/pull/3536))
5354
- \[Docs]\ Typo in Templates.md file. ([#3503](https://github.com/microsoft/fluentui-blazor/pull/3503))
5455

56+
5557
### Icons and Emoji
5658
- Update to Fluent UI System Icons 1.1.292 (changes since 1.1.278).
5759

@@ -267,6 +269,7 @@
267269
### Demo site and documentation
268270
- \[Demo] Fix (most) printing issues when trying to print the page ([#3370](https://github.com/microsoft/fluentui-blazor/pull/3370))
269271

272+
270273
## V4.11.4
271274

272275
### General
@@ -329,6 +332,7 @@
329332
- Guest / 12, 16, 20, 24, 28, 32, 48 / Filled & Regular
330333
- Image Add / 24 / Filled & Regular
331334

335+
332336
## V4.11.3
333337

334338
### Components
@@ -364,6 +368,8 @@
364368

365369
### Demo site and documentation
366370
- \[Docs\] Update DataGridMultiSelect blockquote sample ([#3139](https://github.com/microsoft/fluentui-blazor/pull/3139))
371+
372+
367373
## V4.11.0
368374

369375
### Breaking changes and important notes
@@ -379,7 +385,7 @@
379385
- \[Button\] Fix showing hover on disabled button ([#2968](https://github.com/microsoft/fluentui-blazor/pull/2968))
380386
- \[DataGrid\] Add OData Adaptor package ([#2938](https://github.com/microsoft/fluentui-blazor/pull/2938))
381387
- \[DataGrid\] Alter rendering to use table elements ([#2664](https://github.com/microsoft/fluentui-blazor/pull/2664))
382-
- \[Datagrid\] Page reload issue when using `SaveStateInUrl` ([#2987](https://github.com/microsoft/fluentui-blazor/pull/2987))
388+
- \[DataGrid\] Page reload issue when using `SaveStateInUrl` ([#2987](https://github.com/microsoft/fluentui-blazor/pull/2987))
383389
- \[DataGrid\] Respecting control state of Loading parameter ([#3064](https://github.com/microsoft/fluentui-blazor/pull/3064))
384390
- \[DataGrid\] Save paging state in URL ([#2972](https://github.com/microsoft/fluentui-blazor/pull/2972))
385391
- \[DatePicker\] Add `PopupHorizontalPosition` property ([#3001](https://github.com/microsoft/fluentui-blazor/pull/3001))
@@ -485,7 +491,7 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
485491
- TextBox Settings / 20 / Filled
486492

487493

488-
- Emoij packages have been updated to the latest version of the Fluent Emoji collection.
494+
- Emoji packages have been updated to the latest version of the Fluent Emoji collection.
489495

490496
## V4.10.4
491497

@@ -512,7 +518,6 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
512518
- Update to Fluent UI System Icons 1.1.265 (changes since 1.1.261)
513519

514520
**What's new (Name / Size(s) / Variant(s))**
515-
516521
- Arrow Bounce / 12, 28, 48 / Filled & Regular
517522
- Arrow Clockwise Dashes / 28, 48 / Filled & Regular
518523
- Arrow Down Left / 12, 28 / Filled & Regular
@@ -540,6 +545,7 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
540545
- TextBox / 20, 28, 32, 48 / Filled & Regular
541546
- TextBox Checkmark / 16, 20, 24, 28, 32, 48 / Filled & Regular
542547

548+
543549
**What's updated (Name / Size(s) / Variant(s))**
544550
- Add Circle / 16 / Filled & Regular
545551
- Arrow Clockwise Dashes / 16, 20, 24, 32 / Filled & Regular
@@ -555,7 +561,6 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
555561
### Important note
556562
- The main class name for the `FluentAppBar` component has been renamed from `nav-menu-container` to `fluent-appbar`. If you have custom CSS in your app targeting that class, you need to change that to you the new class name.
557563

558-
559564
### General
560565
- \[General\] Apply global color-scheme to reflect theme in use ([#2854](https://github.com/microsoft/fluentui-blazor/pull/2854))
561566

@@ -584,7 +589,7 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
584589
- \[Docs\] Make MenuProvider message more prominent ([#2792](https://github.com/microsoft/fluentui-blazor/pull/2792))
585590

586591
### Icons
587-
- Update to Fluent UI System Icons 1.1.261 (changes since 1.1.260) plus a fix for not usingthe right colors in the new 'Color icons.
592+
- Update to Fluent UI System Icons 1.1.261 (changes since 1.1.260) plus a fix for not using the right colors in the new 'Color icons.
588593

589594
**What's new (Name / Size(s) / Variant(s))**
590595
- Arrow Down Right / 16, 20, 24, 32, 48 / Filled & Regular
@@ -610,7 +615,7 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
610615
## V4.10.2
611616

612617
### General
613-
- \[General\] Update to latest .NET 8 and .NET 9 RC2 SDK.
618+
- \[General\] Update to latest .NET 8 and .NET 9 RC2 SDK.
614619
- \[Debounce\] Fix the Debounce class with async methods ([#2759](https://github.com/microsoft/fluentui-blazor/pull/2759))
615620

616621
### Components
@@ -630,7 +635,7 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
630635
- \[Providers\] To prevent the menu and tooltip from displaying a scrollbar in body ([#2744](https://github.com/microsoft/fluentui-blazor/pull/2744))
631636
- \[Tooltip\] Add role so screen reader can announce tooltip text ([#2724](https://github.com/microsoft/fluentui-blazor/pull/2724))
632637
- \[TreeView\] Improve RTL support ([#2770](https://github.com/microsoft/fluentui-blazor/pull/2770))
633-
- \[TreeView\] prevent runtime errors in change handeling ([#2776](https://github.com/microsoft/fluentui-blazor/pull/2776))
638+
- \[TreeView\] prevent runtime errors in change handling ([#2776](https://github.com/microsoft/fluentui-blazor/pull/2776))
634639

635640
### Demo site and documentation
636641
- \[Docs\] Components inheriting ListComponentBase missing member descriptions ([#2735](https://github.com/microsoft/fluentui-blazor/pull/2735))
@@ -742,12 +747,13 @@ Starting with v4.11.0 you need to add the following `@using` statement to your `
742747
- Wrench / 16, 20, 24 / Color
743748

744749
## v4.10.1
750+
For a complete list of changes in this release, also see the [4.10.1](https://github.com/microsoft/fluentui-blazor/releases) release page on GitHub
745751

746752
### General
747753
- \[General\] Update to .NET 9 RC1 SDK ([#2639](https://github.com/microsoft/fluentui-blazor/pull/2639))
748-
- \[Github\] Update the actions/upload-artifact to v4 ([#2650](https://github.com/microsoft/fluentui-blazor/pull/2650))
754+
- \[GitHub\] Update the actions/upload-artifact to v4 ([#2650](https://github.com/microsoft/fluentui-blazor/pull/2650))
749755

750-
## Accessiblity
756+
## Accessibility
751757
- \[DateTime\] Add `role`, `tabindex` and catch Enter/Space ([#2688](https://github.com/microsoft/fluentui-blazor/pull/2688))
752758
- \[Select\] Fix the unannounced `Required` keyword with FluentSelect ([#2706](https://github.com/microsoft/fluentui-blazor/pull/2706))
753759

@@ -818,7 +824,7 @@ page of the documentation for more information.
818824

819825
### Components
820826
- \[General\] Add .net9.0 as targeted framework ([#2590](https://github.com/microsoft/fluentui-blazor/pull/2590))
821-
- \[Javascript Caching\] Do not add version number to lib.module.js file ([#2572](https://github.com/microsoft/fluentui-blazor/pull/2572))
827+
- \[JavaScript Caching\] Do not add version number to lib.module.js file ([#2572](https://github.com/microsoft/fluentui-blazor/pull/2572))
822828

823829
- \[Anchor\] Fix hypertext appearance with icon in start/end slot ([#2624](https://github.com/microsoft/fluentui-blazor/pull/2624))
824830
- \[Autocomplete\] Add missing AdditionalAttributes ([#2522](https://github.com/microsoft/fluentui-blazor/pull/2522))
@@ -854,7 +860,7 @@ page of the documentation for more information.
854860
- \[Docs\] Fix a typo ([#2518](https://github.com/microsoft/fluentui-blazor/pull/2518))
855861
- \[Docs\] Fix typo in TemplatesPage.razor ([#2452](https://github.com/microsoft/fluentui-blazor/pull/2452))
856862
- \[Docs\] Improve warning for required interactivity ([#2469](https://github.com/microsoft/fluentui-blazor/pull/2469))
857-
- \[Examples\] Add 2024 Olymics data and let examples use that
863+
- \[Examples\] Add 2024 Olympics data and let examples use that
858864

859865
### Icons
860866
- Update to Fluent UI System Icons 1.1.256 (since 1.1.249)
@@ -899,5 +905,8 @@ page of the documentation for more information.
899905
- Run / 16, 20, 24 / Filled & Regular
900906
- Shopping Bag / 16, 20, 24 / Filled
901907

902-
## Earlier versions
903-
For versions before 4.10, see the [Demo and documentation site](https://www.fluentui-blazor.net) page.
908+
## Before v4.10.0
909+
For versions before 4.10, see the [What's New? (v4.0 - v4.9)](/WhatsNew-Before410) page.
910+
911+
## Archives
912+
For versions before 4.0, see [What's new? (archives)](/WhatsNew-Archive) page.

eng/pipelines/build-all-lib.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ extends:
134134
version: 9.0.x
135135
includePreviewVersions: false
136136

137+
- task: UseDotNet@2
138+
displayName: 'Install .NET 10.0'
139+
inputs:
140+
version: 10.0.x
141+
includePreviewVersions: true
142+
137143
# Set version number (exclude some folders)
138144
- task: PowerShell@2
139145
displayName: 'Versioning $(Build.BuildNumber)'

eng/pipelines/build-core-lib.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,12 @@ extends:
167167
version: 9.0.x
168168
includePreviewVersions: false
169169

170+
- task: UseDotNet@2
171+
displayName: 'Install .NET 10.0'
172+
inputs:
173+
version: 10.0.x
174+
includePreviewVersions: true
175+
170176
# Set version number (exclude some folders)
171177
- task: PowerShell@2
172178
displayName: 'Versioning $(Build.BuildNumber)'

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

examples/Demo/Client/FluentUI.Demo.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<LangVersion>latest</LangVersion>

0 commit comments

Comments
 (0)