Skip to content

Commit 439437e

Browse files
authored
[net6] Consolidate feature switches defaults (#5662)
Context: https://github.com/dotnet/runtime/blob/d0616f837f4ad1ceb7e36a341934c929fd790089/docs/workflow/trimming/feature-switches.md Move all the feature switches default settings to one place.
1 parent 0de3135 commit 439437e

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,23 @@
6161
<AndroidManifest Condition=" '$(AndroidManifest)' == '' ">AndroidManifest.xml</AndroidManifest>
6262
<GenerateApplicationManifest Condition=" '$(GenerateApplicationManifest)' == '' ">true</GenerateApplicationManifest>
6363

64-
<!-- Enable/Disable default runtime features-->
64+
<!--
65+
Runtime libraries feature switches defaults
66+
Available feature switches: https://github.com/dotnet/runtime/blob/master/docs/workflow/trimming/feature-switches.md
67+
-->
68+
<DebuggerSupport Condition="'$(DebuggerSupport)' == ''">$(AndroidUseDebugRuntime)</DebuggerSupport>
69+
<EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
70+
<EnableUnsafeBinaryFormatterSerialization Condition="'$(EnableUnsafeBinaryFormatterSerialization)' == ''">false</EnableUnsafeBinaryFormatterSerialization>
71+
<EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
72+
<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
73+
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
74+
<HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
75+
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
6576
<UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>
77+
78+
<!-- XA feature switches defaults -->
79+
<XATypeRegistrationFallback Condition="'$(XATypeRegistrationFallback)' == ''">false</XATypeRegistrationFallback>
80+
6681
</PropertyGroup>
6782
<PropertyGroup Condition=" '$(AndroidApplication)' == 'true' and '$(GenerateApplicationManifest)' == 'true' ">
6883
<ApplicationVersion Condition=" '$(ApplicationVersion)' == '' ">1.0</ApplicationVersion>

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@ This file contains the .NET 5-specific targets to customize ILLink
99

1010
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1111

12-
<PropertyGroup>
13-
<!--
14-
Runtime libraries feature switches defaults
15-
Available feature switches: https://github.com/dotnet/runtime/blob/master/docs/workflow/trimming/feature-switches.md
16-
-->
17-
<DebuggerSupport Condition="'$(DebuggerSupport)' == ''">$(AndroidUseDebugRuntime)</DebuggerSupport>
18-
<EnableUnsafeUTF7Encoding Condition="'$(EnableUnsafeUTF7Encoding)' == ''">false</EnableUnsafeUTF7Encoding>
19-
<EnableUnsafeBinaryFormatterSerialization Condition="'$(EnableUnsafeBinaryFormatterSerialization)' == ''">false</EnableUnsafeBinaryFormatterSerialization>
20-
<EventSourceSupport Condition="'$(EventSourceSupport)' == ''">false</EventSourceSupport>
21-
<InvariantGlobalization Condition="'$(InvariantGlobalization)' == ''">false</InvariantGlobalization>
22-
<UseSystemResourceKeys Condition="'$(UseSystemResourceKeys)' == ''">true</UseSystemResourceKeys>
23-
<HttpActivityPropagationSupport Condition="'$(HttpActivityPropagationSupport)' == ''">false</HttpActivityPropagationSupport>
24-
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
25-
<XATypeRegistrationFallback Condition="'$(XATypeRegistrationFallback)' == ''">false</XATypeRegistrationFallback>
26-
</PropertyGroup>
27-
2812
<Target Name="_PrepareLinking"
2913
Condition=" '$(PublishTrimmed)' == 'true' "
3014
AfterTargets="ComputeResolvedFilesToPublishList"

0 commit comments

Comments
 (0)