Do not set the property for debug

Also add it to the cached props
dotnet · Dec 16, 2020 · 7656be6 · 7656be6
1 parent 808c114
commit 7656be6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.CSharp.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.CSharp.targets
@@ -29,7 +29,6 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
  <TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
  <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v5.0</TargetFrameworkVersion>
  <LangVersion Condition=" '$(LangVersion)' == '' ">8.0</LangVersion>
- <AndroidAddKeepAlives Condition="'$(AndroidAddKeepAlives)' == ''">True</AndroidAddKeepAlives>
  <AndroidLinkMode Condition="'$(AndroidLinkMode)' == ''">SdkOnly</AndroidLinkMode>
  <!-- The .NET SGEN tool cannot process Xamarin.Android assemblies because
  our mscorlib.dll isn't properly signed, as far as its concerned.

diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
@@ -842,6 +842,7 @@ because xbuild doesn't support framework reference assemblies.
 
 <Target Name="_CreatePropertiesCache" DependsOnTargets="_SetupDesignTimeBuildForBuild;_SetLatestTargetFrameworkVersion;_ResolveMonoAndroidSdks">
  <PropertyGroup>
+ <AndroidAddKeepAlives Condition="'$(AndroidAddKeepAlives)' == '' And '$(AndroidIncludeDebugSymbols)' != 'True'">True</AndroidAddKeepAlives>
  <_AndroidBuildPropertiesCacheExists Condition=" Exists('$(_AndroidBuildPropertiesCache)') ">True</_AndroidBuildPropertiesCacheExists>
  <_NuGetAssetsFile Condition=" Exists('$(ProjectLockFile)') ">$(ProjectLockFile)</_NuGetAssetsFile>
  <_NuGetAssetsFile Condition=" '$(_NuGetAssetsFile)' == '' and Exists('packages.config') ">packages.config</_NuGetAssetsFile>
@@ -854,6 +855,7 @@ because xbuild doesn't support framework reference assemblies.
  <!-- List of items we want to trigger a build if changed -->
  <_PropertyCacheItems Include="BundleAssemblies=$(BundleAssemblies)" />
  <_PropertyCacheItems Include="AotAssemblies=$(AotAssemblies)" />
+ <_PropertyCacheItems Include="AndroidAddKeepAlives=$(AndroidAddKeepAlives)" />
  <_PropertyCacheItems Include="AndroidAotMode=$(AndroidAotMode)" />
  <_PropertyCacheItems Include="AndroidEmbedProfilers=$(AndroidEmbedProfilers)" />
  <_PropertyCacheItems Include="AndroidEnableProfiledAot=$(AndroidEnableProfiledAot)" />