Skip to content

Commit 663d842

Browse files
vnbaaijvnbaaij
authored
[General] Use latest .NET SDKs (#3904)
- Update GH workflows - Don't use global.json - Update SDKs and NuGet packages - Re-add net10.0 TFM - Updates some template referenced packages
1 parent 4ea465b commit 663d842

13 files changed

+116
-56
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ jobs:
4747
dotnet-version: 8.0.x
4848
dotnet-quality: ga
4949

50-
- name: Setup .NET 9.0
51-
uses: actions/setup-dotnet@v4
52-
with:
53-
dotnet-version: 9.0.204
54-
dotnet-quality: ga
55-
56-
# - name: Setup .NET 10.0
50+
# - name: Setup .NET 9.0
5751
# uses: actions/setup-dotnet@v4
5852
# with:
59-
# dotnet-version: 10.0.x
60-
# dotnet-quality: preview
53+
# dotnet-version: 9.0.204
54+
# dotnet-quality: ga
55+
56+
- name: Setup .NET 10.0
57+
uses: actions/setup-dotnet@v4
58+
with:
59+
dotnet-version: 10.0.x
60+
dotnet-quality: preview
6161

6262
# Build
6363

@@ -155,7 +155,7 @@ jobs:
155155
runs-on: ubuntu-latest
156156
name: Build and Deploy Demo site
157157
env:
158-
DOTNET_VERSION: "net9.0"
158+
DOTNET_VERSION: "net10.0"
159159
DOTNET_CLI_TELEMETRY_OPTOUT: 1
160160
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
161161
DOTNET_NOLOGO: true
@@ -173,11 +173,11 @@ jobs:
173173
- name: .NET Setup SDKs
174174
uses: actions/setup-dotnet@v4
175175
with:
176-
dotnet-version: 9.0.204
177-
dotnet-quality: ga
176+
dotnet-version: 10.0.x
177+
dotnet-quality: preview
178178

179-
- name: .NET Builld
180-
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
179+
#- name: .NET Builld
180+
# 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
181181

182182
- name: .NET Publish
183183
run: dotnet publish ${{ 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/deploy_demo.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
name: Build and deploy Demo site
2121
env:
22-
DOTNET_VERSION: "net9.0"
22+
DOTNET_VERSION: "net10.0"
2323
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2424
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2525
DOTNET_NOLOGO: true
@@ -34,17 +34,17 @@ jobs:
3434
- name: Checkout source
3535
uses: actions/checkout@v4
3636

37-
- name: Setup .NET 9.0
38-
uses: actions/setup-dotnet@v4
39-
with:
40-
dotnet-version: 9.0.204
41-
dotnet-quality: ga
42-
43-
# - name: Setup .NET 10.0
37+
# - name: Setup .NET 9.0
4438
# uses: actions/setup-dotnet@v4
4539
# with:
46-
# dotnet-version: 10.0.x
47-
# dotnet-quality: preview
40+
# dotnet-version: 9.0.204
41+
# dotnet-quality: ga
42+
43+
- name: Setup .NET 10.0
44+
uses: actions/setup-dotnet@v4
45+
with:
46+
dotnet-version: 10.0.x
47+
dotnet-quality: preview
4848

4949
- name: NPM Install
5050
uses: actions/setup-node@v4
@@ -54,8 +54,8 @@ jobs:
5454

5555
- run: npm install "src/Core.Assets/"
5656

57-
- name: .NET Builld
58-
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
57+
# - name: .NET Builld
58+
# 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
5959

6060
- name: .NET Publish
6161
run: dotnet publish ${{ 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/deploy_preview.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ jobs:
4141
- name: .NET Setup SDKs
4242
uses: actions/setup-dotnet@v4
4343
with:
44-
dotnet-version: 9.0.204
45-
dotnet-quality: ga
44+
dotnet-version: 10.0.x
45+
dotnet-quality: preview
4646

47-
- name: .NET Builld
48-
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
47+
# - name: .NET Builld
48+
# 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
4949

5050
- name: .NET Publish
5151
run: dotnet publish ${{ 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

‎Directory.Packages.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<RuntimeVersion8>8.0.0</RuntimeVersion8>
5-
<AspNetCoreVersion8>8.0.16</AspNetCoreVersion8>
6-
<EfCoreVersion8>8.0.16</EfCoreVersion8>
7-
<RuntimeVersion9>9.0.5</RuntimeVersion9>
8-
<AspNetCoreVersion9>9.0.5</AspNetCoreVersion9>
9-
<EfCoreVersion9>9.0.5</EfCoreVersion9>
10-
<RuntimeVersion10>10.0.0-preview.4.25258.110</RuntimeVersion10>
11-
<AspNetCoreVersion10>10.0.0-preview.4.25258.110</AspNetCoreVersion10>
12-
<EfCoreVersion10>10.0.0-preview.4.25258.110</EfCoreVersion10>
5+
<AspNetCoreVersion8>8.0.17</AspNetCoreVersion8>
6+
<EfCoreVersion8>8.0.17</EfCoreVersion8>
7+
<RuntimeVersion9>9.0.6</RuntimeVersion9>
8+
<AspNetCoreVersion9>9.0.6</AspNetCoreVersion9>
9+
<EfCoreVersion9>9.0.6</EfCoreVersion9>
10+
<RuntimeVersion10>10.0.0-preview.5.25277.114</RuntimeVersion10>
11+
<AspNetCoreVersion10>10.0.0-preview.5.25277.114</AspNetCoreVersion10>
12+
<EfCoreVersion10>10.0.0-preview.5.25277.114</EfCoreVersion10>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<!-- For Sample Apps -->
1616
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.9" />
17-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.11.9" />
17+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" version="4.12.0" />
1818
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.11.9" />
1919
<!-- Test dependencies -->
2020
<PackageVersion Include="bunit" Version="1.38.5" />
21-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
21+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2222
<PackageVersion Include="xunit" Version="2.9.3" />
23-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
23+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
2424
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
2525
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
2626
<!-- Shared dependencies -->
2727
<PackageVersion Include="Markdig.Signed" Version="0.41.0" />
28-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
29+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
3030
<PackageVersion Include="Microsoft.OData.Client" Version="8.2.3" />
31-
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61" />
31+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" />
3232
<PackageVersion Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="1.0.0" />
3333
</ItemGroup>
3434
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
@@ -87,4 +87,4 @@
8787
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
8888
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
8989
</ItemGroup>
90-
</Project>
90+
</Project>

‎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>

‎examples/Demo/Server/FluentUI.Demo.Server.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.Web">
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>

‎examples/Demo/Shared/FluentUI.Demo.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<LangVersion>latest</LangVersion>

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

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9039,7 +9039,67 @@
90399039
</member>
90409040
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.Fallback">
90419041
<summary>
9042-
Gets or sets wether ro ignore the HTML5 DnD behaviour and force the fallback to kick in
9042+
Gets or sets wether to ignore the HTML5 DnD behaviour and force the fallback to kick in
9043+
</summary>
9044+
</member>
9045+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemFilteredColor">
9046+
<summary>
9047+
Gets or sets the color of filtered list items.
9048+
</summary>
9049+
</member>
9050+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListBorderWidth">
9051+
<summary>
9052+
Gets or sets the border width on the list. Must be a valid CSS measurement.
9053+
</summary>
9054+
</member>
9055+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListBorderColor">
9056+
<summary>
9057+
Gets or sets the color of the border on the list.
9058+
</summary>
9059+
</member>
9060+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListPadding">
9061+
<summary>
9062+
Gets or sets the padding on the list. Must be a valid CSS measurement.
9063+
</summary>
9064+
</member>
9065+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemBackgroundColor">
9066+
<summary>
9067+
Gets or sets the background color of the list items.
9068+
</summary>
9069+
</member>
9070+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemHeight">
9071+
<summary>
9072+
Gets or sets the height of the list items. Must be a valid CSS measurement.
9073+
</summary>
9074+
</member>
9075+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemBorderWidth">
9076+
<summary>
9077+
Gets or sets the border width on the list items. Must be a valid CSS measurement.
9078+
</summary>
9079+
</member>
9080+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemBorderColor">
9081+
<summary>
9082+
Gets or sets the border color of the list items.
9083+
</summary>
9084+
</member>
9085+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemDropBorderColor">
9086+
<summary>
9087+
Gets or sets the border color of the list items during repositioning.
9088+
</summary>
9089+
</member>
9090+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemDropColor">
9091+
<summary>
9092+
Gets or sets the background color of the list items during repositioning.
9093+
</summary>
9094+
</member>
9095+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemPadding">
9096+
<summary>
9097+
Gets or sets the padding on the list items. Must be a valid CSS measurement.
9098+
</summary>
9099+
</member>
9100+
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableList`1.ListItemSpacing">
9101+
<summary>
9102+
Gets or sets the spacing between list items. Must be a valid CSS measurement.
90439103
</summary>
90449104
</member>
90459105
<member name="P:Microsoft.FluentUI.AspNetCore.Components.FluentSortableListEventArgs.OldIndex">

global.json renamed to global.bak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.204",
3+
"version": "9.0.301",
44
"allowPrerelease": true,
55
"rollForward": "latestPatch"
66
}

‎src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
44
<PackageId>Microsoft.FluentUI.AspNetCore.Components</PackageId>
55

66
<Summary>A Blazor component library leveraging Microsoft’s Fluent Design System UI. Use the look of modern Microsoft products in your Blazor applications</Summary>

0 commit comments

Comments
 (0)