Skip to content

Commit 1f3edc1

Browse files
[trimming] remove $(_AggressiveAttributeTrimming) by default (#9062)
* [trimming] remove `$(_AggressiveAttributeTrimming)` by default Fixes: #9060 This was introduced in 60e983c (.NET 6 timeframe). It is a "private" switch that is no longer recommended. * `.apkdesc` files
1 parent 1f822a6 commit 1f3edc1

File tree

3 files changed

+82
-83
lines changed

3 files changed

+82
-83
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
<StartupHookSupport Condition="'$(StartupHookSupport)' == ''">false</StartupHookSupport>
117117
<UseNativeHttpHandler Condition=" $(AndroidHttpClientHandlerType.Contains ('System.Net.Http.SocketsHttpHandler')) And '$(UseNativeHttpHandler)' == '' ">false</UseNativeHttpHandler>
118118
<UseNativeHttpHandler Condition="'$(UseNativeHttpHandler)' == ''">true</UseNativeHttpHandler>
119-
<_AggressiveAttributeTrimming Condition="'$(_AggressiveAttributeTrimming)' == ''">true</_AggressiveAttributeTrimming>
120119
<NullabilityInfoContextSupport Condition="'$(NullabilityInfoContextSupport)' == ''">false</NullabilityInfoContextSupport>
121120
<BuiltInComInteropSupport Condition="'$(BuiltInComInteropSupport)' == ''">false</BuiltInComInteropSupport>
122121
<JsonSerializerIsReflectionEnabledByDefault Condition="'$(JsonSerializerIsReflectionEnabledByDefault)' == '' and '$(TrimMode)' == 'partial'">true</JsonSerializerIsReflectionEnabledByDefault>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,43 @@
88
"Size": 22488
99
},
1010
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
11-
"Size": 1027
11+
"Size": 1114
1212
},
1313
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
14-
"Size": 64653
14+
"Size": 66243
1515
},
1616
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
17-
"Size": 92659
17+
"Size": 94712
1818
},
1919
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
20-
"Size": 5394
20+
"Size": 5320
2121
},
2222
"lib/arm64-v8a/lib_System.Console.dll.so": {
23-
"Size": 6512
23+
"Size": 7226
2424
},
2525
"lib/arm64-v8a/lib_System.Linq.dll.so": {
26-
"Size": 8489
26+
"Size": 9294
2727
},
2828
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
29-
"Size": 575506
29+
"Size": 596083
3030
},
3131
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
32-
"Size": 2554
32+
"Size": 2969
3333
},
3434
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
35-
"Size": 3999
35+
"Size": 4475
3636
},
3737
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
38-
"Size": 2934
38+
"Size": 2932
3939
},
4040
"lib/arm64-v8a/libarc.bin.so": {
41-
"Size": 1586
41+
"Size": 1546
4242
},
4343
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
4444
"Size": 87432
4545
},
4646
"lib/arm64-v8a/libmonodroid.so": {
47-
"Size": 492104
47+
"Size": 492344
4848
},
4949
"lib/arm64-v8a/libmonosgen-2.0.so": {
5050
"Size": 3163208
@@ -62,10 +62,10 @@
6262
"Size": 159544
6363
},
6464
"lib/arm64-v8a/libxamarin-app.so": {
65-
"Size": 17984
65+
"Size": 17960
6666
},
6767
"META-INF/BNDLTOOL.RSA": {
68-
"Size": 1223
68+
"Size": 1221
6969
},
7070
"META-INF/BNDLTOOL.SF": {
7171
"Size": 3266
@@ -98,5 +98,5 @@
9898
"Size": 1904
9999
}
100100
},
101-
"PackageSize": 2693653
101+
"PackageSize": 2714133
102102
}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -29,193 +29,193 @@
2929
"Size": 2396
3030
},
3131
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
32-
"Size": 2279
32+
"Size": 2363
3333
},
3434
"lib/arm64-v8a/lib_FormsViewGroup.dll.so": {
3535
"Size": 8330
3636
},
3737
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
38-
"Size": 72814
38+
"Size": 74373
3939
},
4040
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
41-
"Size": 459203
41+
"Size": 470377
4242
},
4343
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
44-
"Size": 5392
44+
"Size": 5320
4545
},
4646
"lib/arm64-v8a/lib_mscorlib.dll.so": {
47-
"Size": 4000
47+
"Size": 4360
4848
},
4949
"lib/arm64-v8a/lib_netstandard.dll.so": {
50-
"Size": 5634
50+
"Size": 6003
5151
},
5252
"lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": {
53-
"Size": 11901
53+
"Size": 12458
5454
},
5555
"lib/arm64-v8a/lib_System.Collections.dll.so": {
56-
"Size": 15960
56+
"Size": 16436
5757
},
5858
"lib/arm64-v8a/lib_System.Collections.NonGeneric.dll.so": {
59-
"Size": 7964
59+
"Size": 8448
6060
},
6161
"lib/arm64-v8a/lib_System.Collections.Specialized.dll.so": {
62-
"Size": 5896
62+
"Size": 6629
6363
},
6464
"lib/arm64-v8a/lib_System.ComponentModel.dll.so": {
65-
"Size": 1943
65+
"Size": 2428
6666
},
6767
"lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": {
68-
"Size": 3632
68+
"Size": 4094
6969
},
7070
"lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": {
71-
"Size": 22409
71+
"Size": 24729
7272
},
7373
"lib/arm64-v8a/lib_System.Console.dll.so": {
74-
"Size": 6542
74+
"Size": 7264
7575
},
7676
"lib/arm64-v8a/lib_System.Core.dll.so": {
77-
"Size": 1977
77+
"Size": 2376
7878
},
7979
"lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": {
80-
"Size": 9493
80+
"Size": 10315
8181
},
8282
"lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": {
83-
"Size": 7009
83+
"Size": 7486
8484
},
8585
"lib/arm64-v8a/lib_System.dll.so": {
86-
"Size": 2371
86+
"Size": 2779
8787
},
8888
"lib/arm64-v8a/lib_System.Drawing.dll.so": {
89-
"Size": 1942
89+
"Size": 2359
9090
},
9191
"lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": {
92-
"Size": 11940
92+
"Size": 12474
9393
},
9494
"lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": {
95-
"Size": 11627
95+
"Size": 12315
9696
},
9797
"lib/arm64-v8a/lib_System.IO.Compression.dll.so": {
98-
"Size": 15753
98+
"Size": 16663
9999
},
100100
"lib/arm64-v8a/lib_System.IO.IsolatedStorage.dll.so": {
101-
"Size": 10293
101+
"Size": 11008
102102
},
103103
"lib/arm64-v8a/lib_System.Linq.dll.so": {
104-
"Size": 20088
104+
"Size": 21038
105105
},
106106
"lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": {
107-
"Size": 164366
107+
"Size": 167929
108108
},
109109
"lib/arm64-v8a/lib_System.Net.Http.dll.so": {
110-
"Size": 68333
110+
"Size": 69565
111111
},
112112
"lib/arm64-v8a/lib_System.Net.Primitives.dll.so": {
113-
"Size": 22619
113+
"Size": 23728
114114
},
115115
"lib/arm64-v8a/lib_System.Net.Requests.dll.so": {
116-
"Size": 3597
116+
"Size": 4368
117117
},
118118
"lib/arm64-v8a/lib_System.ObjectModel.dll.so": {
119-
"Size": 9090
119+
"Size": 9745
120120
},
121121
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
122-
"Size": 879691
122+
"Size": 907085
123123
},
124124
"lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": {
125-
"Size": 192540
125+
"Size": 198923
126126
},
127127
"lib/arm64-v8a/lib_System.Private.Uri.dll.so": {
128-
"Size": 43081
128+
"Size": 44799
129129
},
130130
"lib/arm64-v8a/lib_System.Private.Xml.dll.so": {
131-
"Size": 215206
131+
"Size": 217533
132132
},
133133
"lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": {
134-
"Size": 17138
134+
"Size": 18124
135135
},
136136
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
137-
"Size": 2708
137+
"Size": 3129
138138
},
139139
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
140-
"Size": 3999
140+
"Size": 4475
141141
},
142142
"lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": {
143-
"Size": 1867
143+
"Size": 2281
144144
},
145145
"lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": {
146-
"Size": 2531
146+
"Size": 3165
147147
},
148148
"lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": {
149-
"Size": 3761
149+
"Size": 4226
150150
},
151151
"lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": {
152-
"Size": 8770
152+
"Size": 10032
153153
},
154154
"lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": {
155-
"Size": 161067
155+
"Size": 163519
156156
},
157157
"lib/arm64-v8a/lib_System.Xml.dll.so": {
158-
"Size": 1763
158+
"Size": 2182
159159
},
160160
"lib/arm64-v8a/lib_System.Xml.Linq.dll.so": {
161-
"Size": 1781
161+
"Size": 2193
162162
},
163163
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
164164
"Size": 5007
165165
},
166166
"lib/arm64-v8a/lib_Xamarin.AndroidX.Activity.dll.so": {
167-
"Size": 16323
167+
"Size": 17023
168168
},
169169
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.AppCompatResources.dll.so": {
170-
"Size": 6438
170+
"Size": 6979
171171
},
172172
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.dll.so": {
173-
"Size": 138385
173+
"Size": 139892
174174
},
175175
"lib/arm64-v8a/lib_Xamarin.AndroidX.CardView.dll.so": {
176-
"Size": 6959
176+
"Size": 7469
177177
},
178178
"lib/arm64-v8a/lib_Xamarin.AndroidX.CoordinatorLayout.dll.so": {
179-
"Size": 18150
179+
"Size": 18822
180180
},
181181
"lib/arm64-v8a/lib_Xamarin.AndroidX.Core.dll.so": {
182-
"Size": 127206
182+
"Size": 129133
183183
},
184184
"lib/arm64-v8a/lib_Xamarin.AndroidX.CursorAdapter.dll.so": {
185-
"Size": 8978
185+
"Size": 9607
186186
},
187187
"lib/arm64-v8a/lib_Xamarin.AndroidX.DrawerLayout.dll.so": {
188-
"Size": 15504
188+
"Size": 16100
189189
},
190190
"lib/arm64-v8a/lib_Xamarin.AndroidX.Fragment.dll.so": {
191-
"Size": 51881
191+
"Size": 53241
192192
},
193193
"lib/arm64-v8a/lib_Xamarin.AndroidX.Legacy.Support.Core.UI.dll.so": {
194-
"Size": 6233
194+
"Size": 6806
195195
},
196196
"lib/arm64-v8a/lib_Xamarin.AndroidX.Lifecycle.Common.dll.so": {
197-
"Size": 6890
197+
"Size": 7450
198198
},
199199
"lib/arm64-v8a/lib_Xamarin.AndroidX.Lifecycle.LiveData.Core.dll.so": {
200-
"Size": 6733
200+
"Size": 7279
201201
},
202202
"lib/arm64-v8a/lib_Xamarin.AndroidX.Lifecycle.ViewModel.dll.so": {
203-
"Size": 7002
203+
"Size": 7592
204204
},
205205
"lib/arm64-v8a/lib_Xamarin.AndroidX.Loader.dll.so": {
206-
"Size": 13063
206+
"Size": 13717
207207
},
208208
"lib/arm64-v8a/lib_Xamarin.AndroidX.RecyclerView.dll.so": {
209-
"Size": 93874
209+
"Size": 95160
210210
},
211211
"lib/arm64-v8a/lib_Xamarin.AndroidX.SavedState.dll.so": {
212-
"Size": 5107
212+
"Size": 5628
213213
},
214214
"lib/arm64-v8a/lib_Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
215-
"Size": 14226
215+
"Size": 14856
216216
},
217217
"lib/arm64-v8a/lib_Xamarin.AndroidX.ViewPager.dll.so": {
218-
"Size": 19353
218+
"Size": 20040
219219
},
220220
"lib/arm64-v8a/lib_Xamarin.Forms.Core.dll.so": {
221221
"Size": 563905
@@ -230,16 +230,16 @@
230230
"Size": 63542
231231
},
232232
"lib/arm64-v8a/lib_Xamarin.Google.Android.Material.dll.so": {
233-
"Size": 66529
233+
"Size": 67669
234234
},
235235
"lib/arm64-v8a/libarc.bin.so": {
236-
"Size": 1586
236+
"Size": 1546
237237
},
238238
"lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
239239
"Size": 87432
240240
},
241241
"lib/arm64-v8a/libmonodroid.so": {
242-
"Size": 492104
242+
"Size": 492344
243243
},
244244
"lib/arm64-v8a/libmonosgen-2.0.so": {
245245
"Size": 3163208
@@ -257,7 +257,7 @@
257257
"Size": 159544
258258
},
259259
"lib/arm64-v8a/libxamarin-app.so": {
260-
"Size": 348544
260+
"Size": 348520
261261
},
262262
"META-INF/androidx.activity_activity.version": {
263263
"Size": 6
@@ -410,7 +410,7 @@
410410
"Size": 6
411411
},
412412
"META-INF/BNDLTOOL.RSA": {
413-
"Size": 1221
413+
"Size": 1223
414414
},
415415
"META-INF/BNDLTOOL.SF": {
416416
"Size": 98341
@@ -2480,5 +2480,5 @@
24802480
"Size": 812848
24812481
}
24822482
},
2483-
"PackageSize": 10267731
2483+
"PackageSize": 10345555
24842484
}

0 commit comments

Comments
 (0)