Merge pull request #5500 from bitfoundation/develop

Version 6.0.0 (#5498)
bitfoundation · Oct 9, 2023 · 4d83b9a · 4d83b9a
2 parents 511c224 + dc85e29
commit 4d83b9a
Show file tree

Hide file tree

Showing 591 changed files with 7,871 additions and 3,325 deletions.
diff --git a/.github/workflows/adminpanel.cd.yml b/.github/workflows/adminpanel.cd.yml
@@ -38,13 +38,11 @@ jobs:
     - name: Switch to blazor web assembly
       run:  sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj
 
-    - name: Restore workloads
-      run: >
-        dotnet workload install wasm-experimental &&
-        dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}"
+    - name: Install wasm
+      run:  dotnet workload install wasm-tools wasm-experimental --sdk-version=8.0.100-rc.1.23463.5
 
-    - name: Build (To generate CSS/JS files)
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Server/Api/AdminPanel.Server.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release
+    - name: Generate CSS/JS files
+      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Publish
       run: dotnet publish src/Templates/AdminPanel/Bit.AdminPanel/src/Server/Api/AdminPanel.Server.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release --self-contained -r linux-x64 -o ${{env.DOTNET_ROOT}}/api-web
@@ -115,27 +113,24 @@ jobs:
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
-    - name: Install Maui
-      run: dotnet workload install maui
-
-    - name: Restore workloads
-      run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-windows10.0.19041.0
+    - name: Install maui
+      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
 
-    - name: Build (To generate CSS/JS files)
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:WindowsPackageType=None -p:SelfContained=true -p:WindowsAppSDKSelfContained=true -p:GenerateAppxPackageOnBuild=false -p:RuntimeIdentifier=win10-x86 -f net7.0-windows10.0.19041.0
+    - name: Generate CSS/JS files
+      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Build exe
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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 }}" -f net7.0-windows10.0.19041.0
+      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: win-exe-bundle
-        path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net7.0-windows10.0.19041.0/win10-x86
+        path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net8.0-windows10.0.19041.0/win10-x86
 
   build_blazor_hybrid_android:
     name: build blazor hybrid (android)
-    runs-on: windows-2022
+    runs-on: ubuntu-22.04
 
     steps:
 
@@ -165,30 +160,24 @@ jobs:
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
-    - name: Install Maui
-      run: dotnet workload install maui
-
-    - name: Restore workloads
-      run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-android
+    - name: Install maui
+      run: dotnet workload install maui-android --sdk-version=8.0.100-rc.1.23463.5
 
-    - name: Build (To generate CSS/JS files)
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:RunAOTCompilation=false -f net7.0-android
+    - name: Generate CSS/JS files
+      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Build aab
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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 }}" -f net7.0-android
-
-    - name: Build apk
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -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 }}" -f net7.0-android
+      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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 }}" -f net8.0-android
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: android-bundle
-        path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net7.0-android/*-Signed.*
+        path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/Release/net8.0-android/*-Signed.*
 
   build_blazor_hybrid_maccatalyst:
      name: build blazor hybrid (maccatalyst)
-     runs-on: macos-12
+     runs-on: macos-13
 
      steps:
 
@@ -211,27 +200,24 @@ jobs:
        env:
          ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
-     - name: Install Maui
-       run: dotnet workload install maui
-
-     - name: Restore workloads
-       run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-maccatalyst
+     - name: Install maui
+       run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
 
-     - name: Build (To generate CSS/JS files)
-       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net7.0-maccatalyst
+     - name: Generate CSS/JS files
+       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
      - name: Build pkg
-       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:CreatePackage=true -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net7.0-maccatalyst
+       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -p:Configuration=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/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net7.0-maccatalyst/*.pkg
+         path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net8.0-maccatalyst/*.pkg
 
   build_blazor_hybrid_ios:
     name: build blazor hybrid (ios)
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
 
@@ -254,11 +240,8 @@ jobs:
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
-    - name: Install Maui
-      run: dotnet workload install maui
-
-    - name: Restore workloads
-      run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-ios
+    - name: Install maui
+      run: dotnet workload install maui --sdk-version=8.0.100-rc.1.23463.5
 
     - name: Extract iOS code signing certificate from env
       uses: timheuer/base64-to-file@v1
@@ -281,17 +264,17 @@ jobs:
         api-key-id: ${{ secrets.APPSTORE_API_KEY_ID }}
         api-private-key: ${{ secrets.APPSTORE_API_KEY_PRIVATE_KEY }}
 
-    - name: Build (To generate CSS/JS files)
-      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -m:1 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -f net7.0-ios
+    - name: Generate CSS/JS files
+      run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
 
     - name: Build ipa
-      run: dotnet publish src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -m:1 -p:RuntimeIdentifier=ios-arm64 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="AdminPanel" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net7.0-ios
+      run: dotnet publish src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj -p:RuntimeIdentifier=ios-arm64 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:ArchiveOnBuild=true -p:CodesignKey="iPhone Distribution" -p:CodesignProvision="AdminPanel" -p:ApplicationDisplayVersion="${{ vars.APPLICATION_DISPLAY_VERSION }}" -p:ApplicationVersion="${{ vars.APPLICATION_VERSION }}" -f net8.0-ios
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
         name: ios-bundle
-        path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net7.0-ios/ios-arm64/publish/*.ipa
+        path: src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/bin/release/net8.0-ios/ios-arm64/publish/*.ipa
 
   build_blazor_electron_linux:
      name: build blazor electron (linux)
@@ -326,11 +309,11 @@ jobs:
      - name: Switch to BlazorElectron
        run: awk '/<BlazorMode>/{sub(">.*</", ">BlazorElectron</")}1' src/Templates/AdminPanel/Bit.AdminPanel/src/Directory.Build.props > temp.xml && mv temp.xml src/Templates/AdminPanel/Bit.AdminPanel/src/Directory.Build.props
 
-     - name: Restore workloads
-       run: dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj
-   
-     - name: Build (To generate CSS/JS files)
-       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj -p:Configuration=Release
+     - name: Generate CSS/JS files
+       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore
+
+     - name: Restore electron .net
+       run: dotnet build src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/AdminPanel.Client.Web.csproj -t:BeforeBuildTasks
 
      - name: Build app image
        run: cd src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Web/ && dotnet electronize build /target linux

diff --git a/.github/workflows/bit.ci.yml b/.github/workflows/bit.ci.yml
@@ -24,14 +24,11 @@ jobs:
       with:
         node-version: 18
 
-    - name: Restore workloads prerelease
-      run: dotnet workload restore src/Bit-CI-release.sln && dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj
-
-    - name: Restore nuget packages prerelease
-      run: dotnet restore src/Bit-CI-release.sln
+    - name: Install wasm and maui
+      run:  dotnet workload install maui-android wasm-tools wasm-experimental --sdk-version=8.0.100-rc.1.23463.5
 
     - name: MSBuild prerelease
-      run: dotnet msbuild src/Bit-CI-release.sln -m:1
+      run: dotnet build src/Bit-CI-release.sln
 
     - name: Test
       run: dotnet test --no-build --verbosity normal src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj
@@ -46,28 +43,20 @@ jobs:
     - name: Checkout source code
       uses: actions/checkout@v2
 
-    - name: Setup .NET 7
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
         global-json-file: src/global.json
 
-    - name: Setup .NET 8
-      uses: actions/setup-dotnet@v3
-      with:
-        global-json-file: src/Websites/Platform/global.json
-
     - uses: actions/setup-node@v3
       with:
         node-version: 18
 
-    - name: Restore workloads
-      run: dotnet workload restore src/Bit-CI.sln && dotnet workload restore src/Templates/AdminPanel/Bit.AdminPanel/src/Client/App/AdminPanel.Client.App.csproj
-
-    - name: Restore nuget packages
-      run: dotnet workload restore src/Bit-CI.sln && dotnet restore src/Bit-CI.sln /p:WarningLevel=0 /p:RunCodeAnalysis=false
+    - name: Install wasm and maui
+      run:  dotnet workload install maui-android wasm-tools wasm-experimental --sdk-version=8.0.100-rc.1.23463.5
 
-    - name: MSBuild
-      run: dotnet msbuild src/Bit-CI.sln -m:1 /p:WarningLevel=0 /p:RunCodeAnalysis=false
+    - name: Build
+      run: dotnet build src/Bit-CI.sln -p:WarningLevel=0 -p:RunCodeAnalysis=false
 
     - name: Test
       run: dotnet test --no-build --verbosity normal src/BlazorUI/Bit.BlazorUI.Tests/Bit.BlazorUI.Tests.csproj