diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7796851d3a1..fc80639e685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - d2fff6df585efa03cbe883b4fb6ce41be8d61342 + dbdda951424aa9b4d299d60f161f040af56d9886 - + https://github.com/dotnet/linker - ef2d0f25b72469b55925251a79f12bcbf98644bf + 33a76b856466b96dd3d179e599a7fc0118389641 - + https://github.com/dotnet/runtime - 206dccb7945aaa3f26599fbe742de9022ca7ef91 + db5d4dfd16d2b56fd557b44d7b9e172372b43454 - + https://github.com/dotnet/emsdk - 40e7c6226711ec616ee07e725563eda708630fe1 + 7d277787570614a3dd99e1d6022375d9ae43e6af diff --git a/eng/Versions.props b/eng/Versions.props index 8a820cc3db4..ee3680421a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-preview.7.22362.31 - 7.0.100-1.22354.1 - 7.0.0-preview.6.22356.1 + 7.0.100-preview.7.22370.3 + 7.0.100-1.22362.1 + 7.0.0-preview.7.22369.4 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-preview.7.22330.1 + 7.0.0-preview.7.22361.2 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index f1d9fff9e85..8aaf7d931fe 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -22,6 +22,8 @@ enable true true + + 10 diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets index baa52a204bc..3a0ac1aa7d8 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets @@ -64,7 +64,9 @@ true SdkOnly None - link + + link + partial true android-arm;android-arm64;android-x86;android-x64 diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets index 67d1bbba119..8faee03ab31 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets @@ -28,12 +28,6 @@ This file contains the .NET 5-specific targets to customize ILLink Condition="'$(VSAndroidDesigner)' != ''" Value="$(VSAndroidDesigner)" Trim="true" /> - - diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc index d22c1b133d5..288fa33586b 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc @@ -5,28 +5,28 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 59419 + "Size": 59536 }, "assemblies/Mono.Android.dll": { - "Size": 89327 + "Size": 89397 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Console.dll": { - "Size": 6484 + "Size": 6492 }, "assemblies/System.Linq.dll": { - "Size": 9980 + "Size": 9973 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 532428 + "Size": 533387 }, "assemblies/System.Runtime.dll": { - "Size": 2417 + "Size": 2416 }, "assemblies/UnnamedProject.dll": { - "Size": 3560 + "Size": 3601 }, "classes.dex": { "Size": 360744 @@ -35,19 +35,19 @@ "Size": 512520 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3083112 + "Size": 3084536 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 87768 + "Size": 92800 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 146128 + "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 9528 + "Size": 9552 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 @@ -83,5 +83,5 @@ "Size": 1904 } }, - "PackageSize": 2738143 + "PackageSize": 2742239 } \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc index 3677b930c36..1aab91df882 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc @@ -8,121 +8,121 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 66763 + "Size": 66879 }, "assemblies/Mono.Android.dll": { - "Size": 447517 + "Size": 447679 }, "assemblies/mscorlib.dll": { - "Size": 3899 + "Size": 3888 }, "assemblies/netstandard.dll": { - "Size": 5621 + "Size": 5610 }, "assemblies/rc.bin": { "Size": 1083 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10861 + "Size": 10855 }, "assemblies/System.Collections.dll": { - "Size": 16170 + "Size": 16165 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7955 + "Size": 7949 }, "assemblies/System.ComponentModel.dll": { - "Size": 2021 + "Size": 2013 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2636 + "Size": 2628 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6114 + "Size": 6106 }, "assemblies/System.Console.dll": { - "Size": 6683 + "Size": 7375 }, "assemblies/System.Core.dll": { - "Size": 2063 + "Size": 2052 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6579 + "Size": 6576 }, "assemblies/System.dll": { - "Size": 2417 + "Size": 2406 }, "assemblies/System.Drawing.dll": { - "Size": 2103 + "Size": 2093 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12188 + "Size": 12187 }, "assemblies/System.IO.Compression.dll": { - "Size": 16867 + "Size": 16857 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10055 + "Size": 10056 }, "assemblies/System.Linq.dll": { - "Size": 19806 + "Size": 20029 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 177416 + "Size": 177417 }, "assemblies/System.Net.Http.dll": { - "Size": 66486 + "Size": 66469 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22061 + "Size": 22055 }, "assemblies/System.Net.Requests.dll": { - "Size": 3675 + "Size": 3665 }, "assemblies/System.ObjectModel.dll": { - "Size": 8552 + "Size": 8545 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 815279 + "Size": 823756 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 185005 + "Size": 184961 }, "assemblies/System.Private.Uri.dll": { - "Size": 42683 + "Size": 42651 }, "assemblies/System.Private.Xml.dll": { - "Size": 216493 + "Size": 216481 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16709 + "Size": 16712 }, "assemblies/System.Runtime.dll": { - "Size": 2613 + "Size": 2606 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 2027 + "Size": 2016 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2564 + "Size": 2554 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3840 + "Size": 3833 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7799 + "Size": 7795 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 152582 + "Size": 154177 }, "assemblies/System.Xml.dll": { - "Size": 1918 + "Size": 1907 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1939 + "Size": 1928 }, "assemblies/UnnamedProject.dll": { - "Size": 117250 + "Size": 117277 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5941 @@ -197,19 +197,19 @@ "Size": 512520 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3083112 + "Size": 3084536 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 87768 + "Size": 92800 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 146128 + "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 98952 + "Size": 98976 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -1964,5 +1964,5 @@ "Size": 341228 } }, - "PackageSize": 8073625 + "PackageSize": 8085913 } \ No newline at end of file