Merge pull request #4238 from bitfoundation/develop

Version 4.9.9 (#4237)

Author: msynk

.github/workflows/adminpanel.cd.yml

@@ -5,7 +5,7 @@ name: AdminPanel CD
 env:
   WEB_APP_DEPLOYMENT_TYPE: 'DefaultDeploymentType'
   API_SERVER_ADDRESS: 'https://adminpanel.bitplatform.dev/api/'
-  APP_SERVICE_NAME: 'app-service-ad-test'
+  APP_SERVICE_NAME: 'bit-adminpanel'
 
 on:
   workflow_dispatch:
@@ -29,10 +29,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/src/global.json
-
-    - name: Install wasm-tools
-      run: dotnet workload install wasm-tools
+        global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/global.json
 
     - 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
@@ -45,7 +42,7 @@ jobs:
       with:
         files: 'src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Shared/appsettings.json'
       env:
-        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
+        ApiServerAddress: 'api/'
 
     - 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 -p:MultilingualEnabled=true
@@ -106,15 +103,15 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/src/global.json
+        global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/global.json
 
     - name: Update appsettings.json api server address
       uses: microsoft/variable-substitution@v1 
       with:
         files: 'src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Shared/appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-  
+
     - name: Install Maui
       run: dotnet workload install maui
 
@@ -145,7 +142,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/src/global.json
+        global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/global.json
 
     - name: Extract Android signing key from env
       uses: timheuer/base64-to-file@v1
@@ -160,7 +157,7 @@ jobs:
         files: 'src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Shared/appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-  
+
     - name: Install Maui
       run: dotnet workload install maui
 
@@ -194,15 +191,18 @@ jobs:
      - name: Setup .NET
        uses: actions/setup-dotnet@v3
        with:
-         global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/src/global.json
+         global-json-file: src/Templates/AdminPanel/Bit.AdminPanel/global.json
 
      - name: Update appsettings.json api server address
        uses: microsoft/variable-substitution@v1 
        with:
          files: 'src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Shared/appsettings.json'
        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
 

.github/workflows/bit.ci.yml

@@ -24,8 +24,11 @@ jobs:
         dotnet-version: 7.0.x
         include-prerelease: true
 
-    - name: Install wasm-tools
-      run: dotnet workload install wasm-tools
+    - name: Setup .NET 8.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.x
+        include-prerelease: true
 
     - name: Restore prerelease
       run: dotnet restore src/Bit-CI-release.sln
@@ -54,9 +57,12 @@ jobs:
       with:
         dotnet-version: 7.0.x
         include-prerelease: true
-    
-    - name: Install wasm-tools
-      run: dotnet workload install wasm-tools
+        
+    - name: Setup .NET 8.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.x
+        include-prerelease: true
 
     - name: Restore
       run: dotnet restore src/Bit-CI.sln

.github/workflows/blazorui.demo.website.cd.yml

@@ -0,0 +1,173 @@
+name: Blazor UI Demo CD
+
+# Project templates come equipped with CI/CD for both Azure DevOps and GitHub, providing you with a hassle-free way to get started with your new project. It is important to note that you should not depend on the contents of this file. More info at https://bitplatform.dev/admin-panel/dev-ops
+
+env:
+  WEB_APP_DEPLOYMENT_TYPE: 'SSR'
+  API_SERVER_ADDRESS: 'https://components.bitplatform.dev/api/'
+  APP_SERVICE_NAME: 'bit-components'
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+
+  build_blazor_api_wasm:
+    name: build blazor api + web assembly
+    runs-on: windows-latest
+
+    steps:
+    
+    - name: Checkout source code
+      uses: actions/checkout@v3
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: src/BlazorUI/Demo/global.json
+
+    - name: Switch to blazor web assembly
+      run:  sed -i 's/Microsoft.NET.Sdk.Web/Microsoft.NET.Sdk.BlazorWebAssembly/g' src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj
+
+    - name: Switch to blazor web assembly
+      shell: pwsh
+      run: (Get-Content src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj) -replace 'Microsoft.NET.Sdk.Web', 'Microsoft.NET.Sdk.BlazorWebAssembly' | Set-Content src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj
+
+    - name: Restore workloads
+      run: dotnet workload restore src/BlazorUI/Demo/Client/Web/Bit.BlazorUI.Demo.Client.Web.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}"
+
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/BlazorUI/Demo/Client/Shared/appsettings.json'
+      env:
+        ApiServerAddress: 'api/'
+      
+    - name: Build (To generate CSS/JS files)
+      run: dotnet build src/BlazorUI/Demo/Server/Api/Bit.BlazorUI.Demo.Server.Api.csproj -m:1 -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release
+
+    - name: Publish
+      run: dotnet publish src/BlazorUI/Demo/Server/Api/Bit.BlazorUI.Demo.Server.Api.csproj -m:1 -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release --self-contained -r linux-x64 -o api-web
+
+    - name: Upload api-web artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: api-web-bundle
+        path: api-web
+
+  deploy_blazor_api_wasm:
+    name: deploy blazor api + web assembly
+    needs: build_blazor_api_wasm
+    runs-on: ubuntu-latest
+    environment:
+      name: 'production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+
+      - name: Retrieve api-web bundle
+        uses: actions/download-artifact@v2
+        with:
+          name: api-web-bundle
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ env.APP_SERVICE_NAME }}
+          slot-name: 'production'
+          publish-profile: ${{ secrets.COMPONENTS_AZURE_APP_SERVICE_PUBLISH_PROFILE }}
+          package: .
+
+  build_blazor_hybrid_windows:
+    name: build blazor hybrid (windows)
+    runs-on: windows-latest
+  
+    steps:
+     
+    - name: Checkout source code
+      uses: actions/checkout@v3
+     
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: src/BlazorUI/Demo/global.json
+  
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/BlazorUI/Demo/Client/Shared/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
+
+    - name: Install Maui
+      run: dotnet workload install maui
+
+    - name: Restore workloads
+      run: dotnet workload restore src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-windows10.0.19041.0
+  
+    - name: Build (To generate CSS/JS files)
+      run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -m:1 -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: Build exe
+      run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -m:1 -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
+  
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: win-exe-bundle
+        path: src/BlazorUI/Demo/Client/App/bin/release/net7.0-windows10.0.19041.0/win10-x86
+  
+  build_blazor_hybrid_android:
+    name: build blazor hybrid (android)
+    runs-on: windows-latest
+  
+    steps:
+     
+    - name: Checkout source code
+      uses: actions/checkout@v3
+     
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: src/BlazorUI/Demo/global.json
+  
+    - name: Extract Android signing key from env
+      uses: timheuer/base64-to-file@v1
+      with:
+          fileDir: './src/BlazorUI/Demo/Client/App/'
+          fileName: 'BitBlazorUIDemo.keystore'
+          encodedString: ${{ secrets.ANDROID_RELEASE_KEYSTORE_FILE_BASE64 }}
+  
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/BlazorUI/Demo/Client/Shared/appsettings.json'
+      env:
+        ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
+
+    - name: Install Maui
+      run: dotnet workload install maui
+
+    - name: Restore workloads
+      run: dotnet workload restore src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -p:BlazorMode=BlazorHybrid -f net7.0-android
+  
+    - name: Build (To generate CSS/JS files)
+      run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -m:1 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -p:RunAOTCompilation=false -f net7.0-android
+  
+    - name: Build aab
+      run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -m:1 -p:BlazorMode=BlazorHybrid -p:Configuration=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 }}" -f net7.0-android
+  
+    - name: Build apk
+      run: dotnet build src/BlazorUI/Demo/Client/App/Bit.BlazorUI.Demo.Client.App.csproj -m:1 -p:BlazorMode=BlazorHybrid -p:Configuration=Release -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 }}" -f net7.0-android
+  
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: android-bundle
+        path: src/BlazorUI/Demo/Client/App/bin/release/net7.0-android/*-Signed.*

.github/workflows/nuget.org.yml

@@ -26,12 +26,18 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.x
-        
+
     - name: Setup .NET 7.0.x
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 7.0.x
         include-prerelease: true
+        
+    - name: Setup .NET 8.0.x
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.x
+        include-prerelease: true
 
     - name: dotnet restore BlazorUI
       run: dotnet restore src/BlazorUI/Bit.BlazorUI/Bit.BlazorUI.csproj

.github/workflows/platform.website.cd.yml

@@ -0,0 +1,79 @@
+name: Platform Website CD
+
+env:
+  WEB_APP_DEPLOYMENT_TYPE: 'SSR'
+  APP_SERVICE_NAME: 'bitplatform'
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+
+  build_blazor_api_wasm:
+    name: build blazor api + web assembly
+    runs-on: windows-latest
+
+    steps:
+    
+    - name: Checkout source code
+      uses: actions/checkout@v3
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        global-json-file: src/Websites/Platform/global.json
+
+    - name: Switch to blazor web assembly
+      shell: pwsh
+      run: (Get-Content src/Websites/Platform/Bit.Websites.Platform/Web/Bit.Websites.Platform.Web.csproj) -replace 'Microsoft.NET.Sdk.Web', 'Microsoft.NET.Sdk.BlazorWebAssembly' | Set-Content src/Websites/Platform/Bit.Websites.Platform/Web/Bit.Websites.Platform.Web.csproj
+
+    - name: Restore workloads
+      run: dotnet workload restore src/Websites/Platform/Bit.Websites.Platform/Web/Bit.Websites.Platform.Web.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}"
+
+    - name: Update appsettings.json api server address
+      uses: microsoft/variable-substitution@v1 
+      with:
+        files: 'src/Websites/Platform/Bit.Websites.Platform/Web/appsettings.json'
+      env:
+        ApiServerAddress: 'api/'
+      
+    - name: Build (To generate CSS/JS files)
+      run: dotnet build src/Websites/Platform/Bit.Websites.Platform/Api/Bit.Websites.Platform.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release
+
+    - name: Publish
+      run: dotnet publish src/Websites/Platform/Bit.Websites.Platform/Api/Bit.Websites.Platform.Api.csproj -p:BlazorMode=BlazorWebAssembly -p:WebAppDeploymentType="${{ env.WEB_APP_DEPLOYMENT_TYPE }}" -p:Configuration=Release --self-contained -r linux-x64 -o api-web
+
+    - name: Upload api-web artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: api-web-bundle
+        path: api-web
+
+  deploy_blazor_api_wasm:
+    name: deploy blazor api + web assembly
+    needs: build_blazor_api_wasm
+    runs-on: ubuntu-latest
+    environment:
+      name: 'production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+
+      - name: Retrieve api-web bundle
+        uses: actions/download-artifact@v2
+        with:
+          name: api-web-bundle
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ env.APP_SERVICE_NAME }}
+          slot-name: 'production'
+          publish-profile: ${{ secrets.BITPLATFORM_AZURE_APP_SERVICE_PUBLISH_PROFILE }}
+          package: .