diff --git a/.github/workflows/build-core-lib.yml b/.github/workflows/build-core-lib.yml index 23d52da59a..05b77c3a25 100644 --- a/.github/workflows/build-core-lib.yml +++ b/.github/workflows/build-core-lib.yml @@ -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 @@ -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 @@ -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 }} @@ -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 }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6e445d0af1..0ec76efba6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/deploy_demo.yml b/.github/workflows/deploy_demo.yml index ddbbc605bd..78e7b2b5ef 100644 --- a/.github/workflows/deploy_demo.yml +++ b/.github/workflows/deploy_demo.yml @@ -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 @@ -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 }} @@ -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 }} diff --git a/.github/workflows/deploy_preview.yml b/.github/workflows/deploy_preview.yml index 7ee738fe29..726a258c26 100644 --- a/.github/workflows/deploy_preview.yml +++ b/.github/workflows/deploy_preview.yml @@ -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 }} @@ -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 }} diff --git a/examples/Demo/Client/wwwroot/staticwebapp.config.json b/examples/Demo/Client/wwwroot/staticwebapp.config.json index 2f40fc46f8..9497dd3381 100644 --- a/examples/Demo/Client/wwwroot/staticwebapp.config.json +++ b/examples/Demo/Client/wwwroot/staticwebapp.config.json @@ -3,4 +3,4 @@ "rewrite": "/index.html", "exclude": [ "_content/FluentUI.Demo.Shared/sources/*" ] } -} \ No newline at end of file +} diff --git a/examples/Demo/Shared/FluentUI.Demo.Shared.csproj b/examples/Demo/Shared/FluentUI.Demo.Shared.csproj index 0f19664d20..d91ef29927 100644 --- a/examples/Demo/Shared/FluentUI.Demo.Shared.csproj +++ b/examples/Demo/Shared/FluentUI.Demo.Shared.csproj @@ -64,6 +64,7 @@ - + +