diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea821c55308..7a709ce814d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 84d26a070704dc4eb7870f15d44880228bb82cb8 + 2d1a4de6b2da59647a9538bf9cc4e252847e6231 - + https://github.com/dotnet/linker - 6252a2194dd32911db2c0669fc818555687d5570 + 313671b195b1b36d56a8888a9a0e12edaac52c57 - + https://github.com/dotnet/runtime - f52d8c59bb49360eb2cbeeb863c5856ebd62adda + ef077d0b58ffddcf54fa73bd85dace6b999b8992 - + https://github.com/dotnet/emsdk - 7b2cd1ee7169143248a7da9fd749caf22affa624 + 216093204c415b6e37dfadfcbcf183881b443636 diff --git a/eng/Versions.props b/eng/Versions.props index e73f70f368c..c8d53890c6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-rc.2.22419.24 - 7.0.100-1.22415.4 - 7.0.0-rc.1.22411.12 + 7.0.100-rc.2.22426.5 + 7.0.100-1.22423.4 + 7.0.0-rc.1.22422.12 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-rc.1.22368.1 + 7.0.0-rc.1.22411.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 7.0.100-rc.1.22410.7 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs index e9a50539a9b..6a4b9917b44 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs @@ -93,6 +93,14 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto "System.Runtime.dll", "System.Linq.dll", "UnnamedProject.dll", + //NOTE: appeared in .NET 7.0.100-rc.1.22423.7 + "System.Diagnostics.Tracing.dll", + "System.Memory.dll", + "System.Runtime.InteropServices.dll", + "System.Threading.Thread.dll", + "System.Threading.ThreadPool.dll", + "System.Threading.dll", + "System.Transactions.Local.dll", } : new [] { "Java.Interop.dll", 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 068915f853b..b5d822f4fd6 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,10 +5,10 @@ "Size": 3032 }, "assemblies/Java.Interop.dll": { - "Size": 58665 + "Size": 59092 }, "assemblies/Mono.Android.dll": { - "Size": 87971 + "Size": 88614 }, "assemblies/rc.bin": { "Size": 1182 @@ -16,29 +16,50 @@ "assemblies/System.Console.dll": { "Size": 6404 }, + "assemblies/System.Diagnostics.Tracing.dll": { + "Size": 2085 + }, "assemblies/System.Linq.dll": { "Size": 9092 }, + "assemblies/System.Memory.dll": { + "Size": 3384 + }, "assemblies/System.Private.CoreLib.dll": { - "Size": 462335 + "Size": 533637 }, "assemblies/System.Runtime.dll": { - "Size": 2375 + "Size": 3496 + }, + "assemblies/System.Runtime.InteropServices.dll": { + "Size": 3738 + }, + "assemblies/System.Threading.dll": { + "Size": 5482 + }, + "assemblies/System.Threading.Thread.dll": { + "Size": 1977 + }, + "assemblies/System.Threading.ThreadPool.dll": { + "Size": 2007 + }, + "assemblies/System.Transactions.Local.dll": { + "Size": 62995 }, "assemblies/UnnamedProject.dll": { "Size": 3560 }, "classes.dex": { - "Size": 360744 + "Size": 360720 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { "Size": 96832 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 425336 + "Size": 425416 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3052320 + "Size": 3052824 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -50,16 +71,16 @@ "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 9784 + "Size": 10512 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 2690 + "Size": 3459 }, "META-INF/MANIFEST.MF": { - "Size": 2563 + "Size": 3332 }, "res/drawable-hdpi-v4/icon.png": { "Size": 4762 @@ -86,5 +107,5 @@ "Size": 1904 } }, - "PackageSize": 2664509 + "PackageSize": 2820744 } \ 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 8804f9c369c..0add4dbcdea 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,142 @@ "Size": 7114 }, "assemblies/Java.Interop.dll": { - "Size": 66533 + "Size": 66665 }, "assemblies/Mono.Android.dll": { - "Size": 441958 + "Size": 442077 }, "assemblies/mscorlib.dll": { - "Size": 3857 + "Size": 3859 }, "assemblies/netstandard.dll": { - "Size": 5570 + "Size": 5569 }, "assemblies/rc.bin": { "Size": 1182 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 10479 + "Size": 10480 }, "assemblies/System.Collections.dll": { - "Size": 15299 + "Size": 15300 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7429 + "Size": 7427 }, "assemblies/System.ComponentModel.dll": { - "Size": 1939 + "Size": 1940 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2551 + "Size": 2552 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6030 + "Size": 6031 }, "assemblies/System.Console.dll": { - "Size": 7294 + "Size": 7265 }, "assemblies/System.Core.dll": { - "Size": 1983 + "Size": 1985 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6549 + "Size": 6542 + }, + "assemblies/System.Diagnostics.Tracing.dll": { + "Size": 2085 }, "assemblies/System.dll": { - "Size": 2340 + "Size": 2341 }, "assemblies/System.Drawing.dll": { - "Size": 2024 + "Size": 2025 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 11963 + "Size": 11967 }, "assemblies/System.IO.Compression.dll": { - "Size": 16658 + "Size": 16669 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9991 + "Size": 9989 }, "assemblies/System.Linq.dll": { - "Size": 19133 + "Size": 19137 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 163893 + "Size": 163885 + }, + "assemblies/System.Memory.dll": { + "Size": 3384 }, "assemblies/System.Net.Http.dll": { - "Size": 65957 + "Size": 66833 }, "assemblies/System.Net.Primitives.dll": { - "Size": 21873 + "Size": 21877 }, "assemblies/System.Net.Requests.dll": { - "Size": 3599 + "Size": 3601 }, "assemblies/System.ObjectModel.dll": { - "Size": 8103 + "Size": 8101 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 769737 + "Size": 786590 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 184912 + "Size": 192243 }, "assemblies/System.Private.Uri.dll": { - "Size": 42214 + "Size": 42215 }, "assemblies/System.Private.Xml.dll": { - "Size": 215291 + "Size": 215337 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16633 + "Size": 16628 }, "assemblies/System.Runtime.dll": { - "Size": 2578 + "Size": 3645 + }, + "assemblies/System.Runtime.InteropServices.dll": { + "Size": 3738 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1948 + "Size": 1949 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2477 + "Size": 2479 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3756 + "Size": 3758 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7785 + "Size": 7786 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 153833 + "Size": 154123 + }, + "assemblies/System.Threading.dll": { + "Size": 5482 + }, + "assemblies/System.Threading.Thread.dll": { + "Size": 1977 + }, + "assemblies/System.Threading.ThreadPool.dll": { + "Size": 2007 + }, + "assemblies/System.Transactions.Local.dll": { + "Size": 62995 }, "assemblies/System.Xml.dll": { - "Size": 1836 + "Size": 1837 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1857 + "Size": 1858 }, "assemblies/UnnamedProject.dll": { - "Size": 117251 + "Size": 117252 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5872 @@ -191,16 +212,16 @@ "Size": 39911 }, "classes.dex": { - "Size": 3473216 + "Size": 3473196 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { "Size": 96832 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 425336 + "Size": 425416 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3052320 + "Size": 3052824 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -212,7 +233,7 @@ "Size": 148696 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 99208 + "Size": 99936 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -326,13 +347,13 @@ "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 78979 + "Size": 79748 }, "META-INF/com.google.android.material_material.version": { "Size": 10 }, "META-INF/MANIFEST.MF": { - "Size": 78852 + "Size": 79621 }, "META-INF/proguard/androidx-annotations.pro": { "Size": 339 @@ -1967,5 +1988,5 @@ "Size": 341228 } }, - "PackageSize": 7995895 + "PackageSize": 8107074 } \ No newline at end of file