qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autoselect correct AndroidManifest in csproj

Browse Source 
This avoids use of an external .bat script and selects the correct manifest based
on the configuration to build for (Debug, Release...)
This commit is contained in:
tenzap
2022-12-06 10:50:19 +01:00
parent b99272e850
commit 96fcc79c93
7 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/build-scripts/build-xamarin.bat
View File

@@ -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

4
src/build-scripts/build-xamarin.sh
View File

@@ -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.

2
src/keepass2android/UseManifestDebug.bat
View File

@@ -1,2 +0,0 @@
echo hallo!
copy Properties\AndroidManifest_debug.xml Properties\AndroidManifest.xml

5
src/keepass2android/UseManifestDebug.sh
View File

@@ -1,5 +0,0 @@
#!/bin/bash
set -e
echo 'Copying debug manifest.'
cp Properties/AndroidManifest_debug.xml Properties/AndroidManifest.xml

2
src/keepass2android/UseManifestNet.bat
View File

@@ -1,2 +0,0 @@
echo hallo!
copy Properties\AndroidManifest_net.xml Properties\AndroidManifest.xml

2
src/keepass2android/UseManifestNoNet.bat
View File

@@ -1,2 +0,0 @@
echo hallo!
copy Properties\AndroidManifest_nonet.xml Properties\AndroidManifest.xml

17
src/keepass2android/keepass2android-app.csproj
View File

@@ -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>
</Project>