From a9e52387ce26714e75b3c3870ba29af6d3e29638 Mon Sep 17 00:00:00 2001 From: Yaser Moradi Date: Sun, 29 Sep 2024 15:24:42 +0200 Subject: [PATCH] feat(deps): update project dependencies #8785 (#8786) --- .devcontainer/devcontainer.json | 2 +- .github/workflows/admin-sample.cd.yml | 18 +++++++-------- .github/workflows/bit.ci.yml | 22 +++++++++++++++---- .github/workflows/bit.full.ci.yml | 4 ++-- .github/workflows/blazorui.demo.cd.yml | 18 +++++++-------- .github/workflows/nuget.org.yml | 4 ++-- .github/workflows/platform.website.cd.yml | 4 ++-- .github/workflows/prerelease.nuget.org.yml | 4 ++-- .github/workflows/sales.website.cd.yml | 4 ++-- .github/workflows/todo-sample.cd.yml | 18 +++++++-------- .../Services/AppRenderMode.cs | 2 +- .../Bit.BlazorUI.Demo.Client.Maui.csproj | 6 ++--- .../Bit.BlazorUI.Demo.Client.Windows.csproj | 2 +- .../Bit.Butil.Demo.Maui.csproj | 5 ++--- .../.azure-devops/workflows/cd.yml | 12 +++++----- .../.azure-devops/workflows/ci.yml | 4 ++-- .../Bit.Boilerplate/.github/workflows/cd.yml | 18 +++++++-------- .../Bit.Boilerplate/.github/workflows/ci.yml | 4 ++-- .../Boilerplate/Bit.Boilerplate/global.json | 2 +- .../src/Directory.Packages.props | 6 ++--- .../Templates03GettingStartedPage.razor | 2 +- src/global.json | 2 +- 22 files changed, 87 insertions(+), 76 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 50c276c8a0..fd38b3dc61 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "hostRequirements": { "cpus": 4 }, - "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/db901b0a-3144-4d07-b8ab-6e7a43e7a791/4d9d1b39b879ad969c6c0ceb6d052381/dotnet-sdk-8.0.401-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && dotnet dev-certs https --trust && find . -type f -name '*.csproj' -exec sed -i 's/Microsoft.NET.Sdk.BlazorWebAssembly/Microsoft.NET.Sdk.Web/g' {} \\;", + "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/1ebffeb0-f090-4001-9f13-69f112936a70/5dbc249b375cca13ec4d97d48ea93b28/dotnet-sdk-8.0.402-linux-x64.tar.gz -O $HOME/dotnet.tar.gz && export DOTNET_ROOT=$HOME/.dotnet && mkdir -p \"$DOTNET_ROOT\" && tar zxf $HOME/dotnet.tar.gz -C \"$DOTNET_ROOT\" && export PATH=$DOTNET_ROOT:$DOTNET_ROOT/tools:$PATH && dotnet dev-certs https --trust && find . -type f -name '*.csproj' -exec sed -i 's/Microsoft.NET.Sdk.BlazorWebAssembly/Microsoft.NET.Sdk.Web/g' {} \\;", "waitFor": "onCreateCommand", "customizations": { "codespaces": { diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml index 1613155e75..1c54f3e373 100644 --- a/.github/workflows/admin-sample.cd.yml +++ b/.github/workflows/admin-sample.cd.yml @@ -19,7 +19,7 @@ jobs: build_api_blazor: name: build api + blazor web - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Install wasm run: cd src && dotnet workload install wasm-tools @@ -83,7 +83,7 @@ jobs: deploy_api_blazor: name: deploy api + blazor needs: build_api_blazor - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 environment: name: 'production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} @@ -137,7 +137,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Create project from Boilerplate run: | @@ -188,7 +188,7 @@ jobs: build_blazor_hybrid_android: name: build blazor hybrid (android) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -209,7 +209,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Extract Android signing key from env uses: timheuer/base64-to-file@v1.2 @@ -252,7 +252,7 @@ jobs: build_blazor_hybrid_ios: name: build blazor hybrid (iOS-macOS) - runs-on: macos-14 + runs-on: macOS-15 steps: @@ -266,11 +266,11 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '15.4' + xcode-version: '16.0' - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Create project from Boilerplate run: | diff --git a/.github/workflows/bit.ci.yml b/.github/workflows/bit.ci.yml index cf1a4dc49a..4a3f2af59c 100644 --- a/.github/workflows/bit.ci.yml +++ b/.github/workflows/bit.ci.yml @@ -8,7 +8,7 @@ jobs: build-release: if: startsWith(github.event.pull_request.title, 'Prerelease') || startsWith(github.event.pull_request.title, 'Release') || startsWith(github.event.pull_request.title, 'Version') name: build and test for release - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -19,10 +19,17 @@ jobs: uses: actions/setup-dotnet@v4 with: global-json-file: src/global.json + + - name: Setup .NET 6,7 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.0.x + 7.0.x - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Install wasm and maui run: cd src && dotnet workload install maui-android wasm-tools @@ -40,7 +47,7 @@ jobs: build: if: startsWith(github.event.pull_request.title, 'Prerelease') != true && startsWith(github.event.pull_request.title, 'Release') != true && startsWith(github.event.pull_request.title, 'Version') != true name: build and test - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -51,10 +58,17 @@ jobs: uses: actions/setup-dotnet@v4 with: global-json-file: src/global.json + + - name: Setup .NET 6,7 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: | + 6.0.x + 7.0.x - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Install wasm and maui run: cd src && dotnet workload install maui-android wasm-tools diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml index ac5abeec39..57cfbb8e9a 100644 --- a/.github/workflows/bit.full.ci.yml +++ b/.github/workflows/bit.full.ci.yml @@ -10,7 +10,7 @@ jobs: build: name: build and test - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Prepare environment run: | diff --git a/.github/workflows/blazorui.demo.cd.yml b/.github/workflows/blazorui.demo.cd.yml index 6b5090ac1e..69b342bd63 100644 --- a/.github/workflows/blazorui.demo.cd.yml +++ b/.github/workflows/blazorui.demo.cd.yml @@ -16,7 +16,7 @@ jobs: build_api_blazor: name: build api + blazor web - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -37,7 +37,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Install wasm run: cd src && dotnet workload install wasm-tools @@ -60,7 +60,7 @@ jobs: deploy_api_blazor: name: deploy api + blazor needs: build_api_blazor - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 environment: name: 'production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} @@ -103,7 +103,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Update appsettings.json api server address uses: devops-actions/variable-substitution@v1.2 @@ -142,7 +142,7 @@ jobs: build_blazor_hybrid_android: name: build blazor hybrid (android) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -156,7 +156,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Extract Android signing key from env uses: timheuer/base64-to-file@v1.2 @@ -192,7 +192,7 @@ jobs: build_blazor_hybrid_ios: name: build blazor hybrid (iOS-macOS) - runs-on: macos-14 + runs-on: macOS-15 steps: @@ -206,11 +206,11 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '15.4' + xcode-version: '16.0' - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Update appsettings.json api server address uses: devops-actions/variable-substitution@v1.2 diff --git a/.github/workflows/nuget.org.yml b/.github/workflows/nuget.org.yml index 764b3baf36..369331d462 100644 --- a/.github/workflows/nuget.org.yml +++ b/.github/workflows/nuget.org.yml @@ -17,7 +17,7 @@ on: jobs: build-publish: name: build & publish - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Delete AssemblyOriginatorKeyFile.snk run: | diff --git a/.github/workflows/platform.website.cd.yml b/.github/workflows/platform.website.cd.yml index 980e65ab9d..aab931b64a 100644 --- a/.github/workflows/platform.website.cd.yml +++ b/.github/workflows/platform.website.cd.yml @@ -15,7 +15,7 @@ jobs: build_api_blazor: name: build api + blazor web - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -45,7 +45,7 @@ jobs: deploy_api_blazor: name: deploy api + blazor needs: build_api_blazor - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 environment: name: 'production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} diff --git a/.github/workflows/prerelease.nuget.org.yml b/.github/workflows/prerelease.nuget.org.yml index b40cd961f2..cd465fc4ee 100644 --- a/.github/workflows/prerelease.nuget.org.yml +++ b/.github/workflows/prerelease.nuget.org.yml @@ -9,7 +9,7 @@ on: jobs: build-publish: name: build & publish - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout source code uses: actions/checkout@v4 @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Delete AssemblyOriginatorKeyFile.snk run: | diff --git a/.github/workflows/sales.website.cd.yml b/.github/workflows/sales.website.cd.yml index 70fbecbba2..042e8a8ba3 100644 --- a/.github/workflows/sales.website.cd.yml +++ b/.github/workflows/sales.website.cd.yml @@ -15,7 +15,7 @@ jobs: build_api_blazor: name: build api + blazor web - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -45,7 +45,7 @@ jobs: deploy_api_blazor: name: deploy api + blazor needs: build_api_blazor - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 environment: name: 'production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml index 89a8caf010..65ea7cfb85 100644 --- a/.github/workflows/todo-sample.cd.yml +++ b/.github/workflows/todo-sample.cd.yml @@ -17,7 +17,7 @@ jobs: build_api_blazor: name: build api + blazor web - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -31,7 +31,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Create project from Boilerplate run: | @@ -71,7 +71,7 @@ jobs: deploy_api_blazor: name: deploy api + blazor needs: build_api_blazor - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 environment: name: 'production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} @@ -125,7 +125,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Create project from Boilerplate run: | @@ -186,7 +186,7 @@ jobs: build_blazor_hybrid_android: name: build blazor hybrid (android) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: @@ -200,7 +200,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Create project from Boilerplate run: | @@ -270,7 +270,7 @@ jobs: build_blazor_hybrid_ios: name: build blazor hybrid (iOS-macOS) - runs-on: macos-14 + runs-on: macOS-15 steps: @@ -284,11 +284,11 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '15.4' + xcode-version: '16.0' - name: Create project from Boilerplate run: | diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/AppRenderMode.cs b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/AppRenderMode.cs index a71b0742dc..32775f99a4 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/AppRenderMode.cs +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/AppRenderMode.cs @@ -13,7 +13,7 @@ public static class AppRenderMode public static IComponentRenderMode NoPrerenderBlazorWebAssembly => new InteractiveWebAssemblyRenderMode(prerender: false); public static IComponentRenderMode Current => - BuildConfiguration.IsDebug() ? BlazorServer /*For better development experience*/ : Auto; + BuildConfiguration.IsDebug() ? BlazorServer /*For better development experience*/ : BlazorWebAssembly; public static bool PwaEnabled { get; } = #if PwaEnabled diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj index 45b79801ff..94507f3df9 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj @@ -102,10 +102,8 @@ - - - - + +