Merge pull request #6814 from bitfoundation/develop

Version 8.7.5 (#6809)
bitfoundation · Feb 9, 2024 · e95da83 · e95da83
2 parents 544e52d + b28acd9
commit e95da83
Show file tree

Hide file tree

Showing 272 changed files with 10,545 additions and 9,701 deletions.
diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml
@@ -165,7 +165,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-x64.exe -r win-x64 --framework net8.0.1-x64-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 net8.0.1-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel'
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2

diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml
@@ -47,6 +47,11 @@ jobs:
         dotnet new bit-bp --name EmptyBP --database other --sample none --pipeline azure --offlineDb --windows
         dotnet build EmptyBP/EmptyBP.sln -c Release -p:RunAOTCompilation=false -p:EnableWindowsTargeting=true
 
+    - name: Release build empty sample without api
+      run: |
+        dotnet new bit-bp --name ApiFalse --database other --sample none --pipeline azure --api false
+        dotnet build ApiFalse/ApiFalse.sln -c Release -p:RunAOTCompilation=false -p:EnableWindowsTargeting=true
+
     - name: Release build admin panel sample + SqlServer database
       run: |
         dotnet new bit-bp --name AdminBPSqlServer --database sqlserver --sample admin --pipeline github

diff --git 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-x64.exe -r win-x64 --framework net8.0.1-x64-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 net8.0.1-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'Bit Blazor UI'
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2

diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml
@@ -56,7 +56,7 @@ jobs:
           sed -i 's/Auto;/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/TodoSample.Server/Startup/Middlewares.cs
+      run:  sed -i 's/http:\/\/localhost:4030/https:\/\/static-todo.bitplatform.dev/g' TodoSample/src/TodoSample.Server/Program.Middlewares.cs
 
     - name: Generate CSS/JS files
       run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks --no-restore
@@ -180,7 +180,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-x64.exe -r win-x64 --framework net8.0.1-x64-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 net8.0.1-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle TodoSample
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@
 ![CI Status](https://github.com/bitfoundation/bitplatform/actions/workflows/bit.ci.yml/badge.svg)
 ![NuGet version](https://img.shields.io/nuget/v/bit.blazorui.svg?logo=nuget)
 [![Nuget downloads](https://img.shields.io/badge/packages_download-4.4M-blue.svg?logo=nuget)](https://www.nuget.org/profiles/bit-foundation)
+[![](https://dcbadge.vercel.app/api/server/7bNMRNYshd?style=flat-square&compact=true&v=2)](https://discord.gg/7bNMRNYshd)
 
 <br/>
 

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
@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
     <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+    <WasmBuildNative>true</WasmBuildNative>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Bit-CI.sln b/src/Bit-CI.sln
@@ -232,7 +232,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bit.Bswup.NewDemo", "Bswup\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bit.Bswup.NewDemo.Client", "Bswup\Bit.Bswup.NewDemo\Bit.Bswup.NewDemo.Client\Bit.Bswup.NewDemo.Client.csproj", "{610E87D1-63A1-4D78-BA84-6E90DDDCF138}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bit.BlazorUI.Demo.Client.Windows", "..\..\bitplatform\src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Windows\Bit.BlazorUI.Demo.Client.Windows.csproj", "{62F75EFA-BF6D-4B61-8CA9-6E071806827B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bit.BlazorUI.Demo.Client.Windows", "BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Windows\Bit.BlazorUI.Demo.Client.Windows.csproj", "{62F75EFA-BF6D-4B61-8CA9-6E071806827B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Boilerplate.Client.Windows", "Templates\Boilerplate\Bit.Boilerplate\src\Client\Boilerplate.Client.Windows\Boilerplate.Client.Windows.csproj", "{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1209,6 +1211,26 @@ Global
 		{62F75EFA-BF6D-4B61-8CA9-6E071806827B}.Release|x64.Build.0 = Release|Any CPU
 		{62F75EFA-BF6D-4B61-8CA9-6E071806827B}.Release|x86.ActiveCfg = Release|Any CPU
 		{62F75EFA-BF6D-4B61-8CA9-6E071806827B}.Release|x86.Build.0 = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|x64.Build.0 = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Debug|x86.Build.0 = Debug|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|iPhone.Build.0 = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|x64.ActiveCfg = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|x64.Build.0 = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|x86.ActiveCfg = Release|Any CPU
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1277,6 +1299,7 @@ Global
 		{A572BB00-354D-4C66-8DE1-946C96CA4172} = {C6EBC527-A489-44B4-A951-D023107A577F}
 		{610E87D1-63A1-4D78-BA84-6E90DDDCF138} = {C6EBC527-A489-44B4-A951-D023107A577F}
 		{62F75EFA-BF6D-4B61-8CA9-6E071806827B} = {D7242830-A91D-4729-BF2D-B1E7E141953E}
+		{5021C89A-8AB8-4345-B8C4-E1B4F1F20BE7} = {EEAF80AE-EC5F-4E55-BD4D-CE7075D67C90}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DA107107-478F-477A-872B-787CEA7DD9B8}

diff --git a/src/Bit.Build.props b/src/Bit.Build.props
@@ -25,7 +25,7 @@
 		<PackageProjectUrl>https://github.com/bitfoundation/bitplatform</PackageProjectUrl>
 		<PackageIconUrl>https://avatars.githubusercontent.com/u/22663390</PackageIconUrl>
 
-		<ReleaseVersion>8.7.4</ReleaseVersion>
+		<ReleaseVersion>8.7.5</ReleaseVersion>
 
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<PackageVersion>$(ReleaseVersion)</PackageVersion>