From 96fcc79c93f9bf23fd01e1d38181330af68b52ec Mon Sep 17 00:00:00 2001
From: tenzap <fabstz-it@yahoo.fr>
Date: Tue, 6 Dec 2022 10:50:19 +0100
Subject: [PATCH] Autoselect correct AndroidManifest in csproj

This avoids use of an external .bat script and selects the correct manifest based
on the configuration to build for (Debug, Release...)
---
 src/build-scripts/build-xamarin.bat            |  4 +---
 src/build-scripts/build-xamarin.sh             |  4 ----
 src/keepass2android/UseManifestDebug.bat       |  2 --
 src/keepass2android/UseManifestDebug.sh        |  5 -----
 src/keepass2android/UseManifestNet.bat         |  2 --
 src/keepass2android/UseManifestNoNet.bat       |  2 --
 src/keepass2android/keepass2android-app.csproj | 17 +++++++++--------
 7 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 src/keepass2android/UseManifestDebug.bat
 delete mode 100755 src/keepass2android/UseManifestDebug.sh
 delete mode 100644 src/keepass2android/UseManifestNet.bat
 delete mode 100644 src/keepass2android/UseManifestNoNet.bat

diff --git a/src/build-scripts/build-xamarin.bat b/src/build-scripts/build-xamarin.bat
index dbddc871..511a44bd 100644
--- a/src/build-scripts/build-xamarin.bat
+++ b/src/build-scripts/build-xamarin.bat
@@ -5,9 +5,7 @@ if exist "DropboxFileStorageKeys.cs" (
   xcopy DropboxFileStorageKeysDummy.cs DropboxFileStorageKeys.cs*
 )
 
-cd ..\..\keepass2android
-call UseManifestDebug.bat
-cd ..
+cd ..\..
 
 IF NOT "%VSCMD_VCVARSALL_INIT%" == "1" (
   call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
diff --git a/src/build-scripts/build-xamarin.sh b/src/build-scripts/build-xamarin.sh
index 1659c0e6..b1a2e833 100755
--- a/src/build-scripts/build-xamarin.sh
+++ b/src/build-scripts/build-xamarin.sh
@@ -14,10 +14,6 @@ fi
 
 popd
 
-pushd keepass2android
-./UseManifestDebug.sh
-popd
-
 # call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
 
 # Determine if we use msbuild or xabuild to build.
diff --git a/src/keepass2android/UseManifestDebug.bat b/src/keepass2android/UseManifestDebug.bat
deleted file mode 100644
index a3e51c20..00000000
--- a/src/keepass2android/UseManifestDebug.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-echo hallo!
-copy Properties\AndroidManifest_debug.xml Properties\AndroidManifest.xml
\ No newline at end of file
diff --git a/src/keepass2android/UseManifestDebug.sh b/src/keepass2android/UseManifestDebug.sh
deleted file mode 100755
index 3d326423..00000000
--- a/src/keepass2android/UseManifestDebug.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-echo 'Copying debug manifest.'
-cp Properties/AndroidManifest_debug.xml Properties/AndroidManifest.xml
diff --git a/src/keepass2android/UseManifestNet.bat b/src/keepass2android/UseManifestNet.bat
deleted file mode 100644
index 66d429a0..00000000
--- a/src/keepass2android/UseManifestNet.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-echo hallo!
-copy Properties\AndroidManifest_net.xml Properties\AndroidManifest.xml
\ No newline at end of file
diff --git a/src/keepass2android/UseManifestNoNet.bat b/src/keepass2android/UseManifestNoNet.bat
deleted file mode 100644
index 31cf8db9..00000000
--- a/src/keepass2android/UseManifestNoNet.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-echo hallo!
-copy Properties\AndroidManifest_nonet.xml Properties\AndroidManifest.xml
\ No newline at end of file
diff --git a/src/keepass2android/keepass2android-app.csproj b/src/keepass2android/keepass2android-app.csproj
index fa645533..7456f282 100644
--- a/src/keepass2android/keepass2android-app.csproj
+++ b/src/keepass2android/keepass2android-app.csproj
@@ -20,13 +20,20 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidManifest>Properties\AndroidManifest_debug.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
   </PropertyGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)'=='Release' ">
+      <PropertyGroup>
+        <AndroidManifest>Properties\AndroidManifest_net.xml</AndroidManifest>
+      </PropertyGroup>
+    </When>
+  </Choose>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>portable</DebugType>
@@ -358,12 +365,6 @@
     <None Include="todos.cs">
       <Visible>False</Visible>
     </None>
-    <None Include="UseManifestNet.bat">
-      <Visible>False</Visible>
-    </None>
-    <None Include="UseManifestNoNet.bat">
-      <Visible>False</Visible>
-    </None>
     <None Include="Properties\AndroidManifest_net.xml">
       <Visible>False</Visible>
     </None>
@@ -1962,4 +1963,4 @@
     <Target Name="AfterBuild">
     </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>