change makefile to no longer use msbuild but always dotnet

.github/workflows/build.yml

@@ -78,7 +78,7 @@ jobs:
 
   #   - name: Build keepass2android (net)
   #     run: |
-  #       make msbuild Flavor=Net
+  #       make dotnetbuild Flavor=Net
 
   #   - name: Build APK (net)
   #     run: |
@@ -96,7 +96,7 @@ jobs:
 
   #   - name: Build keepass2android (nonet)
   #     run: |
-  #       make msbuild Flavor=NoNet
+  #       make dotnetbuild Flavor=NoNet
 
   #   - name: Build APK (nonet)
   #     run: |
@@ -212,7 +212,7 @@ jobs:
 
   #   - name: Build keepass2android (net)
   #     run: |
-  #       make msbuild Flavor=Net
+  #       make dotnetbuild Flavor=Net
 
   #   - name: Build APK (net)
   #     run: |
@@ -230,7 +230,7 @@ jobs:
 
   #   - name: Build keepass2android (nonet)
   #     run: |
-  #       make msbuild Flavor=NoNet
+  #       make dotnetbuild Flavor=NoNet
 
   #   - name: Build APK (nonet)
   #     run: |
@@ -279,8 +279,8 @@ jobs:
       with:
         minimum-size: 8GB
 
-    - name: Add msbuild to PATH
+    - name: Add dotnetbuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-dotnetbuild@v2
       # If we want to also have nmake, use this instead
       #uses: ilammy/msvc-dev-cmd@v1
 
@@ -322,7 +322,7 @@ jobs:
 
     - name: Build keepass2android (net)
       run: |
-        make msbuild Flavor=Net
+        make dotnetbuild Flavor=Net
 
     - name: Build APK (net)
       run: |
@@ -344,7 +344,7 @@ jobs:
 
     - name: Build keepass2android (nonet)
       run: |
-        make msbuild Flavor=NoNet
+        make dotnetbuild Flavor=NoNet
 
     - name: Test Autofill
       working-directory: ./src/Kp2aAutofillParser.Tests
@@ -361,5 +361,3 @@ jobs:
         path: |
           src/keepass2android/bin/*/*-Signed.apk
 
-    - name: Perform "make distclean"
-      run: make distclean

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
       with:
         minimum-size: 8GB
 
-    - name: Add msbuild to PATH
+    - name: Add msbuild/dotnet to PATH
       uses: microsoft/setup-msbuild@v2
       # If we want to also have nmake, use this instead
       #uses: ilammy/msvc-dev-cmd@v1
@@ -89,6 +89,10 @@ jobs:
     - name: Install NuGet dependencies
       run: make nuget Flavor=${{ matrix.flavor }}
 
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+
     - name: Build APK (net)
       env:
         KeyStore: "${{ github.workspace }}/kp2a.keystore"
@@ -101,18 +105,26 @@ jobs:
 
       run: |
         make ${{ matrix.target }} Configuration=Release Flavor=${{ matrix.flavor }}
-
+    
-
+    - name: List apks
+      run:  find . -type f -name "*.apk"
+      shell: bash
+    
     - name: Archive production artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: signed APK (built on ${{ github.job }})
+        name: keepass2android_${{ matrix.target }}_${{ matrix.flavor }}
         path: |
-          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
+          src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
+          src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk
     
-    - name: Upload APK to GitHub Release
+    - name: List apks
-      uses: softprops/action-gh-release@v2
+      run:  find . -type f -name "*.apk"
-      if: github.ref_type == 'tag'
+      shell: bash
-      with:
+      
-        files: |
+    #- name: Upload APK to GitHub Release
-            src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk
+    #  uses: softprops/action-gh-release@v2
+    #  if: github.ref_type == 'tag'
+    #  with:
+    #    files: |
+    #        src/keepass2android-app/bin/Release/net8.0-android/*/publish/*.apk src/keepass2android-app/bin/Release/net8.0-android/publish/*.apk

Makefile

@@ -316,10 +316,10 @@ manifestlink:
 msbuild: manifestlink native java nuget 
 	$(MSBUILD) src/KeePass.sln -target:keepass2android-app -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -p:BuildProjectReferences=true $(MSBUILD_PARAM) -p:Platform="Any CPU" -m
 
-apk: msbuild 
+apk: manifestlink native java nuget  
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m 
 
-apk_split: msbuild
+apk_split: manifestlink native java nuget 
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-arm64
 	$(MSBUILD) src/keepass2android-app/keepass2android-app.csproj -p:AndroidSdkDirectory="$(ANDROID_SDK_ROOT)" -t:SignAndroidPackage $(MSBUILD_PARAM) -p:Platform=AnyCPU -m -p:RuntimeIdentifier=android-x86