Merge pull request #6924 from bitfoundation/develop

Version 8.7.6 (#6922)
bitfoundation · Feb 23, 2024 · 8d39034 · 8d39034
2 parents e95da83 + fbcd3de
commit 8d39034
Show file tree

Hide file tree

Showing 200 changed files with 5,746 additions and 4,058 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
     "hostRequirements": {
         "cpus": 4
     },
-    "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/9454f7dc-b98e-4a64-a96d-4eb08c7b6e66/da76f9c6bc4276332b587b771243ae34/dotnet-sdk-8.0.101-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 && sudo dotnet workload install wasm-tools wasm-experimental && dotnet dev-certs https --trust && dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
+    "onCreateCommand": "wget https://download.visualstudio.microsoft.com/download/pr/85bcc525-4e9c-471e-9c1d-96259aa1a315/930833ef34f66fe9ee2643b0ba21621a/dotnet-sdk-8.0.201-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 && sudo dotnet workload install wasm-tools wasm-experimental && dotnet dev-certs https --trust && dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Platform/src/Bit.Websites.Platform.Client/Bit.Websites.Platform.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Websites/Sales/src/Bit.Websites.Sales.Client/Bit.Websites.Sales.Client.csproj -t:BeforeBuildTasks --no-restore && dotnet build src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore",
     "waitFor": "onCreateCommand",
     "customizations": {
         "codespaces": {
@@ -21,7 +21,18 @@
         }
     },
     "forwardPorts": [
-        4000, 4001, 5000, 5001, 4030, 4031, 4040, 4041, 5030, 5031, 5040, 5041
+        4000,
+        4001,
+        5000,
+        5001,
+        4030,
+        4031,
+        4040,
+        4041,
+        5030,
+        5031,
+        5040,
+        5041
     ],
     "remoteEnv": {
         "ASPNETCORE_ENVIRONMENT": "Development"

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+# These are supported funding model platforms
+github: [bitfoundation]
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-x86.exe -r win-x86 --framework net8.0.1-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 net8.0.2-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle 'AdminPanel'
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2

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

diff --git a/.github/workflows/nuget.org.yml b/.github/workflows/nuget.org.yml
@@ -33,6 +33,17 @@ jobs:
       with:
         node-version: 18
 
+    - name: Delete AssemblyOriginatorKeyFile.snk
+      run: |
+        rm src/AssemblyOriginatorKeyFile.snk
+
+    - name: Extract strong sign certificate from env
+      uses: timheuer/base64-to-file@v1
+      with:
+          fileDir: './src/'
+          fileName: 'AssemblyOriginatorKeyFile.snk'
+          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
     - name: dotnet build BlazorUI

diff --git a/.github/workflows/prerelease.nuget.org.yml b/.github/workflows/prerelease.nuget.org.yml
@@ -23,6 +23,17 @@ jobs:
       with:
         node-version: 18
 
+    - name: Delete AssemblyOriginatorKeyFile.snk
+      run: |
+        rm src/AssemblyOriginatorKeyFile.snk
+
+    - name: Extract strong sign certificate from env
+      uses: timheuer/base64-to-file@v1
+      with:
+          fileDir: './src/'
+          fileName: 'AssemblyOriginatorKeyFile.snk'
+          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
     - name: dotnet build BlazorUI

diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml
@@ -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-x86.exe -r win-x86 --framework net8.0.1-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 net8.0.2-x86-desktop,webview2 --icon .\wwwroot\favicon.ico --packTitle TodoSample
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2
@@ -236,6 +236,26 @@ jobs:
     - name: Install Android Sdk platform tools
       run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
 
+    - name: Delete App Icon
+      run: rm TodoSample/src/Client/TodoSample.Client.Maui/Resources/AppIcon/appicon.svg
+
+    - name: Extract App Icon from env
+      uses: timheuer/base64-to-file@v1
+      with:
+          fileDir: './TodoSample/src/Client/TodoSample.Client.Maui/Resources/AppIcon/'
+          fileName: 'appicon.svg'
+          encodedString: ${{ vars.TODO_ICON }}
+
+    - name: Delete App Splash Screen
+      run: rm TodoSample/src/Client/TodoSample.Client.Maui/Resources/Splash/splash.svg
+
+    - name: Extract App Splash Screen from env
+      uses: timheuer/base64-to-file@v1
+      with:
+          fileDir: './TodoSample/src/Client/TodoSample.Client.Maui/Resources/Splash/'
+          fileName: 'splash.svg'
+          encodedString: ${{ vars.TODO_SPLASH_SCREEN }}
+
     - name: Generate CSS/JS files
       run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
@@ -341,4 +361,4 @@ jobs:
       uses: actions/upload-artifact@v2
       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/net8.0-ios/ios-arm64/publish/*.ipa
diff --git 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.101)](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+- [.NET 8 SDK (8.0.201)](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
 - [Node.js](https://nodejs.org)
 
 <br/>

diff --git a/src/AssemblyOriginatorKeyFile.snk b/src/AssemblyOriginatorKeyFile.snk
diff --git a/src/Besql/Bit.Besql/Bit.Besql.csproj b/src/Besql/Bit.Besql/Bit.Besql.csproj
@@ -6,6 +6,8 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\AssemblyOriginatorKeyFile.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
 

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
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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 @@
 
     <ItemGroup>
         <ProjectReference Include="..\Bit.Besql.Demo.Client\Bit.Besql.Demo.Client.csproj" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
     </ItemGroup>
 
     <ItemGroup>
@@ -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. -->
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.1">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

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.5</ReleaseVersion>
+		<ReleaseVersion>8.7.6</ReleaseVersion>
 
 		<PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
 		<PackageVersion>$(ReleaseVersion)</PackageVersion>

diff --git a/src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj b/src/BlazorUI/Bit.BlazorUI.Assets/Bit.BlazorUI.Assets.csproj
@@ -10,6 +10,8 @@
             BeforeBuildTasks;
             $(ResolveStaticWebAssetsInputsDependsOn)
         </ResolveStaticWebAssetsInputsDependsOn>
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\AssemblyOriginatorKeyFile.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj b/src/BlazorUI/Bit.BlazorUI.Extras/Bit.BlazorUI.Extras.csproj
@@ -12,6 +12,8 @@
             BeforeBuildTasks;
             $(ResolveStaticWebAssetsInputsDependsOn)
         </ResolveStaticWebAssetsInputsDependsOn>
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\AssemblyOriginatorKeyFile.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
     <ItemGroup>
@@ -36,11 +38,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Content Update="tsconfig.json">
-            <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-            <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-        </Content>
+        <Content Remove="tsconfig.json" />
+        <None Include="tsconfig.json" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.scss b/src/BlazorUI/Bit.BlazorUI.Extras/Components/DataGrid/BitDataGrid.scss
@@ -13,8 +13,8 @@
     .col-header-content {
         /* We want the th elements to be display:flex, but they also have to be display:table-cell to avoid breaking the layout.
        So .col-header-content is an immediate child with display:flex. */
-        position: relative;
         display: flex;
+        position: relative;
         align-items: center;
     }
     /* Deep to make it easy for people adding a sort-indicator element in a custom HeaderTemplate */
@@ -29,52 +29,57 @@
     .col-sort-asc .sort-indicator:before,
     .col-sort-desc .sort-indicator:before {
         //background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M 2 3.25 L 12 20.75 L 22 3.25 L 12 10 z" /></svg>');
-        display: inline-block;
-        font-family: 'Fabric MDL2 bit BlazorUI' !important;
+        content: "\E96E";
         font-style: normal;
         font-weight: normal;
-        content: "\E96E";
+        display: inline-block;
+        font-family: 'Fabric MDL2 bit BlazorUI' !important;
     }
 
     .col-sort-desc .sort-indicator {
         transform: scaleY(-1) translateY(2px);
     }
     /* Deep to make it easy for people adding a col-options-button element in a custom HeaderTemplate */
     th .col-options-button {
-        border: none;
-        padding: 0; /* So that even if the text on the button is wide, it gets properly centered */
-        width: 1rem;
-        align-self: stretch;
-        background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="1.5 0 21 24" stroke="currentColor" stroke-width="2"><path d="M4 6h16M4 12h16M4 18h16" /></svg>') center center / 1rem no-repeat;
+        background: unset;
+    }
+
+    th .col-options-button:before {
+        content: "\E712";
+        font-style: normal;
+        font-weight: normal;
+        display: inline-block;
+        font-family: 'Fabric MDL2 bit BlazorUI' !important;
     }
 
     .col-options {
-        position: absolute;
-        background: white;
-        border: 1px solid silver;
         left: 0;
-        padding: 1rem;
         z-index: 1;
+        padding: 1rem;
+        border: 1px solid;
+        position: absolute;
+        border-color: var(--bit-clr-brd-primary);
+        background-color: var(--bit-clr-bg-secondary);
     }
 
     .col-justify-end .col-options {
-        left: unset;
         right: 0;
+        left: unset;
     }
 
     .col-width-draghandle {
-        position: absolute;
         top: 0;
         bottom: 0;
         right: 0rem;
         cursor: ew-resize;
+        position: absolute;
     }
 
     .col-width-draghandle:after {
-        content: ' ';
-        position: absolute;
         top: 0;
         bottom: 0;
+        content: ' ';
+        position: absolute;
         border-left: 1px solid black;
     }
 
@@ -103,17 +108,17 @@
     /*==================================================================*/
     /* Contains the title text and sort indicator, and expands to fill as much of the col width as it can */
     .col-title {
+        padding: 0;
+        flex-grow: 1;
         display: flex; /* So that we can make col-title-text expand as much as possible, and still hide overflow with ellipsis */
         min-width: 0px;
-        flex-grow: 1;
-        padding: 0;
     }
     /* If the column is sortable, its title is rendered as a button element for accessibility and to support navigation by tab */
     button.col-title {
         border: none;
+        cursor: pointer;
         background: none;
         position: relative;
-        cursor: pointer;
     }
 
     .col-justify-center .col-title {
@@ -125,9 +130,9 @@
     }
     /* We put the column title text in its own element primarily so that it can use text-overflow: ellipsis */
     .col-title-text {
-        text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
+        text-overflow: ellipsis;
     }
     /*========================================================*/
     /*default theme*/
@@ -169,49 +174,20 @@
         width: 1.5rem;
     }
 
-    button.col-title:hover,
-    .col-options-button:hover {
-        background-color: rgba(128, 128, 128, 0.2);
-    }
-
-    button.col-title:active,
-    .col-options-button:active {
-        background-color: rgba(128, 128, 128, 0.5);
-    }
-
     > thead .col-width-draghandle {
         width: 1rem;
         right: calc(var(--col-gap)/2 - 0.5rem);
     }
 
-    > thead .col-width-draghandle:hover {
-        background: rgba(128, 128, 128, 0.2);
-    }
-
-    > thead .col-width-draghandle:active {
-        background: rgba(128, 128, 128, 0.4);
-    }
-
-    > thead .col-width-draghandle:hover:after,
-    > thead .col-width-draghandle:active:after {
-        border-color: black;
-    }
-
     > thead .col-width-draghandle:after {
-        border-color: #ccc;
-        left: 0.5rem;
         top: 5px;
         bottom: 5px;
-    }
-
-    .col-options {
-        box-shadow: 0 3px 8px 1px #aaa;
-        border-color: #ddd;
-        border-radius: 0.3rem;
+        left: 0.5rem;
+        border-color: var(--bit-clr-brd-primary);
     }
 
     > tbody > tr > td.grid-cell-placeholder:after {
-        content: '\2026';
         opacity: 0.75;
+        content: '\2026';
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# These are supported funding model platforms
		github: [bitfoundation]