From 5591f023dcfa2951f4ff0a1d9eca5078f50bdab3 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Tue, 20 Aug 2024 22:46:35 +0200 Subject: [PATCH] fix --- .github/workflows/admin-sample.cd.yml | 2 +- .github/workflows/bit.ci.yml | 4 ++-- .github/workflows/bit.full.ci.yml | 2 +- .github/workflows/blazorui.demo.cd.yml | 2 +- .github/workflows/platform.website.cd.yml | 2 +- .github/workflows/sales.website.cd.yml | 2 +- .github/workflows/todo-sample.cd.yml | 2 +- .../Bit.Boilerplate/.azure-devops/workflows/cd.yml | 2 +- .../Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml | 2 +- .../Pages/Templates/Templates03GettingStartedPage.razor.cs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml index b2fe249585..7ab207964d 100644 --- a/.github/workflows/admin-sample.cd.yml +++ b/.github/workflows/admin-sample.cd.yml @@ -51,7 +51,7 @@ jobs: node-version: 20 - name: Install wasm - run: cd src && dotnet workload install wasm-tools wasm-experimental + run: cd src && dotnet workload install wasm-tools - name: Configure app render mode run: | diff --git a/.github/workflows/bit.ci.yml b/.github/workflows/bit.ci.yml index cc77bf9103..cf1a4dc49a 100644 --- a/.github/workflows/bit.ci.yml +++ b/.github/workflows/bit.ci.yml @@ -25,7 +25,7 @@ jobs: node-version: 20 - name: Install wasm and maui - run: cd src && dotnet workload install maui-android wasm-tools wasm-experimental + run: cd src && dotnet workload install maui-android wasm-tools - name: Run BeforeBuildTasks continue-on-error: true # Error MSB4057, not all csproj files have BeforeBuildTasks target. @@ -57,7 +57,7 @@ jobs: node-version: 20 - name: Install wasm and maui - run: cd src && dotnet workload install maui-android wasm-tools wasm-experimental + run: cd src && dotnet workload install maui-android wasm-tools - name: Install Android Sdk platform tools run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml index 02eb45ee48..29ef43b853 100644 --- a/.github/workflows/bit.full.ci.yml +++ b/.github/workflows/bit.full.ci.yml @@ -31,7 +31,7 @@ jobs: cd src/Templates/Boilerplate && dotnet build -c Release dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0 dotnet new install Bit.Boilerplate.0.0.0.nupkg && cd ../../../ - dotnet workload install maui-tizen maui-android wasm-tools wasm-experimental + dotnet workload install maui-tizen maui-android wasm-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" - name: Install sql server diff --git a/.github/workflows/blazorui.demo.cd.yml b/.github/workflows/blazorui.demo.cd.yml index 52873504b6..6b5090ac1e 100644 --- a/.github/workflows/blazorui.demo.cd.yml +++ b/.github/workflows/blazorui.demo.cd.yml @@ -40,7 +40,7 @@ jobs: node-version: 20 - name: Install wasm - run: cd src && dotnet workload install wasm-tools wasm-experimental + run: cd src && dotnet workload install wasm-tools - name: Enable pre rendering run: sed -i 's/public static readonly bool PrerenderEnabled = false;/public static readonly bool PrerenderEnabled = true;/g' src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Services/AppRenderMode.cs diff --git a/.github/workflows/platform.website.cd.yml b/.github/workflows/platform.website.cd.yml index 0856e46156..980e65ab9d 100644 --- a/.github/workflows/platform.website.cd.yml +++ b/.github/workflows/platform.website.cd.yml @@ -28,7 +28,7 @@ jobs: global-json-file: src/global.json - name: Install wasm - run: cd src && dotnet workload install wasm-tools wasm-experimental + run: cd src && dotnet workload install wasm-tools - name: Generate CSS/JS files run: dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj -t:BeforeBuildTasks --no-restore -c Release diff --git a/.github/workflows/sales.website.cd.yml b/.github/workflows/sales.website.cd.yml index f000188de7..70fbecbba2 100644 --- a/.github/workflows/sales.website.cd.yml +++ b/.github/workflows/sales.website.cd.yml @@ -28,7 +28,7 @@ jobs: global-json-file: src/global.json - name: Install wasm - run: cd src && dotnet workload install wasm-tools wasm-experimental + run: cd src && dotnet workload install wasm-tools - name: Generate CSS/JS files run: dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj -t:BeforeBuildTasks --no-restore -c Release diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml index 94e6a0166c..04d7a562d3 100644 --- a/.github/workflows/todo-sample.cd.yml +++ b/.github/workflows/todo-sample.cd.yml @@ -49,7 +49,7 @@ jobs: ApplicationInsights.ConnectionString: ${{ secrets.APPLICATION_INSIGHTS_CONNECTION_STRING }} - name: Install wasm - run: cd src && dotnet workload install wasm-tools wasm-experimental + run: cd src && dotnet workload install wasm-tools - name: Configure app render mode run: | diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml index 78e024637e..25094d4aa5 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml +++ b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml @@ -43,7 +43,7 @@ jobs: inputs: targetType: 'inline' script: | - 'cd src && dotnet workload install wasm-tools wasm-experimental' + 'cd src && dotnet workload install wasm-tools' - task: FileTransform@2 displayName: Update appsettings.json diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml index 88318b9024..cde128ca9e 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml +++ b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml @@ -46,7 +46,7 @@ jobs: ServerAddress: ${{ env.SERVER_ADDRESS }} - name: Install wasm - run: cd src && dotnet workload install wasm-tools wasm-experimental + run: cd src && dotnet workload install wasm-tools - name: Generate CSS/JS files run: dotnet build src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore -c Release diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs index 4c4b551313..be7a038bb4 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor.cs @@ -75,7 +75,7 @@ private async Task CopyCommandsToClipboard() command:"winget install OpenJS.NodeJS --accept-source-agreements --accept-package-agreements;"), (text:@"echo 'Install WebAssembly workloads https://learn.microsoft.com/en-us/aspnet/core/blazor/webassembly-build-tools-and-aot#net-webassembly-build-tools';", - command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools wasm-experimental;"), + command:"dotnet nuget add source \"https://api.nuget.org/v3/index.json\" --name \"nuget.org\"; dotnet workload install wasm-tools;"), (text:@"echo 'Install the Bit.Boilerplate project template https://www.nuget.org/packages/Boilerplate.Templates';", command:"dotnet new install Bit.Boilerplate::8.11.0-pre-02;"),