From 6c5d8a4dc874621b7b8d8ec66957ad7687675a8f Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 14:11:08 +0200 Subject: [PATCH 01/62] Add support for .NET 9 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/admin-sample.cd.yml | 10 ++--- .github/workflows/bit.full.ci.yml | 8 ++-- .github/workflows/blazorui.demo.cd.yml | 10 ++--- .github/workflows/nuget.org.yml | 14 +++---- .github/workflows/prerelease.nuget.org.yml | 14 +++---- .github/workflows/todo-sample.cd.yml | 10 ++--- docs/how-to-build.md | 2 +- src/Besql/Bit.Besql/Bit.Besql.csproj | 9 +++-- .../Bit.Besql.Demo.Client.csproj | 8 +++- .../Data/OfflineDbContext.cs | 2 +- .../Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj | 2 +- src/Besql/Demo/Bit.Besql.Demo/Program.cs | 1 + .../Bit.BlazorUI.Assets.csproj | 6 +-- .../Bit.BlazorUI.Extras.csproj | 9 ++--- .../Bit.BlazorUI.Icons.csproj | 6 +-- .../Bit.BlazorUI.Tests.csproj | 2 +- src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj | 9 ++--- .../Bit.BlazorUI.Demo.Server.csproj | 2 +- .../Startup/Middlewares.cs | 1 + .../Bit.BlazorUI.Demo.Shared.csproj | 2 +- .../Bit.BlazorUI.Demo.Client.Core.csproj | 2 +- .../Pages/OverviewPage.razor | 4 +- .../Bit.BlazorUI.Demo.Client.Maui.csproj | 18 ++++----- .../Bit.BlazorUI.Demo.Client.Web.csproj | 4 +- .../wwwroot/service-worker.published.js | 2 +- .../Bit.BlazorUI.Demo.Client.Windows.csproj | 2 +- src/BlazorUI/Demo/Directory.Build.props | 4 +- .../Bit.Bswup.Demo/Bit.Bswup.Demo.csproj | 2 +- .../Bit.Bswup.NewDemo.Client.csproj | 2 +- .../wwwroot/service-worker.published.js | 2 +- .../Bit.Bswup.NewDemo.csproj | 2 +- .../Bit.Bswup.NewDemo/Program.cs | 1 + src/Bswup/Bit.Bswup/Bit.Bswup.csproj | 9 ++--- .../Client/Bit.Bswup.Demo.Client.csproj | 2 +- .../Server/Bit.Bswup.Demo.Server.csproj | 2 +- src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj | 2 +- src/Bup/Bit.Bup/Bit.Bup.csproj | 9 ++--- .../Client/Bit.Bup.Demo.Client.csproj | 2 +- .../Server/Bit.Bup.Demo.Server.csproj | 2 +- src/Butil/Bit.Butil/Bit.Butil.csproj | 9 ++--- .../Bit.Butil.Demo.Core.csproj | 2 +- .../Bit.Butil.Demo.Maui.csproj | 13 +++---- .../Bit.Butil.Demo.Web.csproj | 2 +- .../Bit.BlazorEmpty.ProjectTemplate.csproj | 2 +- .../.template.config/template.json | 13 ------- .../BlazorEmpty.Client.csproj | 2 +- .../BlazorEmpty/BlazorEmpty.csproj | 2 +- .../BlazorEmpty/Program.Main.cs | 1 + .../Bit.BlazorEmpty/BlazorEmpty/Program.cs | 1 + .../BlazorEmpty/Bit.BlazorEmpty/global.json | 4 +- .../Bit.Boilerplate.ProjectTemplate.csproj | 2 +- .../.azure-devops/workflows/cd.yml | 8 ++-- .../Bit.Boilerplate/.github/workflows/cd.yml | 12 +++--- .../Boilerplate/Bit.Boilerplate/global.json | 4 +- .../Boilerplate.Client.Core.csproj | 39 ++++++++++++------- .../Boilerplate.Client.Maui.csproj | 34 ++++++++-------- .../Boilerplate.Client.Maui/MainPage.xaml.cs | 2 + .../Properties/launchSettings.json | 2 +- .../Boilerplate.Client.Web.csproj | 14 +++---- .../Boilerplate.Client.Windows.csproj | 18 ++++----- .../Bit.Boilerplate/src/Directory.Build.props | 4 +- .../Boilerplate.Server.Api.csproj | 34 ++++++++-------- .../Program.Services.cs | 4 +- .../Boilerplate.Server.Web.csproj | 12 +++--- .../Components/App.razor | 10 ++++- .../Program.Middlewares.cs | 3 +- .../src/Shared/Boilerplate.Shared.csproj | 20 +++++----- .../src/Tests/Boilerplate.Tests.csproj | 10 ++--- .../Bit.Websites.Careers.Client.csproj | 20 +++++----- .../Bit.Websites.Careers.Server.csproj | 10 ++--- .../Startup/Middlewares.cs | 1 + .../Bit.Websites.Careers.Shared.csproj | 12 +++--- .../Bit.Websites.Platform.Client.csproj | 22 +++++------ .../Templates03GettingStartedPage.razor | 6 +-- .../Templates04ProjectStructurePage.razor | 6 +-- .../Bit.Websites.Platform.Server.csproj | 10 ++--- .../Startup/Middlewares.cs | 3 +- .../Bit.Websites.Platform.Shared.csproj | 12 +++--- .../Bit.Websites.Sales.Client.csproj | 20 +++++----- .../Bit.Websites.Sales.Server.csproj | 10 ++--- .../Startup/Middlewares.cs | 1 + .../Bit.Websites.Sales.Shared.csproj | 12 +++--- src/global.json | 2 +- 84 files changed, 318 insertions(+), 314 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 50c276c8a0..192c18f2e1 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/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-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 5a1aa55e40..b45e365675 100644 --- a/.github/workflows/admin-sample.cd.yml +++ b/.github/workflows/admin-sample.cd.yml @@ -178,7 +178,7 @@ jobs: echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h echo A | xcopy .\bin\publish .\publish-result /s /e /h dotnet tool restore - dotnet vpk pack -u AdminPanel.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e AdminPanel.Client.Windows-x86.exe -r win-x86 --framework net8.0.8-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel' + dotnet vpk pack -u AdminPanel.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e AdminPanel.Client.Windows-x86.exe -r win-x86 --framework net9.0.0-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel' - name: Upload artifact uses: actions/upload-artifact@v4 @@ -242,13 +242,13 @@ jobs: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release - name: Build aab - run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="AdminPanel.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net8.0-android + run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="AdminPanel.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net9.0-android - name: Upload artifact uses: actions/upload-artifact@v4 with: name: android-bundle - path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/Release/net8.0-android/*-Signed.* + path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/Release/net9.0-android/*-Signed.* build_blazor_hybrid_ios: name: build blazor hybrid (iOS-macOS) @@ -314,10 +314,10 @@ jobs: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release - name: Build ipa - run: dotnet publish AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="AdminPanel" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net8.0-ios + run: dotnet publish AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="AdminPanel" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net9.0-ios - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ios-bundle - path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/release/net8.0-ios/ios-arm64/publish/*.ipa \ No newline at end of file + path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/release/net9.0-ios/ios-arm64/publish/*.ipa \ No newline at end of file diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml index 29ef43b853..cd218fe950 100644 --- a/.github/workflows/bit.full.ci.yml +++ b/.github/workflows/bit.full.ci.yml @@ -71,10 +71,10 @@ jobs: cd TestCosmos/src/Server/TestCosmos.Server.Api/ dotnet build cd ../../../../ - dotnet new bit-bp --name TestMySql --database MySql - cd TestMySql/src/Server/TestMySql.Server.Api/ - dotnet build - cd ../../../../ + # dotnet new bit-bp --name TestMySql --database MySql + # cd TestMySql/src/Server/TestMySql.Server.Api/ + # dotnet build + # cd ../../../../ dotnet new bit-bp --name TestOther --database Other cd TestOther/src/Server/TestOther.Server.Api/ dotnet build diff --git a/.github/workflows/blazorui.demo.cd.yml b/.github/workflows/blazorui.demo.cd.yml index 6b5090ac1e..8a5cb8294a 100644 --- a/.github/workflows/blazorui.demo.cd.yml +++ b/.github/workflows/blazorui.demo.cd.yml @@ -132,7 +132,7 @@ jobs: echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h echo A | xcopy .\bin\publish .\publish-result /s /e /h dotnet tool restore - dotnet vpk pack -u Bit.BlazorUI.Demo.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Bit.BlazorUI.Demo.Client.Windows-x86.exe -r win-x86 --framework net8.0.8-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Bit Blazor UI' + dotnet vpk pack -u Bit.BlazorUI.Demo.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Bit.BlazorUI.Demo.Client.Windows-x86.exe -r win-x86 --framework net9.0.0-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Bit Blazor UI' - name: Upload artifact uses: actions/upload-artifact@v4 @@ -182,13 +182,13 @@ jobs: run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -c Release - name: Build aab - run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="BitBlazorUIDemo.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -f net8.0-android + run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="BitBlazorUIDemo.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -f net9.0-android - name: Upload artifact uses: actions/upload-artifact@v4 with: name: android-bundle - path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/Release/net8.0-android/*-Signed.* + path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/Release/net9.0-android/*-Signed.* build_blazor_hybrid_ios: name: build blazor hybrid (iOS-macOS) @@ -240,10 +240,10 @@ jobs: run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -c Release - name: Build ipa - run: dotnet publish src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="Bit Blazor UI Demo" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -f net8.0-ios + run: dotnet publish src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="Bit Blazor UI Demo" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -f net9.0-ios - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ios-bundle - path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/release/net8.0-ios/ios-arm64/publish/*.ipa \ No newline at end of file + path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/release/net9.0-ios/ios-arm64/publish/*.ipa \ No newline at end of file diff --git a/.github/workflows/nuget.org.yml b/.github/workflows/nuget.org.yml index 764b3baf36..f06f77602f 100644 --- a/.github/workflows/nuget.org.yml +++ b/.github/workflows/nuget.org.yml @@ -45,49 +45,49 @@ jobs: encodedString: ${{ secrets.STRONG_SIGN_CERTIFICATE_BASE64 }} - name: Generate CSS/JS files BlazorUI - run: dotnet build src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI run: dotnet build src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI run: dotnet pack src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj --output . --configuration Release - name: Generate CSS/JS files BlazorUI.Extras - run: dotnet build src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI.Extras run: dotnet build src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI.Extras run: dotnet pack src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj --output . --configuration Release - name: Generate CSS/JS files BlazorUI.Assets - run: dotnet build src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI.Assets run: dotnet build src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI.Assets run: dotnet pack src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj --output . --configuration Release - name: Generate CSS/JS files BlazorUI.Icons - run: dotnet build src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI.Icons run: dotnet build src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI.Icons run: dotnet pack src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj --output . --configuration Release - name: Generate CSS/JS files Bswup - run: dotnet build src/Bswup/Bit.Bswup/Bit.Bswup.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/Bswup/Bit.Bswup/Bit.Bswup.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build Bswup run: dotnet build src/Bswup/Bit.Bswup/Bit.Bswup.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack Bswup run: dotnet pack src/Bswup/Bit.Bswup/Bit.Bswup.csproj --output . --configuration Release - name: Generate CSS/JS files Bup - run: dotnet build src/Bup/Bit.Bup/Bit.Bup.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/Bup/Bit.Bup/Bit.Bup.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build Bup run: dotnet build src/Bup/Bit.Bup/Bit.Bup.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack Bup run: dotnet pack src/Bup/Bit.Bup/Bit.Bup.csproj --output . --configuration Release - name: Generate CSS/JS files Butil - run: dotnet build src/Butil/Bit.Butil/Bit.Butil.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/Butil/Bit.Butil/Bit.Butil.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build Butil run: dotnet build src/Butil/Bit.Butil/Bit.Butil.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack Butil diff --git a/.github/workflows/prerelease.nuget.org.yml b/.github/workflows/prerelease.nuget.org.yml index b40cd961f2..1d83967747 100644 --- a/.github/workflows/prerelease.nuget.org.yml +++ b/.github/workflows/prerelease.nuget.org.yml @@ -35,49 +35,49 @@ jobs: encodedString: ${{ secrets.STRONG_SIGN_CERTIFICATE_BASE64 }} - name: Generate CSS/JS files BlazorUI - run: dotnet build src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI run: dotnet build src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI run: dotnet pack src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj --output . --configuration Release - name: Generate CSS/JS files BlazorUI.Extras - run: dotnet build src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI.Extras run: dotnet build src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI.Extras run: dotnet pack src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj --output . --configuration Release - name: Generate CSS/JS files BlazorUI.Assets - run: dotnet build src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI.Assets run: dotnet build src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI.Assets run: dotnet pack src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj --output . --configuration Release - name: Generate CSS/JS files BlazorUI.Icons - run: dotnet build src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build BlazorUI.Icons run: dotnet build src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack BlazorUI.Icons run: dotnet pack src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj --output . --configuration Release - name: Generate CSS/JS files Bswup - run: dotnet build src/Bswup/Bit.Bswup/Bit.Bswup.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/Bswup/Bit.Bswup/Bit.Bswup.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build Bswup run: dotnet build src/Bswup/Bit.Bswup/Bit.Bswup.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack Bswup run: dotnet pack src/Bswup/Bit.Bswup/Bit.Bswup.csproj --output . --configuration Release - name: Generate CSS/JS files Bup - run: dotnet build src/Bup/Bit.Bup/Bit.Bup.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/Bup/Bit.Bup/Bit.Bup.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build Bup run: dotnet build src/Bup/Bit.Bup/Bit.Bup.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack Bup run: dotnet pack src/Bup/Bit.Bup/Bit.Bup.csproj --output . --configuration Release - name: Generate CSS/JS files Butil - run: dotnet build src/Butil/Bit.Butil/Bit.Butil.csproj -t:BeforeBuildTasks --no-restore -f:net8.0 -c Release + run: dotnet build src/Butil/Bit.Butil/Bit.Butil.csproj -t:BeforeBuildTasks --no-restore -f:net9.0 -c Release - name: dotnet build Butil run: dotnet build src/Butil/Bit.Butil/Bit.Butil.csproj -c Release -p:GeneratePackageOnBuild=false -p:WarningLevel=0 -p:RunCodeAnalysis=false - name: dotnet pack Butil diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml index 84d1448da8..8540ceac9b 100644 --- a/.github/workflows/todo-sample.cd.yml +++ b/.github/workflows/todo-sample.cd.yml @@ -179,7 +179,7 @@ jobs: echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h echo A | xcopy .\bin\publish .\publish-result /s /e /h dotnet tool restore - dotnet vpk pack -u TodoSample.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e TodoSample.Client.Windows-x86.exe -r win-x86 --framework net8.0.8-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle TodoSample + dotnet vpk pack -u TodoSample.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e TodoSample.Client.Windows-x86.exe -r win-x86 --framework net9.0.0-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle TodoSample - name: Upload artifact uses: actions/upload-artifact@v4 @@ -263,13 +263,13 @@ jobs: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release - name: Build aab - run: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="TodoSample.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="TodoSample" -p:ApplicationId="com.bitplatform.Todo.Template" -f net8.0-android + run: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="TodoSample.keystore" -p:AndroidSigningKeyAlias=bitplatform -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="TodoSample" -p:ApplicationId="com.bitplatform.Todo.Template" -f net9.0-android - name: Upload artifact uses: actions/upload-artifact@v4 with: name: android-bundle - path: TodoSample/src/Client/TodoSample.Client.Maui/bin/Release/net8.0-android/*-Signed.* + path: TodoSample/src/Client/TodoSample.Client.Maui/bin/Release/net9.0-android/*-Signed.* build_blazor_hybrid_ios: name: build blazor hybrid (iOS-macOS) @@ -355,10 +355,10 @@ jobs: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release - name: Build ipa - run: dotnet publish TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="TodoTemplate" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="Todo" -p:ApplicationId="com.bitplatform.Todo.Template" -f net8.0-ios + run: dotnet publish TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="TodoTemplate" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" -p:ApplicationTitle="Todo" -p:ApplicationId="com.bitplatform.Todo.Template" -f net9.0-ios - name: Upload artifact uses: actions/upload-artifact@v4 with: name: ios-bundle - path: TodoSample/src/Client/TodoSample.Client.Maui/bin/release/net8.0-ios/ios-arm64/publish/*.ipa + path: TodoSample/src/Client/TodoSample.Client.Maui/bin/release/net9.0-ios/ios-arm64/publish/*.ipa diff --git a/docs/how-to-build.md b/docs/how-to-build.md index 2ba7aa1569..4f3f573cee 100644 --- a/docs/how-to-build.md +++ b/docs/how-to-build.md @@ -22,7 +22,7 @@ building each one of them requires some specific steps that are explained below. Building each of the bit platform projects needs the following basic requirements other than the specific requirements that are explained later: -- [.NET 8 SDK (8.0.401)](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) +- [.NET 9 SDK (9.0.100-rc.1.24452.12)](https://dotnet.microsoft.com/en-us/download/dotnet/9.0) - [Node.js](https://nodejs.org)
diff --git a/src/Besql/Bit.Besql/Bit.Besql.csproj b/src/Besql/Bit.Besql/Bit.Besql.csproj index 4049ac8770..4f5d119c15 100644 --- a/src/Besql/Bit.Besql/Bit.Besql.csproj +++ b/src/Besql/Bit.Besql/Bit.Besql.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0;net8.0 enable enable True @@ -16,8 +16,11 @@ - - + + + + + diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj b/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj index aaaaf2c4f2..489d275591 100644 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj +++ b/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable true @@ -9,8 +9,14 @@ true + + true + ..\Bit.Besql.Demo\Bit.Besql.Demo.csproj + + + diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs index 4f44dec53b..8311e815ac 100644 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs +++ b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs @@ -30,7 +30,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { optionsBuilder - .UseModel(OfflineDbContextModel.Instance) // use generated compiled model in order to make db context optimized + // .UseModel(OfflineDbContextModel.Instance) // use generated compiled model in order to make db context optimized .UseSqlite("Data Source=Offline-ClientDb.db"); base.OnConfiguring(optionsBuilder); diff --git a/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj b/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj index 82cf18dea9..933f4a4d25 100644 --- a/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj +++ b/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/src/Besql/Demo/Bit.Besql.Demo/Program.cs b/src/Besql/Demo/Bit.Besql.Demo/Program.cs index 7d36290de4..fc20bc1760 100644 --- a/src/Besql/Demo/Bit.Besql.Demo/Program.cs +++ b/src/Besql/Demo/Bit.Besql.Demo/Program.cs @@ -31,6 +31,7 @@ app.UseStaticFiles(); app.UseAntiforgery(); +app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() diff --git a/src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj b/src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj index 55c1b88153..4149b3e40a 100644 --- a/src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj +++ b/src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj @@ -3,10 +3,10 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 Bit.BlazorUI 0 - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -23,7 +23,7 @@ - + diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj index b5fb92fa65..ae3005ca98 100644 --- a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj +++ b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj @@ -3,12 +3,12 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 enable Bit.BlazorUI true 0 - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -24,8 +24,7 @@ all - - + @@ -57,7 +56,7 @@ - + diff --git a/src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj b/src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj index 32b08f24d7..ff6ab53cf1 100644 --- a/src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj +++ b/src/BlazorUI/Bit.BlazorUI.Icons/Bit.BlazorUI.Icons.csproj @@ -3,10 +3,10 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 Bit.BlazorUI 0 - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -26,7 +26,7 @@ - + diff --git a/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj b/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj index 49f9ab1df6..3aa8d6f7b0 100644 --- a/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj +++ b/src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0 false 11.0 diff --git a/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj b/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj index fb047e77a7..e592dd919d 100644 --- a/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj +++ b/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj @@ -3,10 +3,10 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 true enable - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -19,8 +19,7 @@ - - + @@ -52,7 +51,7 @@ - + diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj index e8e2b54aff..5d393dd071 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Startup/Middlewares.cs b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Startup/Middlewares.cs index 6e9e18e251..b3086ec902 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Startup/Middlewares.cs +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Startup/Middlewares.cs @@ -82,6 +82,7 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati } // Handle the rest of requests with blazor + app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj index a7e5a31b39..7050256249 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj index bf5e473cd6..74c53652d4 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/OverviewPage.razor b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/OverviewPage.razor index 620dc229af..024a56e063 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/OverviewPage.razor +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Pages/OverviewPage.razor @@ -99,9 +99,9 @@
  • Android 7.1 (API Level 24) or higher
    • -
  • iOS 15 or higher
    • -
  • macOS 12 (Monterey) or higher
  • Windows 7 SP1 or higher
    • +
  • iOS 16.4 or higher
    • +
  • macOS 13 (Ventura) or higher
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 c838e105ec..ef27bec069 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 @@ -1,11 +1,11 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - net8.0-android + net9.0-android;net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net9.0-windows10.0.19041.0 + net9.0-android - + Exe true true @@ -45,8 +45,8 @@ - - + + @@ -102,10 +102,8 @@ - - - - + + true false true true - - false service-worker-assets.js false true diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js index 9d84bfbb80..b2bb65642f 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Web/wwwroot/service-worker.published.js @@ -13,7 +13,7 @@ self.externalAssets = [ "url": "/" }, { - "url": "_framework\/blazor.web.js?v=8.0.8" + "url": "_framework\/blazor.web.js?v=9.0.0-rc.1.24452.1" }, { "url": "https://www.googletagmanager.com/gtag/js?id=G-G1ET5L69QF" diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj index 3aaeed23a2..e179d84994 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net9.0-windows enable enable true diff --git a/src/BlazorUI/Demo/Directory.Build.props b/src/BlazorUI/Demo/Directory.Build.props index 5f36e48ad9..a00e05fd08 100644 --- a/src/BlazorUI/Demo/Directory.Build.props +++ b/src/BlazorUI/Demo/Directory.Build.props @@ -13,8 +13,8 @@ false $(DefineConstants);PwaEnabled - 14.0 - 14.0 + 16.4 + 16.4 24.0 10.0.17763.0 10.0.17763.0 diff --git a/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj b/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj index bd500fbff3..9a40dab36b 100644 --- a/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj +++ b/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable service-worker-assets.js diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj index 32c0fec0a3..47fd90f142 100644 --- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj +++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable true diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js index 6bead24f8b..403351936b 100644 --- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js +++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/wwwroot/service-worker.published.js @@ -19,7 +19,7 @@ self.externalAssets = [ "url": "app.css" }, { - "url": "_framework\/blazor.web.js?v=8.0.8" + "url": "_framework\/blazor.web.js?v=9.0.0-rc.1.24452.1" }, { "url": "Bit.Bswup.NewDemo.styles.css" diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj index 5a7a991857..c4e41d9265 100644 --- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj +++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Program.cs b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Program.cs index ed51ad78fe..51ce46318f 100644 --- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Program.cs +++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Program.cs @@ -26,6 +26,7 @@ app.UseStaticFiles(); app.UseAntiforgery(); +app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() diff --git a/src/Bswup/Bit.Bswup/Bit.Bswup.csproj b/src/Bswup/Bit.Bswup/Bit.Bswup.csproj index ba2b2748f0..5133d31bb1 100644 --- a/src/Bswup/Bit.Bswup/Bit.Bswup.csproj +++ b/src/Bswup/Bit.Bswup/Bit.Bswup.csproj @@ -3,9 +3,9 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 true - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -18,8 +18,7 @@ - - + @@ -32,7 +31,7 @@ - + diff --git a/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj b/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj index f9c5734c40..4152bdc4a8 100644 --- a/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj +++ b/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable service-worker-assets.js diff --git a/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj b/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj index 9d20299ee5..44c9565ad2 100644 --- a/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj +++ b/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable diff --git a/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj b/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj index 9d2b40b543..33242831cd 100644 --- a/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj +++ b/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable true diff --git a/src/Bup/Bit.Bup/Bit.Bup.csproj b/src/Bup/Bit.Bup/Bit.Bup.csproj index dd753a2e1e..d048dc2e91 100644 --- a/src/Bup/Bit.Bup/Bit.Bup.csproj +++ b/src/Bup/Bit.Bup/Bit.Bup.csproj @@ -3,9 +3,9 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0 true - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -18,8 +18,7 @@ - - + @@ -32,7 +31,7 @@ - + diff --git a/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj b/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj index 34e9ddad62..d0c8e0c559 100644 --- a/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj +++ b/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable true diff --git a/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj b/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj index d471eca680..97958f8d9b 100644 --- a/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj +++ b/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable diff --git a/src/Butil/Bit.Butil/Bit.Butil.csproj b/src/Butil/Bit.Butil/Bit.Butil.csproj index 03fbf0c75b..4e2b1ad213 100644 --- a/src/Butil/Bit.Butil/Bit.Butil.csproj +++ b/src/Butil/Bit.Butil/Bit.Butil.csproj @@ -3,9 +3,9 @@ - net8.0 + net9.0;net8.0 true - + BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -18,8 +18,7 @@ - - + @@ -32,7 +31,7 @@ - + diff --git a/src/Butil/Demo/Bit.Butil.Demo.Core/Bit.Butil.Demo.Core.csproj b/src/Butil/Demo/Bit.Butil.Demo.Core/Bit.Butil.Demo.Core.csproj index 66d02cca69..fb9ca59e9a 100644 --- a/src/Butil/Demo/Bit.Butil.Demo.Core/Bit.Butil.Demo.Core.csproj +++ b/src/Butil/Demo/Bit.Butil.Demo.Core/Bit.Butil.Demo.Core.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 diff --git a/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj b/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj index dfa524c008..92f3964199 100644 --- a/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj +++ b/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj @@ -1,11 +1,11 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - net8.0-android + net9.0-android;net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net9.0-windows10.0.19041.0 + net9.0-android - + Exe true true @@ -50,9 +50,8 @@ - - - + + diff --git a/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj b/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj index 13ffa757ad..ef7c44f203 100644 --- a/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj +++ b/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable true diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj index 4cc4bcd63b..71162d3ec0 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty.ProjectTemplate.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 false content false diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/.template.config/template.json b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/.template.config/template.json index 4d841947d0..54286b1afa 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/.template.config/template.json +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/.template.config/template.json @@ -106,19 +106,6 @@ } ], "symbols": { - "Framework": { - "type": "parameter", - "description": "The target framework for the project.", - "datatype": "choice", - "defaultValue": "net8.0", - "choices": [ - { - "choice": "net8.0", - "description": "Target net8.0" - } - ], - "replaces": "net8.0" - }, "InteractivityPlatform": { "type": "parameter", "datatype": "choice", diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj index 0fd31bd6f2..94c53cbbb2 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 enable enable true diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj index aaebe3d7ac..6c9ca5dacd 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 enable enable True diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.Main.cs b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.Main.cs index 91add0c191..be94ad38e9 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.Main.cs +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.Main.cs @@ -55,6 +55,7 @@ public static void Main(string[] args) app.UseStaticFiles(); app.UseAntiforgery(); + app.MapStaticAssets(); #if (UseServer && UseWebAssembly) app.MapRazorComponents() .AddInteractiveServerRenderMode() diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.cs b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.cs index 58e8dd2186..fca0161b77 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.cs +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/Program.cs @@ -49,6 +49,7 @@ app.UseStaticFiles(); app.UseAntiforgery(); +app.MapStaticAssets(); #if (UseServer && UseWebAssembly) app.MapRazorComponents() .AddInteractiveServerRenderMode() diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/global.json b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/global.json index 5273746f66..1a0e589dfa 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/global.json +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", - "rollForward": "latestFeature" + "version": "9.0.100-rc.1.24452.12", + "rollForward": "latestPatch" } } \ No newline at end of file diff --git a/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj b/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj index 690698d70f..3ead73c584 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate.ProjectTemplate.csproj @@ -3,7 +3,7 @@ - net8.0 + net9.0 false content false 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 25094d4aa5..b29b456aa7 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml +++ b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml @@ -195,7 +195,7 @@ jobs: echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h echo A | xcopy .\bin\publish .\publish-result /s /e /h dotnet tool restore - dotnet vpk pack -u Boilerplate.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Boilerplate.Client.Windows-x86.exe -r win-x86 --framework net8.0.8-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Boilerplate' + dotnet vpk pack -u Boilerplate.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Boilerplate.Client.Windows-x86.exe -r win-x86 --framework net9.0.0-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Boilerplate' - task: PublishPipelineArtifact@1 displayName: Upload artifact @@ -262,17 +262,17 @@ jobs: displayName: 'Build aab' inputs: targetType: 'inline' - script: 'dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="$(ANDROID_RELEASE_KEYSTORE_PASSWORD)" -p:AndroidSigningStorePass="$(ANDROID_RELEASE_SIGNING_PASSWORD)" -f net8.0-android' + script: 'dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="$(ANDROID_RELEASE_KEYSTORE_PASSWORD)" -p:AndroidSigningStorePass="$(ANDROID_RELEASE_SIGNING_PASSWORD)" -f net9.0-android' - task: Bash@3 displayName: 'Build apk' inputs: targetType: 'inline' - script: 'dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="$(ANDROID_RELEASE_KEYSTORE_PASSWORD)" -p:AndroidSigningStorePass="$(ANDROID_RELEASE_SIGNING_PASSWORD)" -f net8.0-android' + script: 'dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="$(ANDROID_RELEASE_KEYSTORE_PASSWORD)" -p:AndroidSigningStorePass="$(ANDROID_RELEASE_SIGNING_PASSWORD)" -f net9.0-android' - script: | mkdir drop - cp ./src/Client/Boilerplate.Client.Maui/bin/Release/net8.0-android/*-Signed.* drop/ + cp ./src/Client/Boilerplate.Client.Maui/bin/Release/net9.0-android/*-Signed.* drop/ failOnStderr: true displayName: Copy apk/aab files to drop folder diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml index cde128ca9e..27936e018e 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml +++ b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml @@ -170,7 +170,7 @@ jobs: echo A | xcopy .\bin\publish-x64 .\publish-result /s /e /h echo A | xcopy .\bin\publish .\publish-result /s /e /h dotnet tool restore - dotnet vpk pack -u Boilerplate.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Boilerplate.Client.Windows-x86.exe -r win-x86 --framework net8.0.8-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Boilerplate' + dotnet vpk pack -u Boilerplate.Client.Windows -v "${{ vars.APPLICATION_DISPLAY_VERSION }}" -p .\publish-result -e Boilerplate.Client.Windows-x86.exe -r win-x86 --framework net9.0.0-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Boilerplate' - name: Upload artifact uses: actions/upload-artifact@v4 @@ -223,16 +223,16 @@ jobs: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -t:BeforeBuildTasks --no-restore -c Release - name: Build aab - run: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -f net8.0-android + run: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidPackageFormat=aab -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -f net9.0-android - name: Build apk - run: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -f net8.0-android + run: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -c Release -p:AndroidKeyStore=true -p:AndroidSigningKeyStore="Boilerplate.keystore" -p:AndroidSigningKeyAlias=Boilerplate -p:AndroidSigningKeyPass="${{ secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD }}" -p:AndroidSigningStorePass="${{ secrets.ANDROID_RELEASE_SIGNING_PASSWORD }}" -f net9.0-android - name: Upload artifact uses: actions/upload-artifact@v4 with: name: android-bundle - path: src/Client/Boilerplate.Client.Maui/bin/Release/net8.0-android/*-Signed.* + path: src/Client/Boilerplate.Client.Maui/bin/Release/net9.0-android/*-Signed.* build_blazor_hybrid_iOS: name: build blazor hybrid (iOS-macOS) @@ -286,10 +286,10 @@ jobs: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -t:BeforeBuildTasks --no-restore -c Release - name: Build ipa - run: dotnet publish src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="${{ env.IOS_CODE_SIGN_PROVISION }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-ios + run: dotnet publish src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -p:RuntimeIdentifier=ios-arm64 -c Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="${{ env.IOS_CODE_SIGN_PROVISION }}" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net9.0-ios - name: Upload artifact uses: actions/upload-artifact@v4 with: name: iOS-bundle - path: src/Client/Boilerplate.Client.Maui/bin/release/net8.0-ios/ios-arm64/publish/*.ipa \ No newline at end of file + path: src/Client/Boilerplate.Client.Maui/bin/release/net9.0-ios/ios-arm64/publish/*.ipa \ No newline at end of file diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/global.json b/src/Templates/Boilerplate/Bit.Boilerplate/global.json index 5273746f66..1a0e589dfa 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/global.json +++ b/src/Templates/Boilerplate/Bit.Boilerplate/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", - "rollForward": "latestFeature" + "version": "9.0.100-rc.1.24452.12", + "rollForward": "latestPatch" } } \ No newline at end of file diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj index 875b86d538..001d34ffcb 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj @@ -1,13 +1,22 @@  - net8.0 + net9.0 BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) + + + + true + OfflineDbContext + ..\..\Server\Boilerplate.Server.Web\Boilerplate.Server.Web.csproj + + + @@ -16,22 +25,22 @@ - - - - + + + + - - - - + + + + - - - - - - + + + + + + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj index 3a45a6716a..335d7004ec 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj @@ -1,11 +1,11 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - net8.0-android + net9.0-android;net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net9.0-windows10.0.19041.0 + net9.0-android - + Exe true true @@ -25,6 +25,9 @@ True + + None + $(NoWarn);ClassWithoutModifierAnalyzer @@ -76,8 +79,8 @@ - - + + @@ -117,11 +120,10 @@ - - + + - @@ -130,17 +132,15 @@ - - - - + + - - - - + + + + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs index 5c1891212f..f39a14d965 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs @@ -1,4 +1,5 @@ //-:cnd:noEmit +using System.Runtime.InteropServices; using Maui.AppStores; using Maui.InAppReviews; @@ -78,5 +79,6 @@ private async Task CheckForUpdates() } catch (InvalidOperationException) when ((AppPlatform.IsIOS || AppPlatform.IsMacOS) && AppEnvironment.IsDev()) { } catch (FileNotFoundException) { } + catch (COMException) { } } } diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Properties/launchSettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Properties/launchSettings.json index edf8aadcc8..4f857936f4 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Properties/launchSettings.json +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Properties/launchSettings.json @@ -1,7 +1,7 @@ { "profiles": { "Windows Machine": { - "commandName": "MsixPackage", + "commandName": "Project", "nativeDebugging": false } } diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj index 5794adc345..e488cbaf2a 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/Boilerplate.Client.Web.csproj @@ -1,15 +1,13 @@  - net8.0 + net9.0 true false true true - - false service-worker-assets.js false true @@ -30,11 +28,11 @@ - - - - - + + + + + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj index 33f370672e..423092543e 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Boilerplate.Client.Windows.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net9.0-windows enable enable true @@ -24,15 +24,15 @@ - - + + - - - - - - + + + + + + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props index 0d953408d3..dea1a38412 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Directory.Build.props @@ -25,8 +25,8 @@ Development Production - 14.0 - 14.0 + 16.4 + 16.4 24.0 10.0.17763.0 10.0.17763.0 diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj index 9cb9d7b3a4..02fc23b11c 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj @@ -1,14 +1,14 @@  - net8.0 + net9.0 AC87AA5B-4B37-4E52-8468-2D5DF24AF256 PrepareResources;$(CompileDependsOn) - - + + @@ -27,22 +27,22 @@ - - - + + + - - - - - - - - + + + + + + + + - - - + + + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs index f63322cdb3..7e561ba8a9 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Program.Services.cs @@ -134,10 +134,10 @@ void AddDbContext(DbContextOptionsBuilder options) }); //#elif (database == "MySql") - options.UseMySql(configuration.GetConnectionString("MySqlSQLConnectionString"), ServerVersion.AutoDetect(configuration.GetConnectionString("MySqlSQLConnectionString")), dbOptions => + /*options.UseMySql(configuration.GetConnectionString("MySqlSQLConnectionString"), ServerVersion.AutoDetect(configuration.GetConnectionString("MySqlSQLConnectionString")), dbOptions => { - }); + });*/ //#elif (database == "Other") throw new NotImplementedException("Install and configure any database supported by ef core (https://learn.microsoft.com/en-us/ef/core/providers)"); //#endif diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj index 182fc5a4a0..dfbf692af1 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj @@ -1,17 +1,17 @@  - net8.0 + net9.0 AC87AA5B-4B37-4E52-8468-2D5DF24AF256 false - - - - - + + + + + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor index 1a6905d002..3222fafc8f 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor @@ -1,9 +1,15 @@ -@using Boilerplate.Client.Web.Components +@using Microsoft.AspNetCore.Components.Routing +@using Boilerplate.Client.Web.Components @*+:cnd:noEmit*@ @{ var noPrerender = HttpContext.Request.Query["no-prerender"].Count > 0; var renderMode = noPrerender ? AppRenderMode.NoPrerenderBlazorWebAssembly : AppRenderMode.Current; + if (HttpContext.AcceptsInteractiveRouting() is false) + { + // https://learn.microsoft.com/en-us/aspnet/core/release-notes/aspnetcore-9.0?view=aspnetcore-9.0#add-static-server-side-rendering-ssr-pages-to-a-globally-interactive-blazor-web-app + renderMode = null; + } } @@ -48,7 +54,7 @@ - @if (AppRenderMode.PrerenderEnabled is false || noPrerender) + @if (renderMode != null && (AppRenderMode.PrerenderEnabled is false || noPrerender)) { } diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs index d84a09788c..360a3e76b3 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs @@ -124,7 +124,8 @@ private static void ConfiureMiddlewares(this WebApplication app) //#endif app.UseSiteMap(); - + + app.MapStaticAssets(); // Handle the rest of requests with blazor var blazorApp = app.MapRazorComponents() .AddInteractiveServerRenderMode() diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj index 7d3c892098..9566b81cd9 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Boilerplate.Shared.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 PrepareResources;$(CompileDependsOn) @@ -14,15 +14,15 @@ - - - - - - - - - + + + + + + + + + compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj index 39dba441c6..2c60bf34b9 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Tests/Boilerplate.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable false @@ -14,10 +14,10 @@ all - - - - + + + + diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj index 31becb6233..de27522d74 100644 --- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj +++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj @@ -1,12 +1,10 @@  - net8.0 + net9.0 true Default true - - false BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -14,7 +12,7 @@ - + @@ -24,19 +22,19 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -89,7 +87,7 @@ - + diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj index 67f5eeb16a..b707892134 100644 --- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj +++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Bit.Websites.Careers.Server.csproj @@ -1,19 +1,19 @@  - net8.0 + net9.0 - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs index a7b22292db..c19941e03a 100644 --- a/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs +++ b/src/Websites/Careers/src/Bit.Websites.Careers.Server/Startup/Middlewares.cs @@ -73,6 +73,7 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati app.MapHealthChecksUI(); } + app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj index 7a5eabeb0d..d133fa95c9 100644 --- a/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj +++ b/src/Websites/Careers/src/Bit.Websites.Careers.Shared/Bit.Websites.Careers.Shared.csproj @@ -1,22 +1,22 @@  - net8.0 + net9.0 en-US - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj index d0765bef6a..b051d9cb76 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj @@ -1,12 +1,10 @@  - net8.0 + net9.0 true Default true - - false BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -14,7 +12,7 @@ - + @@ -24,20 +22,20 @@ - - - + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -90,7 +88,7 @@ - + diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor index e49015855a..22cccb3b6b 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor @@ -99,9 +99,9 @@ Install latest .NET 8 SDK @if (devOS is "Linux") { - -
To install .NET 8 SDK on Linux(Ubuntu) run the following commands:
- 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 + +
To install .NET 9 SDK on Linux(Ubuntu) run the following commands:
+ wget https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz -O $HOME/dotnet.tar.gz mkdir -p $HOME/.dotnet tar zxf $HOME/dotnet.tar.gz -C "$HOME/.dotnet" echo 'PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH' >> ~/.bashrc diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates04ProjectStructurePage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates04ProjectStructurePage.razor index 3343bab688..c982936d94 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates04ProjectStructurePage.razor +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates04ProjectStructurePage.razor @@ -56,11 +56,11 @@
  • - PropertyGroup: This section specifies properties such as TargetFramework. For instance, the following line indicates that the project uses .NET 8: + PropertyGroup: This section specifies properties such as TargetFramework. For instance, the following line indicates that the project uses .NET 9:

    - <TargetFramework>net8.0</TargetFramework> + <TargetFramework>net9.0</TargetFramework>

    @@ -70,7 +70,7 @@

    - <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" /> + <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

    diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj index 1a1557267e..6ec6512b20 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Bit.Websites.Platform.Server.csproj @@ -1,19 +1,19 @@  - net8.0 + net9.0 - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs index e9c30e38dd..b190bb6686 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Startup/Middlewares.cs @@ -70,7 +70,8 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati app.MapHealthChecksUI(); } - + + app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj index 7a5eabeb0d..d133fa95c9 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Shared/Bit.Websites.Platform.Shared.csproj @@ -1,22 +1,22 @@  - net8.0 + net9.0 en-US - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj index 3c48f6c310..72e1f3aee3 100644 --- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj +++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj @@ -1,12 +1,10 @@  - net8.0 + net9.0 true Default true - - false BeforeBuildTasks; $(ResolveStaticWebAssetsInputsDependsOn) @@ -14,7 +12,7 @@ - + @@ -24,19 +22,19 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -89,7 +87,7 @@ - + diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj index 7b2c8ee1f7..8735407bbe 100644 --- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj +++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Bit.Websites.Sales.Server.csproj @@ -1,19 +1,19 @@  - net8.0 + net9.0 - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs index 435863c48a..fe5c9b83f5 100644 --- a/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs +++ b/src/Websites/Sales/src/Bit.Websites.Sales.Server/Startup/Middlewares.cs @@ -73,6 +73,7 @@ public static void Use(WebApplication app, IWebHostEnvironment env, IConfigurati app.MapHealthChecksUI(); } + app.MapStaticAssets(); app.MapRazorComponents() .AddInteractiveServerRenderMode() .AddInteractiveWebAssemblyRenderMode() diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj index 7a5eabeb0d..d133fa95c9 100644 --- a/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj +++ b/src/Websites/Sales/src/Bit.Websites.Sales.Shared/Bit.Websites.Sales.Shared.csproj @@ -1,22 +1,22 @@  - net8.0 + net9.0 en-US - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/global.json b/src/global.json index 495d811189..399cfdb504 100644 --- a/src/global.json +++ b/src/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.401", + "version": "9.0.100-rc.1.24452.12", "rollForward": "disable" } } \ No newline at end of file From cf7d515c09e23ad7aef4bdb67cb30f419189342b Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 14:19:56 +0200 Subject: [PATCH 02/62] fix --- .../CompiledModel/OfflineDbContextModel.cs | 47 ------ .../OfflineDbContextModelBuilder.cs | 96 ------------- .../WeatherForecastEntityType.cs | 136 ------------------ .../Boilerplate.Client.Maui/MainPage.xaml.cs | 2 +- .../Bit.Websites.Careers.Client.csproj | 2 +- .../Bit.Websites.Platform.Client.csproj | 2 +- .../Bit.Websites.Sales.Client.csproj | 2 +- 7 files changed, 4 insertions(+), 283 deletions(-) delete mode 100644 src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModel.cs delete mode 100644 src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModelBuilder.cs delete mode 100644 src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/WeatherForecastEntityType.cs diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModel.cs b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModel.cs deleted file mode 100644 index 5ae652b204..0000000000 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModel.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; - -#pragma warning disable 219, 612, 618 -#nullable disable - -namespace Bit.Besql.Demo.Client.Data.CompiledModel -{ - [DbContext(typeof(OfflineDbContext))] - public partial class OfflineDbContextModel : RuntimeModel - { - private static readonly bool _useOldBehavior31751 = - System.AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue31751", out var enabled31751) && enabled31751; - - static OfflineDbContextModel() - { - var model = new OfflineDbContextModel(); - - if (_useOldBehavior31751) - { - model.Initialize(); - } - else - { - var thread = new System.Threading.Thread(RunInitialization, 10 * 1024 * 1024); - thread.Start(); - thread.Join(); - - void RunInitialization() - { - model.Initialize(); - } - } - - model.Customize(); - _instance = model; - } - - private static OfflineDbContextModel _instance; - public static IModel Instance => _instance; - - partial void Initialize(); - - partial void Customize(); - } -} diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModelBuilder.cs b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModelBuilder.cs deleted file mode 100644 index b9991c6f5c..0000000000 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/OfflineDbContextModelBuilder.cs +++ /dev/null @@ -1,96 +0,0 @@ -// -using System; -using System.Collections.Generic; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; - -#pragma warning disable 219, 612, 618 -#nullable disable - -namespace Bit.Besql.Demo.Client.Data.CompiledModel -{ - public partial class OfflineDbContextModel - { - partial void Initialize() - { - var weatherForecast = WeatherForecastEntityType.Create(this); - - WeatherForecastEntityType.CreateAnnotations(weatherForecast); - - AddAnnotation("ProductVersion", "8.0.0"); - AddRuntimeAnnotation("Relational:RelationalModel", CreateRelationalModel()); - } - - private IRelationalModel CreateRelationalModel() - { - var relationalModel = new RelationalModel(this); - - var weatherForecast = FindEntityType("Bit.Besql.Demo.Client.Model.WeatherForecast")!; - - var defaultTableMappings = new List>(); - weatherForecast.SetRuntimeAnnotation("Relational:DefaultMappings", defaultTableMappings); - var bitBesqlSampleClientModelWeatherForecastTableBase = new TableBase("Bit.Besql.Demo.Client.Model.WeatherForecast", null, relationalModel); - var dateColumnBase = new ColumnBase("Date", "INTEGER", bitBesqlSampleClientModelWeatherForecastTableBase); - bitBesqlSampleClientModelWeatherForecastTableBase.Columns.Add("Date", dateColumnBase); - var idColumnBase = new ColumnBase("Id", "INTEGER", bitBesqlSampleClientModelWeatherForecastTableBase); - bitBesqlSampleClientModelWeatherForecastTableBase.Columns.Add("Id", idColumnBase); - var summaryColumnBase = new ColumnBase("Summary", "TEXT", bitBesqlSampleClientModelWeatherForecastTableBase) - { - IsNullable = true - }; - bitBesqlSampleClientModelWeatherForecastTableBase.Columns.Add("Summary", summaryColumnBase); - var temperatureCColumnBase = new ColumnBase("TemperatureC", "INTEGER", bitBesqlSampleClientModelWeatherForecastTableBase); - bitBesqlSampleClientModelWeatherForecastTableBase.Columns.Add("TemperatureC", temperatureCColumnBase); - relationalModel.DefaultTables.Add("Bit.Besql.Demo.Client.Model.WeatherForecast", bitBesqlSampleClientModelWeatherForecastTableBase); - var bitBesqlSampleClientModelWeatherForecastMappingBase = new TableMappingBase(weatherForecast, bitBesqlSampleClientModelWeatherForecastTableBase, true); - bitBesqlSampleClientModelWeatherForecastTableBase.AddTypeMapping(bitBesqlSampleClientModelWeatherForecastMappingBase, false); - defaultTableMappings.Add(bitBesqlSampleClientModelWeatherForecastMappingBase); - RelationalModel.CreateColumnMapping((ColumnBase)idColumnBase, weatherForecast.FindProperty("Id")!, bitBesqlSampleClientModelWeatherForecastMappingBase); - RelationalModel.CreateColumnMapping((ColumnBase)dateColumnBase, weatherForecast.FindProperty("Date")!, bitBesqlSampleClientModelWeatherForecastMappingBase); - RelationalModel.CreateColumnMapping((ColumnBase)summaryColumnBase, weatherForecast.FindProperty("Summary")!, bitBesqlSampleClientModelWeatherForecastMappingBase); - RelationalModel.CreateColumnMapping((ColumnBase)temperatureCColumnBase, weatherForecast.FindProperty("TemperatureC")!, bitBesqlSampleClientModelWeatherForecastMappingBase); - - var tableMappings = new List(); - weatherForecast.SetRuntimeAnnotation("Relational:TableMappings", tableMappings); - var weatherForecastsTable = new Table("WeatherForecasts", null, relationalModel); - var idColumn = new Column("Id", "INTEGER", weatherForecastsTable); - weatherForecastsTable.Columns.Add("Id", idColumn); - var dateColumn = new Column("Date", "INTEGER", weatherForecastsTable); - weatherForecastsTable.Columns.Add("Date", dateColumn); - var summaryColumn = new Column("Summary", "TEXT", weatherForecastsTable) - { - IsNullable = true - }; - weatherForecastsTable.Columns.Add("Summary", summaryColumn); - var temperatureCColumn = new Column("TemperatureC", "INTEGER", weatherForecastsTable); - weatherForecastsTable.Columns.Add("TemperatureC", temperatureCColumn); - var pK_WeatherForecasts = new UniqueConstraint("PK_WeatherForecasts", weatherForecastsTable, new[] { idColumn }); - weatherForecastsTable.PrimaryKey = pK_WeatherForecasts; - var pK_WeatherForecastsUc = RelationalModel.GetKey(this, - "Bit.Besql.Demo.Client.Model.WeatherForecast", - new[] { "Id" }); - pK_WeatherForecasts.MappedKeys.Add(pK_WeatherForecastsUc); - RelationalModel.GetOrCreateUniqueConstraints(pK_WeatherForecastsUc).Add(pK_WeatherForecasts); - weatherForecastsTable.UniqueConstraints.Add("PK_WeatherForecasts", pK_WeatherForecasts); - var iX_WeatherForecasts_TemperatureC = new TableIndex( - "IX_WeatherForecasts_TemperatureC", weatherForecastsTable, new[] { temperatureCColumn }, false); - var iX_WeatherForecasts_TemperatureCIx = RelationalModel.GetIndex(this, - "Bit.Besql.Demo.Client.Model.WeatherForecast", - new[] { "TemperatureC" }); - iX_WeatherForecasts_TemperatureC.MappedIndexes.Add(iX_WeatherForecasts_TemperatureCIx); - RelationalModel.GetOrCreateTableIndexes(iX_WeatherForecasts_TemperatureCIx).Add(iX_WeatherForecasts_TemperatureC); - weatherForecastsTable.Indexes.Add("IX_WeatherForecasts_TemperatureC", iX_WeatherForecasts_TemperatureC); - relationalModel.Tables.Add(("WeatherForecasts", null), weatherForecastsTable); - var weatherForecastsTableMapping = new TableMapping(weatherForecast, weatherForecastsTable, true); - weatherForecastsTable.AddTypeMapping(weatherForecastsTableMapping, false); - tableMappings.Add(weatherForecastsTableMapping); - RelationalModel.CreateColumnMapping(idColumn, weatherForecast.FindProperty("Id")!, weatherForecastsTableMapping); - RelationalModel.CreateColumnMapping(dateColumn, weatherForecast.FindProperty("Date")!, weatherForecastsTableMapping); - RelationalModel.CreateColumnMapping(summaryColumn, weatherForecast.FindProperty("Summary")!, weatherForecastsTableMapping); - RelationalModel.CreateColumnMapping(temperatureCColumn, weatherForecast.FindProperty("TemperatureC")!, weatherForecastsTableMapping); - return relationalModel.MakeReadOnly(); - } - } -} diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/WeatherForecastEntityType.cs b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/WeatherForecastEntityType.cs deleted file mode 100644 index e1d6226468..0000000000 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/CompiledModel/WeatherForecastEntityType.cs +++ /dev/null @@ -1,136 +0,0 @@ -// -using System; -using System.Reflection; -using Bit.Besql.Demo.Client.Model; -using Microsoft.EntityFrameworkCore.ChangeTracking; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Sqlite.Storage.Internal; -using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.EntityFrameworkCore.Storage.Json; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#pragma warning disable 219, 612, 618 -#nullable disable - -namespace Bit.Besql.Demo.Client.Data.CompiledModel -{ - internal partial class WeatherForecastEntityType - { - public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType baseEntityType = null) - { - var runtimeEntityType = model.AddEntityType( - "Bit.Besql.Demo.Client.Model.WeatherForecast", - typeof(WeatherForecast), - baseEntityType); - - var id = runtimeEntityType.AddProperty( - "Id", - typeof(int), - propertyInfo: typeof(WeatherForecast).GetProperty("Id", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly), - fieldInfo: typeof(WeatherForecast).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly), - valueGenerated: ValueGenerated.OnAdd, - afterSaveBehavior: PropertySaveBehavior.Throw, - sentinel: 0); - id.TypeMapping = IntTypeMapping.Default.Clone( - comparer: new ValueComparer( - (int v1, int v2) => v1 == v2, - (int v) => v, - (int v) => v), - keyComparer: new ValueComparer( - (int v1, int v2) => v1 == v2, - (int v) => v, - (int v) => v), - providerValueComparer: new ValueComparer( - (int v1, int v2) => v1 == v2, - (int v) => v, - (int v) => v), - mappingInfo: new RelationalTypeMappingInfo( - storeTypeName: "INTEGER")); - - var date = runtimeEntityType.AddProperty( - "Date", - typeof(DateTimeOffset), - propertyInfo: typeof(WeatherForecast).GetProperty("Date", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly), - fieldInfo: typeof(WeatherForecast).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly), - valueConverter: new DateTimeOffsetToBinaryConverter()); - date.TypeMapping = LongTypeMapping.Default.Clone( - comparer: new ValueComparer( - (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2), - (DateTimeOffset v) => v.GetHashCode(), - (DateTimeOffset v) => v), - keyComparer: new ValueComparer( - (DateTimeOffset v1, DateTimeOffset v2) => v1.EqualsExact(v2), - (DateTimeOffset v) => v.GetHashCode(), - (DateTimeOffset v) => v), - providerValueComparer: new ValueComparer( - (long v1, long v2) => v1 == v2, - (long v) => v.GetHashCode(), - (long v) => v), - mappingInfo: new RelationalTypeMappingInfo( - storeTypeName: "INTEGER"), - converter: new ValueConverter( - (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v), - (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v)), - jsonValueReaderWriter: new JsonConvertedValueReaderWriter( - JsonInt64ReaderWriter.Instance, - new ValueConverter( - (DateTimeOffset v) => DateTimeOffsetToBinaryConverter.ToLong(v), - (long v) => DateTimeOffsetToBinaryConverter.ToDateTimeOffset(v)))); - date.SetSentinelFromProviderValue(0L); - - var summary = runtimeEntityType.AddProperty( - "Summary", - typeof(string), - propertyInfo: typeof(WeatherForecast).GetProperty("Summary", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly), - fieldInfo: typeof(WeatherForecast).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly), - nullable: true, - maxLength: 100); - summary.TypeMapping = SqliteStringTypeMapping.Default; - - var temperatureC = runtimeEntityType.AddProperty( - "TemperatureC", - typeof(int), - propertyInfo: typeof(WeatherForecast).GetProperty("TemperatureC", BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly), - fieldInfo: typeof(WeatherForecast).GetField("k__BackingField", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly), - sentinel: 0); - temperatureC.TypeMapping = IntTypeMapping.Default.Clone( - comparer: new ValueComparer( - (int v1, int v2) => v1 == v2, - (int v) => v, - (int v) => v), - keyComparer: new ValueComparer( - (int v1, int v2) => v1 == v2, - (int v) => v, - (int v) => v), - providerValueComparer: new ValueComparer( - (int v1, int v2) => v1 == v2, - (int v) => v, - (int v) => v), - mappingInfo: new RelationalTypeMappingInfo( - storeTypeName: "INTEGER")); - - var key = runtimeEntityType.AddKey( - new[] { id }); - runtimeEntityType.SetPrimaryKey(key); - - var index = runtimeEntityType.AddIndex( - new[] { temperatureC }); - - return runtimeEntityType; - } - - public static void CreateAnnotations(RuntimeEntityType runtimeEntityType) - { - runtimeEntityType.AddAnnotation("Relational:FunctionName", null); - runtimeEntityType.AddAnnotation("Relational:Schema", null); - runtimeEntityType.AddAnnotation("Relational:SqlQuery", null); - runtimeEntityType.AddAnnotation("Relational:TableName", "WeatherForecasts"); - runtimeEntityType.AddAnnotation("Relational:ViewName", null); - runtimeEntityType.AddAnnotation("Relational:ViewSchema", null); - - Customize(runtimeEntityType); - } - - static partial void Customize(RuntimeEntityType runtimeEntityType); - } -} diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs index f39a14d965..f844ab194b 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/MainPage.xaml.cs @@ -1,7 +1,7 @@ //-:cnd:noEmit -using System.Runtime.InteropServices; using Maui.AppStores; using Maui.InAppReviews; +using System.Runtime.InteropServices; namespace Boilerplate.Client.Maui; diff --git a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj index de27522d74..e21ebec494 100644 --- a/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj +++ b/src/Websites/Careers/src/Bit.Websites.Careers.Client/Bit.Websites.Careers.Client.csproj @@ -87,7 +87,7 @@ - + diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj index b051d9cb76..d67036cfb8 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj @@ -88,7 +88,7 @@ - + diff --git a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj index 72e1f3aee3..9c661eb616 100644 --- a/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj +++ b/src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj @@ -87,7 +87,7 @@ - + From 9b1b6ddbe3803fce25f29c333f008ec98f02ad36 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 14:51:33 +0200 Subject: [PATCH 03/62] fix --- .../Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj index 02fc23b11c..18a1bff268 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Boilerplate.Server.Api.csproj @@ -37,7 +37,6 @@ - From 05a5303f823ddee8f7b950408785d100f576a4c2 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 16:17:44 +0200 Subject: [PATCH 04/62] fix --- .../Pages/Templates/Templates03GettingStartedPage.razor | 2 +- .../Pages/Templates/Templates03GettingStartedPage.razor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor index 67bc824b8b..1bab76f10c 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor @@ -96,7 +96,7 @@
    1. - Install latest .NET 8 SDK + Install latest .NET 9 SDK @if (devOS is "Linux") { 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 67f1f46f9b..4c77fefcc0 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 @@ -62,7 +62,7 @@ private async Task CopyCommandsToClipboard() command:"$ProgressPreference = 'SilentlyContinue'; Install-PackageProvider -Name \"NuGet\" -Force; Set-PSRepository -Name \"PSGallery\" -InstallationPolicy Trusted; Install-Script winget-install -Force; winget-install -Force;"), (text:@"echo 'Install .NET SDK https://dotnet.microsoft.com/en-us/download';", - command:"winget install Microsoft.DotNet.SDK.8 --accept-source-agreements --accept-package-agreements;"), + command:"winget install Microsoft.DotNet.SDK.9 --accept-source-agreements --accept-package-agreements;"), (text:@"echo 'Discover installed .NET SDK';", command:"$env:Path = [System.Environment]::GetEnvironmentVariable(\"Path\",\"Machine\") + \";\" + [System.Environment]::GetEnvironmentVariable(\"Path\",\"User\");"), From 175cd75c34c28a1cf445978649894a0f9de3984c Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 16:19:52 +0200 Subject: [PATCH 05/62] PLATFORM WEBSITE 8 --- .../Pages/Templates/Templates03GettingStartedPage.razor | 8 ++++---- .../Templates/Templates03GettingStartedPage.razor.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor index 1bab76f10c..e01f460138 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor @@ -96,12 +96,12 @@
      1. - Install latest .NET 9 SDK + Install latest .NET 8 SDK @if (devOS is "Linux") { - -
        To install .NET 9 SDK on Linux(Ubuntu) run the following commands:
        - wget https://download.visualstudio.microsoft.com/download/pr/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-linux-x64.tar.gz -O $HOME/dotnet.tar.gz + +
        To install .NET 8 SDK on Linux(Ubuntu) run the following commands:
        + wget 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 mkdir -p $HOME/.dotnet tar zxf $HOME/dotnet.tar.gz -C "$HOME/.dotnet" echo 'PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH' >> ~/.bashrc 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 4c77fefcc0..67f1f46f9b 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 @@ -62,7 +62,7 @@ private async Task CopyCommandsToClipboard() command:"$ProgressPreference = 'SilentlyContinue'; Install-PackageProvider -Name \"NuGet\" -Force; Set-PSRepository -Name \"PSGallery\" -InstallationPolicy Trusted; Install-Script winget-install -Force; winget-install -Force;"), (text:@"echo 'Install .NET SDK https://dotnet.microsoft.com/en-us/download';", - command:"winget install Microsoft.DotNet.SDK.9 --accept-source-agreements --accept-package-agreements;"), + command:"winget install Microsoft.DotNet.SDK.8 --accept-source-agreements --accept-package-agreements;"), (text:@"echo 'Discover installed .NET SDK';", command:"$env:Path = [System.Environment]::GetEnvironmentVariable(\"Path\",\"Machine\") + \";\" + [System.Environment]::GetEnvironmentVariable(\"Path\",\"User\");"), From e76e5afbdede110f37581f87d93f7cbab5d8415a Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 16:57:58 +0200 Subject: [PATCH 06/62] fix --- .github/workflows/admin-sample.cd.yml | 2 +- .github/workflows/todo-sample.cd.yml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml index b45e365675..226b67eeeb 100644 --- a/.github/workflows/admin-sample.cd.yml +++ b/.github/workflows/admin-sample.cd.yml @@ -61,7 +61,7 @@ jobs: run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release - name: Publish - run: dotnet publish AdminPanel/src/Server/AdminPanel.Server.Api/AdminPanel.Server.Api.csproj -c Release -p:PwaEnabled=true -p:PublishTrimmed=true -p:TrimMode=partial -p:JsonSerializerIsReflectionEnabledByDefault=true --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/server -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" + run: dotnet publish AdminPanel/src/Server/AdminPanel.Server.Api/AdminPanel.Server.Api.csproj -c Release -p:PwaEnabled=true --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/server -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" - name: Upload server artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml index 8540ceac9b..a06f0de6a6 100644 --- a/.github/workflows/todo-sample.cd.yml +++ b/.github/workflows/todo-sample.cd.yml @@ -56,14 +56,11 @@ jobs: sed -i 's/public static readonly bool PrerenderEnabled = false;/public static readonly bool PrerenderEnabled = true;/g' TodoSample/src/Client/TodoSample.Client.Core/Services/AppRenderMode.cs sed -i 's/BlazorAuto;/BlazorWebAssembly;/g' TodoSample/src/Client/TodoSample.Client.Core/Services/AppRenderMode.cs - - name: Changes for static-todo.bitplatform.dev - Part 1 - run: sed -i 's/http:\/\/localhost:4030/https:\/\/static-todo.bitplatform.dev/g' TodoSample/src/Server/TodoSample.Server.Web/Program.Middlewares.cs - - name: Generate CSS/JS files run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" --no-restore -c Release - name: Publish - run: dotnet publish TodoSample/src/Server/TodoSample.Server.Web/TodoSample.Server.Web.csproj -c Release -p:PwaEnabled=true -p:PublishTrimmed=true -p:TrimMode=partial -p:JsonSerializerIsReflectionEnabledByDefault=true --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/server -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" + run: dotnet publish TodoSample/src/Server/TodoSample.Server.Web/TodoSample.Server.Web.csproj -c Release -p:PwaEnabled=true --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/server -p:Version="${{ vars.APPLICATION_DISPLAY_VERSION}}" - name: Upload server artifact uses: actions/upload-artifact@v4 From e053656252dcff054122eebaf4536898e616a99c Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 16:58:08 +0200 Subject: [PATCH 07/62] GOOGEL AND CLARITY --- .../Demo/Bit.BlazorUI.Demo.Server/Components/App.razor | 8 ++++---- .../src/Bit.Websites.Platform.Server/Components/App.razor | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor index b7c237cbc2..fff8ec1afd 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor @@ -26,7 +26,7 @@ - + - + Google tag --> + + Microsoft Clarity --> diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor index 4d46ac2ddf..c75d93ce03 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Server/Components/App.razor @@ -8,7 +8,7 @@ - + + End Google Tag Manager --> @@ -30,7 +30,7 @@ - + + Microsoft Clarity --> From 0ea88e121f0f2953aa8d03499cf5bd8a2b758a32 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 17:49:44 +0200 Subject: [PATCH 08/62] fix --- .../Demo/Bit.BlazorUI.Demo.Server/Components/App.razor | 4 ++-- .../src/Bit.Websites.Platform.Server/Components/App.razor | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor index fff8ec1afd..544c50da4c 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Components/App.razor @@ -26,7 +26,7 @@ - - Google tag --> + - End Google Tag Manager --> + From f277d5102f35f972dd9cb716a825e702f0276ac3 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 18:13:52 +0200 Subject: [PATCH 09/62] fix --- .../Pages/Templates/Templates03GettingStartedPage.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor index e01f460138..007c82f96f 100644 --- a/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor +++ b/src/Websites/Platform/src/Bit.Websites.Platform.Client/Pages/Templates/Templates03GettingStartedPage.razor @@ -101,7 +101,7 @@ {
        To install .NET 8 SDK on Linux(Ubuntu) run the following commands:
        - wget 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 + 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 mkdir -p $HOME/.dotnet tar zxf $HOME/dotnet.tar.gz -C "$HOME/.dotnet" echo 'PATH=$HOME/.dotnet:$HOME/.dotnet/tools:$PATH' >> ~/.bashrc From 43258b05285f8f72d37d48089b982d2917620ef2 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 20:00:09 +0200 Subject: [PATCH 10/62] fix --- .../src/Server/Boilerplate.Server.Web/Program.Middlewares.cs | 5 ++++- .../Boilerplate.Server.Web/Properties/launchSettings.json | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs index 360a3e76b3..331ffbfcb3 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs @@ -125,7 +125,10 @@ private static void ConfiureMiddlewares(this WebApplication app) app.UseSiteMap(); - app.MapStaticAssets(); + if (env.IsDevelopment()) + { + app.MapStaticAssets(); + } // Handle the rest of requests with blazor var blazorApp = app.MapRazorComponents() .AddInteractiveServerRenderMode() diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Properties/launchSettings.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Properties/launchSettings.json index f5492bfca1..b5b29d542c 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Properties/launchSettings.json +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Properties/launchSettings.json @@ -46,6 +46,7 @@ "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/", "environmentVariables": { "ASPNETCORE_HTTP_PORTS": "5030", + "ASPNETCORE_ENVIRONMENT": "Development", "ConnectionStrings__SqliteConnectionString": "Data Source=/container_volume/App_Data/BoilerplateDb.db;" }, "DockerfileRunArguments": "-v C:\\DockerVolumes\\AC87AA5B-4B37-4E52-8468-2D5DF24AF256:/container_volume", From e1fd51ba4c531d3adcb56b602f28dbf2b407f68c Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 20:15:47 +0200 Subject: [PATCH 11/62] fix --- .../Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json | 2 +- .../src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js | 2 +- .../src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json b/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json index 79f20ac7c4..fc7a1a78c0 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json +++ b/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Boilerplate", - "image": "mcr.microsoft.com/dotnet/sdk:8.0", + "image": "mcr.microsoft.com/dotnet/sdk:9.0", "hostRequirements": { "cpus": 4 }, diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js index 3d05c5c721..8db309a357 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Web/wwwroot/service-worker.js @@ -15,7 +15,7 @@ self.externalAssets = [ "url": "/" }, { - url: "_framework/blazor.web.js?v=8.0.8" + url: "_framework/blazor.web.js?v=9.0.0-rc.1.24452.1" } ]; diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json index 071b4ee500..0af663a9b1 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "8.0.8", + "version": "9.0.0-rc.1.24451.1", "commands": [ "dotnet-ef" ] From 44215213b2887d520f4b18da81f2ab64317120bc Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 20:24:33 +0200 Subject: [PATCH 12/62] fix --- .devcontainer/devcontainer.json | 2 +- .../Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 192c18f2e1..d3dfb5e3f4 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/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-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/3b2b3c23-574b-45d7-b2b0-c67f0e935308/23ed647eb71a8f07414124422c15927d/dotnet-sdk-9.0.100-rc.1.24452.12-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 && 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/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json b/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json index fc7a1a78c0..46f2251e44 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json +++ b/src/Templates/Boilerplate/Bit.Boilerplate/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "hostRequirements": { "cpus": 4 }, - "onCreateCommand": "dotnet dev-certs https --trust && dotnet workload install wasm-tools", + "onCreateCommand": "dotnet workload install wasm-tools", "waitFor": "onCreateCommand", "customizations": { "codespaces": { From bb79f4d1f044bc0ea4172da0a24bbdb8e67259a9 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 20:50:19 +0200 Subject: [PATCH 13/62] fix --- .../src/Server/Boilerplate.Server.Web/Program.Middlewares.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs index 331ffbfcb3..360a3e76b3 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Program.Middlewares.cs @@ -125,10 +125,7 @@ private static void ConfiureMiddlewares(this WebApplication app) app.UseSiteMap(); - if (env.IsDevelopment()) - { - app.MapStaticAssets(); - } + app.MapStaticAssets(); // Handle the rest of requests with blazor var blazorApp = app.MapRazorComponents() .AddInteractiveServerRenderMode() From 8cdb6eeffc08a95566bf09e98668db184b8c0363 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 22:26:30 +0200 Subject: [PATCH 14/62] FIX --- .../Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj | 1 + .../src/Server/Boilerplate.Server.Web/Components/App.razor | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj index dfbf692af1..0f73061273 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj @@ -18,6 +18,7 @@ + diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor index 3222fafc8f..a76c4bac53 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor @@ -53,6 +53,7 @@ + @if (renderMode != null && (AppRenderMode.PrerenderEnabled is false || noPrerender)) { From a1cc6d7bdbcce29f68a0357fd408756da64884b7 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Mon, 16 Sep 2024 22:38:48 +0200 Subject: [PATCH 15/62] fix --- .../Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj | 1 - .../src/Server/Boilerplate.Server.Web/Components/App.razor | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj index 0f73061273..dfbf692af1 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Boilerplate.Server.Web.csproj @@ -18,7 +18,6 @@ - diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor index a76c4bac53..3222fafc8f 100644 --- a/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor +++ b/src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Web/Components/App.razor @@ -53,7 +53,6 @@ - @if (renderMode != null && (AppRenderMode.PrerenderEnabled is false || noPrerender)) { From 8db2fe8e2ff36135d00a7715f2664ad5b5c9f551 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Tue, 17 Sep 2024 02:43:02 +0200 Subject: [PATCH 16/62] fix --- .github/workflows/admin-sample.cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml index 226b67eeeb..32b6a422e4 100644 --- a/.github/workflows/admin-sample.cd.yml +++ b/.github/workflows/admin-sample.cd.yml @@ -72,7 +72,7 @@ jobs: - name: Publish adminpanel blazor wasm standalone run: | sed -i 's/adminpanel.bitplatform.dev/adminpanel-api.bitplatform.dev/g' AdminPanel/src/Client/AdminPanel.Client.Web/wwwroot/index.html - dotnet publish AdminPanel/src/Client/AdminPanel.Client.Web/AdminPanel.Client.Web.csproj -c Release -p:BlazorWebAssemblyStandalone=true -o ${{env.DOTNET_ROOT}}/static + dotnet publish AdminPanel/src/Client/AdminPanel.Client.Web/AdminPanel.Client.Web.csproj -c Release -p:BlazorWebAssemblyStandalone=true -p:ResolveAssemblyReferencesFindRelatedSatellites=true -o ${{env.DOTNET_ROOT}}/static - name: Upload static artifact uses: actions/upload-artifact@v4 From db469f512fec7babec680ee7998c074f4c2579d9 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Tue, 17 Sep 2024 02:57:29 +0200 Subject: [PATCH 17/62] fix --- .../Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj | 2 +- src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj | 6 +++--- .../Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj | 2 +- src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj | 2 +- .../Bit.BlazorUI.Demo.Server.csproj | 2 +- .../Bit.BlazorUI.Demo.Shared.csproj | 8 ++++---- .../Bit.BlazorUI.Demo.Client.Core.csproj | 8 ++++---- .../Bit.BlazorUI.Demo.Client.Windows.csproj | 2 +- src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj | 4 ++-- .../Bit.Bswup.NewDemo.Client.csproj | 2 +- .../Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj | 2 +- src/Bswup/Bit.Bswup/Bit.Bswup.csproj | 2 +- src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj | 4 ++-- src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj | 2 +- src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj | 4 ++-- src/Bup/Bit.Bup/Bit.Bup.csproj | 2 +- src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj | 4 ++-- src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj | 2 +- src/Butil/Bit.Butil/Bit.Butil.csproj | 4 ++-- .../Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj | 2 +- .../Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj | 4 ++-- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj b/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj index 489d275591..94b191cd33 100644 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj +++ b/src/Besql/Demo/Bit.Besql.Demo.Client/Bit.Besql.Demo.Client.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj b/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj index 933f4a4d25..de0cf51a00 100644 --- a/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj +++ b/src/Besql/Demo/Bit.Besql.Demo/Bit.Besql.Demo.csproj @@ -8,7 +8,7 @@ - + @@ -19,11 +19,11 @@ and open Nuget Package Manager Console, and select `Bit.Besql.Demo` project as default project Then run either Add-Migration MigrationName -OutputDir Data\Migrations or Optimize-DbContext -OutputDir Data/CompiledModel commands. --> - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj index ae3005ca98..b059829937 100644 --- a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj +++ b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj @@ -24,7 +24,7 @@ all - + diff --git a/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj b/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj index e592dd919d..904fa140cb 100644 --- a/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj +++ b/src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj index 2326598a02..a1fac47bf2 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Server/Bit.BlazorUI.Demo.Server.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj index 9a2bed36b5..63fdc56972 100644 --- a/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj +++ b/src/BlazorUI/Demo/Bit.BlazorUI.Demo.Shared/Bit.BlazorUI.Demo.Shared.csproj @@ -13,10 +13,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj index 51f4458bce..e80063fc87 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj @@ -24,9 +24,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -87,7 +87,7 @@ - + diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj index c36b6e0ee9..57190d2f32 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Windows/Bit.BlazorUI.Demo.Client.Windows.csproj @@ -25,7 +25,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj b/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj index 9a40dab36b..519d5ba6a3 100644 --- a/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj +++ b/src/Bswup/Bit.Bswup.Demo/Bit.Bswup.Demo.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj index 47fd90f142..7ab7ef48e7 100644 --- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj +++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.Client/Bit.Bswup.NewDemo.Client.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj index c4e41d9265..d679b1e65f 100644 --- a/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj +++ b/src/Bswup/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo/Bit.Bswup.NewDemo.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Bswup/Bit.Bswup/Bit.Bswup.csproj b/src/Bswup/Bit.Bswup/Bit.Bswup.csproj index 5133d31bb1..05b0ce070a 100644 --- a/src/Bswup/Bit.Bswup/Bit.Bswup.csproj +++ b/src/Bswup/Bit.Bswup/Bit.Bswup.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj b/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj index 4152bdc4a8..cb5ceef67a 100644 --- a/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj +++ b/src/Bswup/FullDemo/Client/Bit.Bswup.Demo.Client.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj b/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj index 44c9565ad2..5379b68f0a 100644 --- a/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj +++ b/src/Bswup/FullDemo/Server/Bit.Bswup.Demo.Server.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj b/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj index 33242831cd..d88c3f86f2 100644 --- a/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj +++ b/src/Bup/Bit.Bup.Demo/Bit.Bup.Demo.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/Bup/Bit.Bup/Bit.Bup.csproj b/src/Bup/Bit.Bup/Bit.Bup.csproj index d048dc2e91..800235434e 100644 --- a/src/Bup/Bit.Bup/Bit.Bup.csproj +++ b/src/Bup/Bit.Bup/Bit.Bup.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj b/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj index d0c8e0c559..bc16787a7e 100644 --- a/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj +++ b/src/Bup/FullDemo/Client/Bit.Bup.Demo.Client.csproj @@ -9,7 +9,7 @@ - - + + diff --git a/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj b/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj index 97958f8d9b..4f32edb30a 100644 --- a/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj +++ b/src/Bup/FullDemo/Server/Bit.Bup.Demo.Server.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Butil/Bit.Butil/Bit.Butil.csproj b/src/Butil/Bit.Butil/Bit.Butil.csproj index 4e2b1ad213..2a220ccc90 100644 --- a/src/Butil/Bit.Butil/Bit.Butil.csproj +++ b/src/Butil/Bit.Butil/Bit.Butil.csproj @@ -3,7 +3,7 @@ - net9.0;net8.0 + net9.0;net8.0 true BeforeBuildTasks; @@ -18,7 +18,7 @@ - + diff --git a/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj b/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj index 92f3964199..3a20d2d6da 100644 --- a/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj +++ b/src/Butil/Demo/Bit.Butil.Demo.Maui/Bit.Butil.Demo.Maui.csproj @@ -52,7 +52,7 @@ - + diff --git a/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj b/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj index ef7c44f203..2792c4ab06 100644 --- a/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj +++ b/src/Butil/Demo/Bit.Butil.Demo.Web/Bit.Butil.Demo.Web.csproj @@ -8,8 +8,8 @@ - - + + From 41c729620aa858fc030da5c685e64bdf86768c18 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Tue, 17 Sep 2024 03:01:29 +0200 Subject: [PATCH 18/62] fix --- .../BlazorEmpty.Client/BlazorEmpty.Client.csproj | 2 +- .../BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj index 13b7c3b9e1..9a461928f2 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty.Client/BlazorEmpty.Client.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj index 3947f97f8c..f1ebe32699 100644 --- a/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj +++ b/src/Templates/BlazorEmpty/Bit.BlazorEmpty/BlazorEmpty/BlazorEmpty.csproj @@ -12,7 +12,7 @@ - + From 5019e7cb1a94b63ef4aec69487ff8c2a90223ef6 Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Tue, 17 Sep 2024 03:20:23 +0200 Subject: [PATCH 19/62] fix --- src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs index 8311e815ac..94d61448e8 100644 --- a/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs +++ b/src/Besql/Demo/Bit.Besql.Demo.Client/Data/OfflineDbContext.cs @@ -1,5 +1,4 @@ -using Bit.Besql.Demo.Client.Data.CompiledModel; -using Bit.Besql.Demo.Client.Model; +using Bit.Besql.Demo.Client.Model; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; From d87aadc602a21dda46fcb88ad8372708b034d9ac Mon Sep 17 00:00:00 2001 From: ysmoradi Date: Tue, 17 Sep 2024 11:59:32 +0200 Subject: [PATCH 20/62] fix --- .../wwwroot/index.html | 15 ++++++++------- .../Boilerplate.Client.Maui/wwwroot/index.html | 1 - .../Boilerplate.Client.Web/wwwroot/index.html | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html index 89ed793d6a..eaa85b1d94 100644 --- a/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html +++ b/src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/wwwroot/index.html @@ -23,19 +23,20 @@ - + +