Merge pull request #6696 from bitfoundation/develop

Version 8.7.3 (#6692)
bitfoundation · Jan 23, 2024 · 19fff18 · 19fff18
2 parents 92f0117 + cb57b6f
commit 19fff18
Show file tree

Hide file tree

Showing 189 changed files with 7,801 additions and 2,483 deletions.
diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml
@@ -17,7 +17,7 @@ permissions:
 jobs:
 
   build_api_blazor:
-    name: build api + blazor
+    name: build api + blazor web
     runs-on: ubuntu-22.04
 
     steps:
@@ -121,44 +121,57 @@ jobs:
 
     - name: Checkout source code
       uses: actions/checkout@v3
-     
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
+        global-json-file: src\Templates\Boilerplate\Bit.Boilerplate\global.json
 
-    - name: Create project from Boilerplate
-      run: |
-       cd src/Templates/Boilerplate && dotnet build -c Release
-       dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
-       dotnet new install Bit.Boilerplate.0.0.0.nupkg
-       cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin
-  
     - uses: actions/setup-node@v3
       with:
         node-version: 18
 
+    - name: Create project from Boilerplate
+      run: |
+        cd src\Templates\Boilerplate && dotnet build -c Release
+        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
+        dotnet new install Bit.Boilerplate.0.0.0.nupkg
+        cd ..\..\..\ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin --windows
+  
     - name: Update appsettings.json api server address
       uses: microsoft/variable-substitution@v1 
       with:
-        files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
+        files: 'AdminPanel\src\Client\AdminPanel.Client.Core\appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-
-    - name: Install maui
-      run: cd src && dotnet workload install maui
+        WindowsUpdateSettings.FilesUrl: https://windows-adminpanel.bitplatform.dev
 
     - name: Generate CSS/JS files
-      run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
-
-    - name: Build exe
-      run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:WindowsPackageType=None -p:SelfContained=true -p:WindowsAppSDKSelfContained=true -p:GenerateAppxPackageOnBuild=false -p:RuntimeIdentifier=win10-x86 -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -p:UseRidGraph=true -f net8.0-windows10.0.19041.0
+      run: dotnet build AdminPanel\src\Client\AdminPanel.Client.Core\AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+
+    - name: Publish
+      run: |
+          cd AdminPanel\src\Client\AdminPanel.Client.Windows\
+          dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish-arm64 -r win-arm64
+          ren .\bin\publish-arm64\AdminPanel.Client.Windows.exe AdminPanel.Client.Windows-arm64.exe
+          dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish-x86 -r win-x86
+          ren .\bin\publish-x86\AdminPanel.Client.Windows.exe AdminPanel.Client.Windows-x86.exe
+          dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish-x64 -r win-x64
+          ren .\bin\publish-x64\AdminPanel.Client.Windows.exe AdminPanel.Client.Windows-x64.exe
+          dotnet publish AdminPanel.Client.Windows.csproj -c Release -o .\bin\publish
+          del .\bin\publish\AdminPanel.Client.Windows.exe
+          echo D | xcopy .\bin\publish-arm64 .\publish-result /s /e /h
+          echo A | xcopy .\bin\publish-x86 .\publish-result /s /e /h
+          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'
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: win-exe-bundle
-        path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/release/net8.0-windows10.0.19041.0/win10-x86
+        path: AdminPanel\src\Client\AdminPanel.Client.Windows\Releases
 
   build_blazor_hybrid_android:
     name: build blazor hybrid (android)
@@ -220,55 +233,8 @@ jobs:
         name: android-bundle
         path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/Release/net8.0-android/*-Signed.*
 
-  build_blazor_hybrid_maccatalyst:
-     name: build blazor hybrid (maccatalyst)
-     runs-on: macos-13
-
-     steps:
-
-     - name: Checkout source code
-       uses: actions/checkout@v3
-
-     - name: Setup .NET
-       uses: actions/setup-dotnet@v3
-       with:
-         global-json-file: src/Templates/Boilerplate/Bit.Boilerplate/global.json
-
-     - uses: actions/setup-node@v3
-       with:
-        node-version: 18
-
-     - name: Create project from Boilerplate
-       run: |
-        cd src/Templates/Boilerplate && dotnet build -c Release
-        dotnet pack -c Release -o . -p:ReleaseVersion=0.0.0 -p:PackageVersion=0.0.0
-        dotnet new install Bit.Boilerplate.0.0.0.nupkg
-        cd ../../../ && dotnet new bit-bp --name AdminPanel --database SqlServer --sample Admin
-   
-     - name: Update appsettings.json api server address
-       uses: microsoft/variable-substitution@v1 
-       with:
-         files: 'AdminPanel/src/Client/AdminPanel.Client.Core/appsettings.json'
-       env:
-         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-
-     - name: Install maui
-       run: cd src && dotnet workload install maui
-
-     - name: Generate CSS/JS files
-       run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
-
-     - name: Build pkg
-       run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -c Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:ApplicationTitle="AdminPanel" -p:ApplicationId="com.bitplatform.AdminPanel.Template" -f net8.0-maccatalyst
-
-     - name: Upload artifact
-       uses: actions/upload-artifact@v2
-       with:
-         name: mac-pkg-bundle
-         path: AdminPanel/src/Client/AdminPanel.Client.Maui/bin/release/net8.0-maccatalyst/*.pkg
-
   build_blazor_hybrid_ios:
-    name: build blazor hybrid (ios)
+    name: build blazor hybrid (iOS-macOS)
     runs-on: macos-13
 
     steps:

diff --git a/.github/workflows/bit.ci.yml b/.github/workflows/bit.ci.yml
@@ -59,7 +59,7 @@ jobs:
       run: ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools"
 
     - name: Build
-      run: dotnet build src/Bit-CI.sln -p:WarningLevel=0 -p:RunCodeAnalysis=false
+      run: dotnet build src/Bit-CI.sln -p:WarningLevel=0 -p:RunCodeAnalysis=false -p:EnableWindowsTargeting=true
 
     - name: Test
       run: dotnet test --no-build --verbosity normal src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
diff --git a/.github/workflows/bit.full.ci.yml b/.github/workflows/bit.full.ci.yml
@@ -65,7 +65,7 @@ jobs:
       run: dotnet test src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj -c Release
 
     - name: Release build bit blazor ui demo
-      run: dotnet build src/BlazorUI/Bit.BlazorUI.sln -c Release -p:RunAOTCompilation=false
+      run: dotnet build src/BlazorUI/Bit.BlazorUI.sln -c Release -p:RunAOTCompilation=false -p:EnableWindowsTargeting=true
 
     - name: Create projects from BlazorEmpty project template with different parameters
       run: |

diff --git a/.github/workflows/blazorui.demo.cd.yml b/.github/workflows/blazorui.demo.cd.yml
@@ -15,7 +15,7 @@ permissions:
 jobs:
 
   build_api_blazor:
-    name: build api + blazor
+    name: build api + blazor web
     runs-on: ubuntu-22.04
 
     steps:
@@ -95,37 +95,50 @@ jobs:
 
     - name: Checkout source code
       uses: actions/checkout@v3
-     
+
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        global-json-file: src/global.json
-  
+        global-json-file: src\global.json
+
     - uses: actions/setup-node@v3
       with:
         node-version: 18
-
+  
     - name: Update appsettings.json api server address
       uses: microsoft/variable-substitution@v1 
       with:
-        files: 'src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/appsettings.json'
+        files: 'src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Core\appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-
-    - name: Install maui
-      run: cd src && dotnet workload install maui
+        WindowsUpdateSettings.FilesUrl: https://windows-components.bitplatform.dev
 
     - name: Generate CSS/JS files
-      run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -c Release
-
-    - name: Build exe
-      run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -c Release -p:WindowsPackageType=None -p:SelfContained=true -p:WindowsAppSDKSelfContained=true -p:GenerateAppxPackageOnBuild=false -p:RuntimeIdentifier=win10-x86 -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -p:UseRidGraph=true -f net8.0-windows10.0.19041.0
+      run: dotnet build src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Core\Bit.BlazorUI.Demo.Client.Core.csproj -c Release
+
+    - name: Publish
+      run: |
+          cd src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Windows\
+          dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish-arm64 -r win-arm64
+          ren .\bin\publish-arm64\Bit.BlazorUI.Demo.Client.Windows.exe Bit.BlazorUI.Demo.Client.Windows-arm64.exe
+          dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish-x86 -r win-x86
+          ren .\bin\publish-x86\Bit.BlazorUI.Demo.Client.Windows.exe Bit.BlazorUI.Demo.Client.Windows-x86.exe
+          dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish-x64 -r win-x64
+          ren .\bin\publish-x64\Bit.BlazorUI.Demo.Client.Windows.exe Bit.BlazorUI.Demo.Client.Windows-x64.exe
+          dotnet publish Bit.BlazorUI.Demo.Client.Windows.csproj -c Release -o .\bin\publish
+          del .\bin\publish\Bit.BlazorUI.Demo.Client.Windows.exe
+          echo D | xcopy .\bin\publish-arm64 .\publish-result /s /e /h
+          echo A | xcopy .\bin\publish-x86 .\publish-result /s /e /h
+          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'
   
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: win-exe-bundle
-        path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/release/net8.0-windows10.0.19041.0/win10-x86
+        path: src\BlazorUI\Demo\Client\Bit.BlazorUI.Demo.Client.Windows\Releases
 
   build_blazor_hybrid_android:
     name: build blazor hybrid (android)
@@ -176,49 +189,9 @@ jobs:
       with:
         name: android-bundle
         path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/Release/net8.0-android/*-Signed.*
-
-  build_blazor_hybrid_maccatalyst:
-     name: build blazor hybrid (maccatalyst)
-     runs-on: macos-13
-
-     steps:
-
-     - name: Checkout source code
-       uses: actions/checkout@v3
-
-     - name: Setup .NET
-       uses: actions/setup-dotnet@v3
-       with:
-         global-json-file: src/global.json
-
-     - uses: actions/setup-node@v3
-       with:
-        node-version: 18
-
-     - name: Update appsettings.json api server address
-       uses: microsoft/variable-substitution@v1 
-       with:
-         files: 'src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/appsettings.json'
-       env:
-         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-
-     - name: Install maui
-       run: cd src && dotnet workload install maui
-
-     - name: Generate CSS/JS files
-       run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Core/Bit.BlazorUI.Demo.Client.Core.csproj -c Release
-
-     - name: Build pkg
-       run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -c Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-maccatalyst
-
-     - name: Upload artifact
-       uses: actions/upload-artifact@v2
-       with:
-         name: mac-pkg-bundle
-         path: src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/bin/release/net8.0-maccatalyst/*.pkg
-
+
   build_blazor_hybrid_ios:
-    name: build blazor hybrid (ios)
+    name: build blazor hybrid (iOS-macOS)
     runs-on: macos-13
 
     steps:

diff --git a/.github/workflows/platform.website.cd.yml b/.github/workflows/platform.website.cd.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
 
   build_api_blazor:
-    name: build api + blazor
+    name: build api + blazor web
     runs-on: ubuntu-22.04
 
     steps:

diff --git a/.github/workflows/sales.website.cd.yml b/.github/workflows/sales.website.cd.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
 
   build_api_blazor:
-    name: build api + blazor
+    name: build api + blazor web
     runs-on: ubuntu-22.04
 
     steps: