Skip to content

Commit 60fec94

Browse files
vnbaaijdvoituron
vnbaaij
and
dvoituron
authored
merge main (#3889)
* Update NuGet package for fixing CVE. See dotnet/announcements#327 * Non-altering change to force mirroring * Clean up issue tester * Small text formatting change to force deploy * Update workflows * Update README * Update to latest JavaScript SDK * Add global.json * Update workflow to use .NET 9 * Remove net10.0 TFM for now * Set dotnet 9.0.204 * Update deploy_demo.yml to use 9.0.204 * Update home page * Also *temporarily* remove .NET 10 TFM for DataGrid Adapters * Update workflows --------- Co-authored-by: Denis Voituron <dvoituron@outlook.com>
1 parent d6d5ff9 commit 60fec94

14 files changed

Lines changed: 38 additions & 31 deletions

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ jobs:
5050
- name: Setup .NET 9.0
5151
uses: actions/setup-dotnet@v4
5252
with:
53-
dotnet-version: 9.0.x
53+
dotnet-version: 9.0.204
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
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: "net10.0"
158+
DOTNET_VERSION: "net9.0"
159159
DOTNET_CLI_TELEMETRY_OPTOUT: 1
160160
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
161161
DOTNET_NOLOGO: true
@@ -173,8 +173,8 @@ jobs:
173173
- name: .NET Setup SDKs
174174
uses: actions/setup-dotnet@v4
175175
with:
176-
dotnet-version: 10.0.x
177-
dotnet-quality: preview
176+
dotnet-version: 9.0.204
177+
dotnet-quality: ga
178178

179179
- name: .NET Builld
180180
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/deploy_demo.yml‎

Lines changed: 10 additions & 10 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: "net10.0"
22+
DOTNET_VERSION: "net9.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.x
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

‎.github/workflows/deploy_preview.yml‎

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

4747
- name: .NET Builld
4848
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

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,4 +412,4 @@ Microsoft.Fast.Components.FluentUI.xml
412412
/tests/TemplateValidation/**/Data/Migrations
413413
/tests/TemplateValidation/**/Data/*
414414
/spelling.dic
415-
/global.json
415+

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This package is for use in .NET 8 and 9 Blazor projects. If you are using **now
1414

1515
## Introduction
1616

17-
The `Microsoft.FluentUI.AspNetCore` family of packages provides a set of Razor components for [Blazor](https://blazor.net) applications, tools and utilities which are used to build applications that have a Fluent design (i.e. have the look and feel of modern Microsoft applications).
17+
The `Microsoft.FluentUI.AspNetCore.*` family of packages provides a set of Razor components for building [Blazor](https://blazor.net) applications that leverage the Fluent Design System (i.e. have the look and feel of modern Microsoft applications).
1818

1919
Some of the components in the library are wrappers around Microsoft's official Fluent UI Web Components. Others are components that leverage the Fluent Design System or make it easier to work with Fluent. To get up and running with the library, see the **Getting Started** section below.
2020

‎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;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.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;net10.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.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;net10.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<LangVersion>latest</LangVersion>

‎examples/Demo/Shared/Pages/Home/Home.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
<h2>Latest releases</h2>
4646
<ul class="news">
47+
<li><NewsDate Day="6" Month="Jun" Year="25" /><a href="/WhatsNew#v4.12.0">v4.12.0 released</a></li>
4748
<li><NewsDate Day="8" Month="May" Year="25" /><a href="/WhatsNew#v4.11.9">v4.11.9 released</a></li>
4849
<li><NewsDate Day="11" Month="Apr" Year="25" /><a href="/WhatsNew#v4.11.8">v4.11.8 released</a></li>
4950
<li><NewsDate Day="19" Month="Mar" Year="25" /><a href="/WhatsNew#v4.11.7">v4.11.7 released</a></li>
50-
<li><NewsDate Day="5" Month="Mar" Year="25" /><a href="/WhatsNew#v4.11.6">v4.11.6 released</a></li>
5151
<!--<li><NewsDate Day="" Month="" Year="" /><a href=""></a></li>-->
5252
</ul>
5353

‎global.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.204",
4+
"allowPrerelease": true,
5+
"rollForward": "latestPatch"
6+
}
7+
}

0 commit comments

Comments
 (0)