Skip to content

Commit c1c0308

Browse files
vnbaaijvnbaaij
committed
merge dev
2 parents 5c61a6a + 0ab2fce commit c1c0308

616 files changed

Lines changed: 22002 additions & 1593 deletions

File tree

Some content is hidden

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

‎.config/tsaoptions.json‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
{
2-
"areaPath": "DevDiv\\ASP.NET Core\\Blazor\\FluentUI Blazor Components",
3-
"codebaseName": "fluentui-blazor",
4-
"instanceUrl": "https://devdiv.visualstudio.com/",
5-
"iterationPath": "DevDiv",
2+
"areaPath": "CCI\\PVA\\FluentUI Blazor Experience",
3+
"codebaseName": "fluentui-blazor-cci",
4+
"instanceUrl": "https://msazure.visualstudio.com/",
65
"notificationAliases": [
76
"fluentui-blazor@microsoft.com"
87
],
9-
"projectName": "DEVDIV",
10-
"repositoryName": "fluentui-blazor",
11-
"template": "TFSDEVDIV"
8+
"projectName": "CCI",
9+
"repositoryName": "fluentui-blazor"
1210
}

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

Lines changed: 12 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
env:
2626
PROJECTS: "./src/Core/Microsoft.FluentUI.AspNetCore.Components.csproj"
2727
TESTS: "./tests/Core/Microsoft.FluentUI.AspNetCore.Components.Tests.csproj"
28-
DOTNET_VERSION: "net9.0"
28+
DOTNET_VERSION: "net10.0"
2929

3030
jobs:
3131
Build:
@@ -48,17 +48,17 @@ jobs:
4848
# dotnet-version: 8.0.x
4949
# dotnet-quality: ga
5050

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

6363
# Build
6464

@@ -134,7 +134,7 @@ jobs:
134134
- name: Report Generator
135135
uses: danielpalme/ReportGenerator-GitHub-Action@5.2.4
136136
with:
137-
reports: '**/coverage.cobertura.xml;**/coverage.net8.0.cobertura.xml;**/coverage.net9.0.cobertura.xml'
137+
reports: '**/coverage.cobertura.xml;**/coverage.*.cobertura.xml'
138138
targetdir: 'CoverageReports'
139139
title: 'Unit Tests Code Coverage'
140140
classfilters: '-Microsoft.FluentUI.AspNetCore.Components.DesignTokens.*'
@@ -151,80 +151,4 @@ jobs:
151151
continue-on-error: true
152152
with:
153153
path: CoverageReports/SummaryGithub.md
154-
deploy_demo:
155-
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
156-
runs-on: ubuntu-latest
157-
name: Build and Deploy Demo site
158-
env:
159-
DOTNET_VERSION: "net9.0"
160-
DOTNET_CLI_TELEMETRY_OPTOUT: 1
161-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
162-
DOTNET_NOLOGO: true
163-
DOTNET_GENERATE_ASPNET_CERTIFICATE: false
164-
DOTNET_ADD_GLOBAL_TOOLS_TO_PATH: false
165-
DOTNET_MULTILEVEL_LOOKUP: 0
166-
PROJECT: "examples/Demo/Client/FluentUI.Demo.Client.csproj"
167-
BUILD_ARCH: "Any CPU"
168-
BUILD_CONFIG: "Release"
169-
SKIP_DEPLOY_ON_MISSING_SECRETS: true
170-
steps:
171-
- name: Checkout source
172-
uses: actions/checkout@v4
173-
174-
- name: .NET Setup SDKs
175-
uses: actions/setup-dotnet@v4
176-
with:
177-
dotnet-version: 9.0.205
178-
# dotnet-quality: ga
179-
180-
- name: .NET Builld
181-
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
182-
183-
- name: .NET Publish
184-
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
185-
186-
- name: Deploy demo site to Azure Static Web App (old subscription)
187-
id: builddeployold
188-
uses: Azure/static-web-apps-deploy@v1
189-
with:
190-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
191-
repo_token: ${{ secrets.GITHUB_TOKEN }}
192-
action: "upload"
193-
app_location: "publish/wwwroot"
194-
api_location: "Api"
195-
output_location: "publish/wwwroot"
196-
skip_api_build: true
197-
skip_app_build: true
198-
production_branch: 'dev'
199-
200-
- name: Deploy demo site to Azure Static Web App (new subscription)
201-
id: builddeploynew
202-
uses: Azure/static-web-apps-deploy@v1
203-
with:
204-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
205-
repo_token: ${{ secrets.GITHUB_TOKEN }}
206-
action: "upload"
207-
app_location: "publish/wwwroot"
208-
api_location: "Api"
209-
output_location: "publish/wwwroot"
210-
skip_api_build: true
211-
skip_app_build: true
212-
production_branch: 'dev'
213-
214-
destroy:
215-
if: github.event_name == 'pull_request' && github.event.action == 'closed'
216-
runs-on: ubuntu-latest
217-
name: Close Pull Request Job
218-
steps:
219-
- name: Close Pull Request on Azure Static Web App (old subscription)
220-
id: closepullrequestold
221-
uses: Azure/static-web-apps-deploy@v1
222-
with:
223-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
224-
action: "close"
225-
- name: Close Pull Request on Azure Static Web App (new subscription)
226-
id: closepullrequestnew
227-
uses: Azure/static-web-apps-deploy@v1
228-
with:
229-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
230-
action: "close"
154+

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ name: "Security Scanning"
1313

1414
on:
1515
push:
16-
branches: [ master ]
16+
branches: [ main ]
1717
pull_request:
18-
branches: [ master ]
18+
branches: [ main ]
1919
schedule:
2020
- cron: '0 0 * * 0,3'
21+
workflow_dispatch:
2122

2223
jobs:
2324
analyze:
@@ -31,7 +32,7 @@ jobs:
3132
strategy:
3233
fail-fast: false
3334
matrix:
34-
language: [ 'csharp' ]
35+
language: [ 'csharp', 'javascript' ]
3536

3637
steps:
3738
- name: Checkout repository
@@ -40,10 +41,7 @@ jobs:
4041
- name: Setup .NET
4142
uses: actions/setup-dotnet@v4
4243
with:
43-
dotnet-version: |
44-
8.0.x
45-
9.0.x
46-
10.0.x
44+
dotnet-version: 10.0.x
4745
dotnet-quality: preview
4846

4947
- name: Initialize CodeQL

‎.github/workflows/deploy_demo.yml‎

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Deploy docs and demo site
22
on:
3+
# Allow manually running the workflow
4+
workflow_dispatch:
5+
36
push:
47
branches:
58
- main
@@ -19,7 +22,7 @@ jobs:
1922
runs-on: ubuntu-latest
2023
name: Build and deploy Demo site
2124
env:
22-
DOTNET_VERSION: "net9.0"
25+
DOTNET_VERSION: "net10.0"
2326
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2427
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2528
DOTNET_NOLOGO: true
@@ -34,17 +37,17 @@ jobs:
3437
- name: Checkout source
3538
uses: actions/checkout@v4
3639

37-
- name: Setup .NET 9.0
38-
uses: actions/setup-dotnet@v4
39-
with:
40-
dotnet-version: 9.0.205
41-
# dotnet-quality: ga
42-
43-
# - name: Setup .NET 10.0
40+
# - name: .NET Setup SDKs
4441
# uses: actions/setup-dotnet@v4
4542
# with:
46-
# dotnet-version: 10.0.x
47-
# dotnet-quality: preview
43+
# dotnet-version: 9.0.x
44+
# dotnet-quality: ga
45+
46+
- name: Setup .NET 10.0
47+
uses: actions/setup-dotnet@v4
48+
with:
49+
dotnet-version: 10.0.x
50+
dotnet-quality: preview
4851

4952
- name: NPM Install
5053
uses: actions/setup-node@v4
@@ -58,24 +61,10 @@ jobs:
5861
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
5962

6063
- name: .NET Publish
61-
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
62-
63-
- name: Deploy demo site to Azure Static Web App (old subscription)
64-
id: builddeployold
65-
uses: Azure/static-web-apps-deploy@v1
66-
with:
67-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_SEA_053FA6A03 }}
68-
repo_token: ${{ secrets.GITHUB_TOKEN }}
69-
action: "upload"
70-
app_location: "publish/wwwroot"
71-
api_location: "Api"
72-
output_location: "publish/wwwroot"
73-
skip_api_build: true
74-
skip_app_build: true
75-
production_branch: 'main'
64+
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 --no-build
7665

77-
- name: Deploy demo site to Azure Static Web App (new subscription)
78-
id: builddeploynew
66+
- name: Deploy demo site to Azure Static Web App
67+
id: builddeploy
7968
uses: Azure/static-web-apps-deploy@v1
8069
with:
8170
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0286DCF03 }}
@@ -93,15 +82,8 @@ jobs:
9382
runs-on: ubuntu-latest
9483
name: Close Pull Request Job
9584
steps:
96-
- name: Close Pull Request on Azure Static Web App (old subscription)
97-
id: closepullrequestold
98-
uses: Azure/static-web-apps-deploy@v1
99-
with:
100-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_SEA_053FA6A03 }}
101-
action: "close"
102-
103-
- name: Close Pull Request on Azure Static Web App (new subscription)
104-
id: closepullrequestnew
85+
- name: Close Pull Request on Azure Static Web App
86+
id: closepullrequest
10587
uses: Azure/static-web-apps-deploy@v1
10688
with:
10789
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0286DCF03 }}

‎.github/workflows/deploy_preview.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@ on:
1111
- '**/*.gitignore'
1212
- '**/*.gitattributes'
1313

14+
pull_request:
15+
types: [opened, synchronize, reopened, closed]
16+
branches: [ main ]
17+
paths-ignore:
18+
- '**/*.gitignore'
19+
- '**/*.gitattributes'
1420
jobs:
1521
build_deploy_demo:
1622
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
1723
runs-on: ubuntu-latest
1824
name: Build and deploy Demo site
1925
env:
20-
DOTNET_VERSION: "net9.0"
26+
DOTNET_VERSION: "net10.0"
2127
DOTNET_CLI_TELEMETRY_OPTOUT: 1
2228
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
2329
DOTNET_NOLOGO: true
@@ -32,34 +38,34 @@ jobs:
3238
- name: Checkout source
3339
uses: actions/checkout@v4
3440

35-
- name: .NET Setup SDKs
41+
# - name: .NET Setup SDKs
42+
# uses: actions/setup-dotnet@v4
43+
# with:
44+
# dotnet-version: 9.0.205
45+
# dotnet-quality: ga
46+
47+
- name: Setup .NET 10.0
3648
uses: actions/setup-dotnet@v4
3749
with:
38-
dotnet-version: 9.0.205
39-
# dotnet-quality: ga
50+
dotnet-version: 10.0.x
51+
dotnet-quality: preview
52+
53+
- name: NPM Install
54+
uses: actions/setup-node@v4
55+
with:
56+
cache: 'npm'
57+
cache-dependency-path: src/Core.Assets/package-lock.json
58+
59+
- run: npm install "src/Core.Assets/"
4060

4161
- name: .NET Builld
4262
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
4363

4464
- name: .NET Publish
4565
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 --no-build
4666

47-
- name: Deploy demo site to Azure Static Web App (old subscription_)
48-
id: builddeployold
49-
uses: Azure/static-web-apps-deploy@v1
50-
with:
51-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
52-
repo_token: ${{ secrets.GITHUB_TOKEN }}
53-
action: "upload"
54-
app_location: "publish/wwwroot"
55-
api_location: "Api"
56-
output_location: "publish/wwwroot"
57-
skip_api_build: true
58-
skip_app_build: true
59-
production_branch: 'dev'
60-
61-
- name: Deploy demo site to Azure Static Web App (newsubscription)
62-
id: builddeploynew
67+
- name: Deploy demo site to Azure Static Web App
68+
id: builddeploy
6369
uses: Azure/static-web-apps-deploy@v1
6470
with:
6571
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
@@ -77,14 +83,8 @@ jobs:
7783
runs-on: ubuntu-latest
7884
name: Close Pull Request Job
7985
steps:
80-
- name: Close Pull Request on Azure Static Web App (old subscription)
81-
id: closepullrequestold
82-
uses: Azure/static-web-apps-deploy@v1
83-
with:
84-
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
85-
action: "close"
86-
- name: Close Pull Request on Azure Static Web App (new subscription)
87-
id: closepullrequestnew
86+
- name: Close Pull Request on Azure Static Web App
87+
id: closepullrequest
8888
uses: Azure/static-web-apps-deploy@v1
8989
with:
9090
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}

‎.vscode/VSCode-Profile-CSharp.code-profile‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎.vscode/extensions.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"editorconfig.editorconfig",
4+
"ms-dotnettools.csdevkit"
5+
]
6+
}

‎.vscode/keybindings.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[
2+
{
3+
"key": "ctrl+b",
4+
"command": "workbench.action.tasks.runTask",
5+
"args": "build-current-project",
6+
"when": "editorTextFocus"
7+
},
8+
{
9+
"key": "ctrl+shift+b",
10+
"command": "workbench.action.tasks.runTask",
11+
"args": "build-solution"
12+
}
13+
]

0 commit comments

Comments
 (0)