Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
db9e29c
Update NuGet package for fixing CVE. See https://github.com/dotnet/an…
vnbaaij Mar 25, 2025
ca50ff3
Non-altering change to force mirroring
vnbaaij Mar 26, 2025
c5687b4
Clean up issue tester
vnbaaij Mar 23, 2025
68d0e56
Small text formatting change to force deploy
vnbaaij Mar 30, 2025
2cd49c5
Merge dev
vnbaaij Apr 11, 2025
df278d8
Update workflows
vnbaaij Apr 11, 2025
42efd04
Merge branch 'dev'
vnbaaij Apr 11, 2025
73d3587
Merge branch 'dev'
vnbaaij May 8, 2025
139be1f
Merge branch 'dev'
vnbaaij Jun 6, 2025
2be462b
Update README
vnbaaij Jun 6, 2025
1b3f709
Update to latest JavaScript SDK
vnbaaij Jun 6, 2025
922c483
Add global.json
vnbaaij Jun 6, 2025
4732f6f
Update workflow to use .NET 9
vnbaaij Jun 6, 2025
2d7701a
Remove net10.0 TFM for now
vnbaaij Jun 6, 2025
5174f52
Set dotnet 9.0.204
dvoituron Jun 6, 2025
7ef5f4f
Update deploy_demo.yml to use 9.0.204
dvoituron Jun 6, 2025
a26c592
Update home page
vnbaaij Jun 7, 2025
e5b90b6
Also *temporarily* remove .NET 10 TFM for DataGrid Adapters
vnbaaij Jun 8, 2025
933b5cc
Update workflows
vnbaaij Jun 8, 2025
b1c3313
Try to get preview docs up again
vnbaaij Jul 15, 2025
23471cc
Use latest .NET 9 SDK for GH Actions
vnbaaij Jul 15, 2025
e784072
Remove mention of v3 site
vnbaaij Jul 15, 2025
ebdc7c6
Update global.json
vnbaaij Jul 15, 2025
8975931
Test deploy to new SWA
vnbaaij Jul 15, 2025
03f150e
Update JavaScript SDK
vnbaaij Jul 15, 2025
4d051de
Try older JavaScript SDK
vnbaaij Jul 15, 2025
80f7bba
Use .204 SDK on all actions
vnbaaij Jul 15, 2025
eab9602
Newer JavaScript SDK with .NET .204 SDK
vnbaaij Jul 15, 2025
77adc5c
Deploy demo to 2 SWAs
vnbaaij Jul 15, 2025
5da1736
Fix id's
vnbaaij Jul 15, 2025
ca6bccc
Evrything tied to .204 and add sub subscription
vnbaaij Jul 15, 2025
a70fad0
Get sources copied
vnbaaij Jul 15, 2025
186d61a
Try again
vnbaaij Jul 15, 2025
1c24098
Tweak message
vnbaaij Jul 15, 2025
f445623
Try again
vnbaaij Jul 15, 2025
2ad9880
Try again
vnbaaij Jul 15, 2025
1f234f7
Try swa.config.json
vnbaaij Jul 15, 2025
ffbb83c
Try extension
vnbaaij Jul 15, 2025
a6498b0
Update action (remove old sub)
vnbaaij Jul 15, 2025
90c7799
Merge branch 'dev' into users/vnbaaij/update-actions
vnbaaij Jul 15, 2025
d3e3397
Revert config.json change
vnbaaij Jul 16, 2025
b8081b8
Use correct codeql action
vnbaaij Jul 16, 2025
6d88372
Merge branch 'main' into users/vnbaaij/update-actions
vnbaaij Jul 16, 2025
eabd63b
Add back build step
vnbaaij Jul 16, 2025
afb3f4d
Merge branch 'dev' into users/vnbaaij/update-actions
vnbaaij Jul 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions .github/workflows/build-core-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.205
dotnet-quality: ga
# dotnet-quality: ga

- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.205
dotnet-quality: ga
# dotnet-quality: ga

- name: Setup .NET 10.0
uses: actions/setup-dotnet@v4
Expand All @@ -189,22 +189,8 @@ jobs:
- name: .NET Publish
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

- name: Deploy demo site to Azure Static Web App (old subscription)
id: builddeployold
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
action: "upload"
app_location: "publish/wwwroot"
api_location: "Api"
output_location: "publish/wwwroot"
skip_api_build: true
skip_app_build: true
production_branch: 'dev'

- name: Deploy demo site to Azure Static Web App (new subscription)
id: builddeploynew
- name: Deploy demo site to Azure Static Web App
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
Expand All @@ -222,14 +208,8 @@ jobs:
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request on Azure Static Web App (old subscription)
id: closepullrequestold
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
action: "close"
- name: Close Pull Request on Azure Static Web App (new subscription)
id: closepullrequestnew
- name: Close Pull Request on Azure Static Web App
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
dotnet-quality: preview

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

Expand All @@ -57,4 +57,4 @@ jobs:
dotnet build Microsoft.FluentUI.sln

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
33 changes: 6 additions & 27 deletions .github/workflows/deploy_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.0.205
dotnet-quality: ga
# dotnet-quality: ga

# - name: Setup .NET 10.0
# uses: actions/setup-dotnet@v4
Expand All @@ -54,28 +54,14 @@ jobs:

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

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

- name: .NET Publish
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

- name: Deploy demo site to Azure Static Web App (old subscription)
id: builddeployold
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_SEA_053FA6A03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
action: "upload"
app_location: "publish/wwwroot"
api_location: "Api"
output_location: "publish/wwwroot"
skip_api_build: true
skip_app_build: true
production_branch: 'main'

- name: Deploy demo site to Azure Static Web App (new subscription)
id: builddeploynew
- name: Deploy demo site to Azure Static Web App
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0286DCF03 }}
Expand All @@ -93,15 +79,8 @@ jobs:
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request on Azure Static Web App (old subscription)
id: closepullrequestold
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_CALM_SEA_053FA6A03 }}
action: "close"

- name: Close Pull Request on Azure Static Web App (new subscription)
id: closepullrequestnew
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_DESERT_0286DCF03 }}
Expand Down
28 changes: 4 additions & 24 deletions .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,8 @@ jobs:
- name: .NET Publish
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

- name: Deploy demo site to Azure Static Web App (old subscription_)
id: builddeployold
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
action: "upload"
app_location: "publish/wwwroot"
api_location: "Api"
output_location: "publish/wwwroot"
skip_api_build: true
skip_app_build: true
production_branch: 'dev'

- name: Deploy demo site to Azure Static Web App (newsubscription)
id: builddeploynew
- name: Deploy demo site to Azure Static Web App
id: builddeployn
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
Expand All @@ -77,14 +63,8 @@ jobs:
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request on Azure Static Web App (old subscription)
id: closepullrequestold
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLACK_PEBBLE_0DC79CB03 }}
action: "close"
- name: Close Pull Request on Azure Static Web App (new subscription)
id: closepullrequestnew
- name: Close Pull Request on Azure Static Web App
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_ISLAND_005801E03 }}
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Client/wwwroot/staticwebapp.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"rewrite": "/index.html",
"exclude": [ "_content/FluentUI.Demo.Shared/sources/*" ]
}
}
}
3 changes: 2 additions & 1 deletion examples/Demo/Shared/FluentUI.Demo.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<Sources Include="$(ProjectDir)\Components\*" />
<Sources Include="$(ProjectDir)\SampleData\*" />
</ItemGroup>
<Copy SourceFiles="@(Sources)" DestinationFiles="@(Sources->'$(ProjectDir)wwwroot\sources\%(Filename)%(Extension).txt')" SkipUnchangedFiles="true" />
<Copy SourceFiles="@(Sources)" DestinationFiles="@(Sources->'$(ProjectDir)wwwroot/sources/%(Filename)%(Extension).txt')" SkipUnchangedFiles="false" />
<Message Text="Copied sources to $(ProjectDir)wwwroot/sources folder." Importance="high" />
</Target>
</Project>