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

View File

@@ -5,9 +5,7 @@ if exist "DropboxFileStorageKeys.cs" (
xcopy DropboxFileStorageKeysDummy.cs DropboxFileStorageKeys.cs* xcopy DropboxFileStorageKeysDummy.cs DropboxFileStorageKeys.cs*
) )
cd ..\..\keepass2android cd ..\..
call UseManifestDebug.bat
cd ..
IF NOT "%VSCMD_VCVARSALL_INIT%" == "1" ( IF NOT "%VSCMD_VCVARSALL_INIT%" == "1" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64

View File

@@ -14,10 +14,6 @@ fi
popd popd
pushd keepass2android
./UseManifestDebug.sh
popd
# call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64 # call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64
# Determine if we use msbuild or xabuild to build. # Determine if we use msbuild or xabuild to build.

View File

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

View File

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

View File

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

View File

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

View File

@@ -20,13 +20,20 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk> <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion> <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest_debug.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent> <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2> <AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType> <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
</PropertyGroup> </PropertyGroup>
<Choose>
<When Condition=" '$(Configuration)'=='Release' ">
<PropertyGroup>
<AndroidManifest>Properties\AndroidManifest_net.xml</AndroidManifest>
</PropertyGroup>
</When>
</Choose>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
@@ -358,12 +365,6 @@
<None Include="todos.cs"> <None Include="todos.cs">
<Visible>False</Visible> <Visible>False</Visible>
</None> </None>
<None Include="UseManifestNet.bat">
<Visible>False</Visible>
</None>
<None Include="UseManifestNoNet.bat">
<Visible>False</Visible>
</None>
<None Include="Properties\AndroidManifest_net.xml"> <None Include="Properties\AndroidManifest_net.xml">
<Visible>False</Visible> <Visible>False</Visible>
</None> </None>
@@ -1962,4 +1963,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>