fix

bitfoundation · Jan 9, 2024 · 85a5ff6 · 85a5ff6
1 parent 5160c4b
commit 85a5ff6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 27 deletions.
diff --git a/.github/workflows/admin-sample.cd.yml b/.github/workflows/admin-sample.cd.yml
@@ -193,11 +193,11 @@ jobs:
     - name: Set android universal link
       run:  sed -i 's/bp.bitplatform.dev/adminpanel.bitplatform.dev/g' AdminPanel/src/Client/AdminPanel.Client.Maui/Platforms/Android/MainActivity.cs
 
-    - name: Install Android Dependencies
-      run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
-
     - name: Install maui
       run: cd src && dotnet workload install maui-android
+
+    - name: Install Android Dependencies
+      run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Maui/AdminPanel.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
 
     - name: Generate CSS/JS files
       run: dotnet build AdminPanel/src/Client/AdminPanel.Client.Core/AdminPanel.Client.Core.csproj -t:BeforeBuildTasks --no-restore

diff --git a/.github/workflows/bit.ci.yml b/.github/workflows/bit.ci.yml
@@ -53,17 +53,6 @@ jobs:
       with:
         global-json-file: src/global.json
 
-    # - name: Set up JDK
-    #   uses: actions/setup-java@v3
-    #   with:
-    #     java-version: '17'
-    #     distribution: 'temurin'
-
-    # - name: Setup Android SDK
-    #   uses: android-actions/setup-android@v3
-    #   with:
-    #     cmdline-tools-version: 10406996 # V11
-
     - uses: actions/setup-node@v3
       with:
         node-version: 18

diff --git a/.github/workflows/blazorui.demo.cd.yml b/.github/workflows/blazorui.demo.cd.yml
@@ -159,11 +159,11 @@ jobs:
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
 
-    - name: Install Android Dependencies
-      run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
-
     - name: Install maui
       run: cd src && dotnet workload install maui-android
+
+    - name: Install Android Dependencies
+      run: dotnet build src/BlazorUI/Demo/Client/Bit.BlazorUI.Demo.Client.Maui/Bit.BlazorUI.Demo.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
 
     - 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

diff --git a/.github/workflows/todo-sample.cd.yml b/.github/workflows/todo-sample.cd.yml
@@ -195,11 +195,11 @@ jobs:
     - name: Set android universal link
       run:  sed -i 's/bp.bitplatform.dev/todo.bitplatform.dev/g' TodoSample/src/Client/TodoSample.Client.Maui/Platforms/Android/MainActivity.cs
 
-    - name: Install Android Dependencies
-      run: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
-
     - name: Install maui
       run: cd src && dotnet workload install maui-android
+
+    - name: Install Android Dependencies
+      run: dotnet build TodoSample/src/Client/TodoSample.Client.Maui/TodoSample.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
 
     - name: Generate CSS/JS files
       run: dotnet build TodoSample/src/Client/TodoSample.Client.Core/TodoSample.Client.Core.csproj -t:BeforeBuildTasks --no-restore

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.azure-devops/workflows/cd.yml
@@ -211,16 +211,16 @@ jobs:
     displayName: 'Install Node.js'
 
   - task: Bash@3
-    displayName: 'Install Android Dependencies'
+    displayName: 'Install maui'
     inputs:
       targetType: 'inline'
-      script: 'dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True'
+      script: cd src && dotnet workload install maui-android
 
   - task: Bash@3
-    displayName: 'Install maui'
+    displayName: 'Install Android Dependencies'
     inputs:
       targetType: 'inline'
-      script: cd src && dotnet workload install maui-android
+      script: 'dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True'
 
   - task: DownloadSecureFile@1
     displayName: Download Boilerplate keystore file

diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml b/src/Templates/Boilerplate/Bit.Boilerplate/.github/workflows/cd.yml
@@ -195,12 +195,12 @@ jobs:
         files: 'src/Client/Boilerplate.Client.Core/appsettings.json'
       env:
         ApiServerAddress: ${{ env.API_SERVER_ADDRESS }}
-
-    - name: Install Android Dependencies
-      run: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
 
     - name: Install maui
       run: cd src && dotnet workload install maui-android
+
+    - name: Install Android Dependencies
+      run: dotnet build src/Client/Boilerplate.Client.Maui/Boilerplate.Client.Maui.csproj -t:InstallAndroidDependencies -f:net8.0-android -p:AcceptAndroidSDKLicenses=True
 
     - name: Generate CSS/JS files
       run: dotnet build src/Client/Boilerplate.Client.Core/Boilerplate.Client.Core.csproj -t:BeforeBuildTasks --no-restore