Skip to content

Commit

Permalink
Merge branch 'release/9.0.1xx-rc2' into dev/restore/9154
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonathanpeppers
jonathanpeppers authored Sep 30, 2024
2 parents cf3dd84 + d6240d4 commit d5070cf
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 78 deletions.
26 changes: 13 additions & 13 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
"Size": 3036
},
"classes.dex": {
"Size": 22488
"Size": 389672
},
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
"Size": 18208
},
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
"Size": 86368
"Size": 69163
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
"Size": 115752
"Size": 98246
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
"Size": 22408
"Size": 5310
},
"lib/arm64-v8a/lib_System.Console.dll.so": {
"Size": 24384
"Size": 7291
},
"lib/arm64-v8a/lib_System.Linq.dll.so": {
"Size": 26480
"Size": 9388
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
"Size": 633792
"Size": 616826
},
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
"Size": 20048
"Size": 2954
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
"Size": 21592
"Size": 4498
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 20024
Expand All @@ -44,7 +44,7 @@
"Size": 87432
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 485800
"Size": 484568
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3196336
Expand All @@ -62,10 +62,10 @@
"Size": 160232
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 17912
"Size": 12536
},
"META-INF/BNDLTOOL.RSA": {
"Size": 1221
"Size": 1223
},
"META-INF/BNDLTOOL.SF": {
"Size": 3266
Expand Down Expand Up @@ -98,5 +98,5 @@
"Size": 1904
}
},
"PackageSize": 2791957
"PackageSize": 2857493
}
131 changes: 67 additions & 64 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"Size": 6652
},
"classes.dex": {
"Size": 9172800
"Size": 9448924
},
"classes2.dex": {
"Size": 154180
},
"kotlin/annotation/annotation.kotlin_builtins": {
"Size": 928
Expand All @@ -32,169 +35,169 @@
"Size": 19456
},
"lib/arm64-v8a/lib_FormsViewGroup.dll.so": {
"Size": 25424
"Size": 8090
},
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
"Size": 94768
"Size": 77546
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
"Size": 523568
"Size": 504730
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
"Size": 22408
"Size": 5310
},
"lib/arm64-v8a/lib_mscorlib.dll.so": {
"Size": 21432
"Size": 4345
},
"lib/arm64-v8a/lib_netstandard.dll.so": {
"Size": 23080
},
"lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": {
"Size": 29808
"Size": 12712
},
"lib/arm64-v8a/lib_System.Collections.dll.so": {
"Size": 36288
"Size": 19195
},
"lib/arm64-v8a/lib_System.Collections.NonGeneric.dll.so": {
"Size": 25760
"Size": 8665
},
"lib/arm64-v8a/lib_System.Collections.Specialized.dll.so": {
"Size": 23848
"Size": 6755
},
"lib/arm64-v8a/lib_System.ComponentModel.dll.so": {
"Size": 19584
},
"lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": {
"Size": 21304
"Size": 4208
},
"lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": {
"Size": 42456
"Size": 25360
},
"lib/arm64-v8a/lib_System.Console.dll.so": {
"Size": 24424
"Size": 7327
},
"lib/arm64-v8a/lib_System.Core.dll.so": {
"Size": 19456
"Size": 2364
},
"lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": {
"Size": 28440
"Size": 11351
},
"lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": {
"Size": 24696
"Size": 7597
},
"lib/arm64-v8a/lib_System.dll.so": {
"Size": 19856
"Size": 2764
},
"lib/arm64-v8a/lib_System.Drawing.dll.so": {
"Size": 19432
"Size": 2340
},
"lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": {
"Size": 30048
"Size": 12957
},
"lib/arm64-v8a/lib_System.Formats.Asn1.dll.so": {
"Size": 49936
"Size": 32845
},
"lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": {
"Size": 29488
"Size": 12389
},
"lib/arm64-v8a/lib_System.IO.Compression.dll.so": {
"Size": 33784
"Size": 16695
},
"lib/arm64-v8a/lib_System.IO.IsolatedStorage.dll.so": {
"Size": 28288
"Size": 11194
},
"lib/arm64-v8a/lib_System.Linq.dll.so": {
"Size": 38736
"Size": 21643
},
"lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": {
"Size": 185816
"Size": 168719
},
"lib/arm64-v8a/lib_System.Net.Http.dll.so": {
"Size": 89488
"Size": 72404
},
"lib/arm64-v8a/lib_System.Net.Primitives.dll.so": {
"Size": 41112
"Size": 24027
},
"lib/arm64-v8a/lib_System.Net.Requests.dll.so": {
"Size": 21552
"Size": 4459
},
"lib/arm64-v8a/lib_System.ObjectModel.dll.so": {
"Size": 27072
"Size": 9979
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
"Size": 956368
"Size": 939319
},
"lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": {
"Size": 216688
"Size": 199599
},
"lib/arm64-v8a/lib_System.Private.Uri.dll.so": {
"Size": 62184
"Size": 45102
},
"lib/arm64-v8a/lib_System.Private.Xml.dll.so": {
"Size": 237096
"Size": 220011
},
"lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": {
"Size": 35592
"Size": 18496
},
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
"Size": 20200
"Size": 3108
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
"Size": 21592
"Size": 4498
},
"lib/arm64-v8a/lib_System.Runtime.Numerics.dll.so": {
"Size": 54400
"Size": 37318
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": {
"Size": 19360
"Size": 2264
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": {
"Size": 20336
"Size": 3242
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": {
"Size": 21456
"Size": 4359
},
"lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": {
"Size": 80496
"Size": 63412
},
"lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": {
"Size": 183600
"Size": 166503
},
"lib/arm64-v8a/lib_System.Xml.dll.so": {
"Size": 19256
"Size": 2166
},
"lib/arm64-v8a/lib_System.Xml.Linq.dll.so": {
"Size": 19272
"Size": 2179
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 22096
"Size": 5006
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.Activity.dll.so": {
"Size": 34960
"Size": 17665
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.AppCompatResources.dll.so": {
"Size": 24520
"Size": 7203
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.AppCompat.dll.so": {
"Size": 163240
"Size": 145980
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.CardView.dll.so": {
"Size": 24560
"Size": 7472
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.CoordinatorLayout.dll.so": {
"Size": 35912
"Size": 18592
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.Core.dll.so": {
"Size": 151408
"Size": 134121
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.CursorAdapter.dll.so": {
"Size": 27168
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.DrawerLayout.dll.so": {
"Size": 33944
"Size": 16666
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.Fragment.dll.so": {
"Size": 72528
"Size": 55131
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.Legacy.Support.Core.UI.dll.so": {
"Size": 23896
Expand All @@ -212,22 +215,22 @@
"Size": 31592
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.RecyclerView.dll.so": {
"Size": 112256
"Size": 94806
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.SavedState.dll.so": {
"Size": 23144
"Size": 6051
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.SwipeRefreshLayout.dll.so": {
"Size": 31952
"Size": 14578
},
"lib/arm64-v8a/lib_Xamarin.AndroidX.ViewPager.dll.so": {
"Size": 38056
"Size": 20659
},
"lib/arm64-v8a/lib_Xamarin.Forms.Core.dll.so": {
"Size": 581000
},
"lib/arm64-v8a/lib_Xamarin.Forms.Platform.Android.dll.so": {
"Size": 390464
"Size": 373373
},
"lib/arm64-v8a/lib_Xamarin.Forms.Platform.dll.so": {
"Size": 35848
Expand All @@ -236,7 +239,7 @@
"Size": 80632
},
"lib/arm64-v8a/lib_Xamarin.Google.Android.Material.dll.so": {
"Size": 84768
"Size": 67309
},
"lib/arm64-v8a/libarc.bin.so": {
"Size": 18776
Expand All @@ -245,7 +248,7 @@
"Size": 87432
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 485800
"Size": 484568
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3196336
Expand All @@ -263,7 +266,7 @@
"Size": 160232
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 349352
"Size": 119816
},
"META-INF/androidx.activity_activity.version": {
"Size": 6
Expand Down Expand Up @@ -419,7 +422,7 @@
"Size": 1221
},
"META-INF/BNDLTOOL.SF": {
"Size": 98577
"Size": 98661
},
"META-INF/com.android.tools/proguard/coroutines.pro": {
"Size": 1345
Expand All @@ -446,7 +449,7 @@
"Size": 5
},
"META-INF/MANIFEST.MF": {
"Size": 98450
"Size": 98534
},
"META-INF/maven/com.google.guava/listenablefuture/pom.properties": {
"Size": 96
Expand Down Expand Up @@ -2486,5 +2489,5 @@
"Size": 812848
}
},
"PackageSize": 10628363
"PackageSize": 10624325
}
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ Copyright (C) 2011-2012 Xamarin. All rights reserved.
<AndroidUseAssemblyStore Condition=" '$(AndroidUseAssemblyStore)' == '' ">true</AndroidUseAssemblyStore>
<AndroidAotEnableLazyLoad Condition=" '$(AndroidAotEnableLazyLoad)' == '' And '$(AotAssemblies)' == 'true' And '$(AndroidIncludeDebugSymbols)' != 'true' ">True</AndroidAotEnableLazyLoad>
<AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' and ('$(UsingMicrosoftNETSdkRazor)' == 'true') ">False</AndroidEnableMarshalMethods>
<AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' ">True</AndroidEnableMarshalMethods>
<AndroidEnableMarshalMethods Condition=" '$(AndroidEnableMarshalMethods)' == '' ">False</AndroidEnableMarshalMethods>
<_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' == 'True' ">False</_AndroidUseMarshalMethods>
<_AndroidUseMarshalMethods Condition=" '$(AndroidIncludeDebugSymbols)' != 'True' ">$(AndroidEnableMarshalMethods)</_AndroidUseMarshalMethods>
</PropertyGroup>
Expand Down

0 comments on commit d5070cf

Please sign in to comment.