diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eba2bd4320e..0e38f44e100 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - - https://github.com/dotnet/installer - 1741345c6399ae203d8f259fb12fb873dac5129d + + https://github.com/dotnet/sdk + ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/emsdk - 53288f87c588907e8ff01f129786820fe998573c + 9880d891ddfddee1b1182c149468a43b89c090a0 - + https://github.com/dotnet/cecil - 7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8 + d145726036eb9c09a0e3cf03c4f70effd3b31cd7 diff --git a/eng/Versions.props b/eng/Versions.props index 210084f8a72..1607ccd3090 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,16 +2,16 @@ - 9.0.100-preview.5.24262.2 + 9.0.100-preview.7.24323.5 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.6.24319.11 + 9.0.0-preview.6.24319.11 7.0.0-beta.22103.1 8.0.0-beta.24225.1 - 9.0.0-preview.5.24223.2 + 9.0.0-preview.6.24317.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24230.1 + 0.11.4-alpha.24313.1 $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index f76ef5ed22a..e42436ada2d 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -38,10 +38,10 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo PackageReferences = { new Package { Id = "Xamarin.AndroidX.AppCompat", Version = "1.3.1.1" }, // Using * here, so we explicitly get newer packages - new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "6.0.0-*" }, - new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "6.0.0-*" }, - new Package { Id = "Microsoft.JSInterop", Version = "6.0.0-*" }, - new Package { Id = "System.Text.Json", Version = "6.0.0-*" }, + new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "8.0.*" }, + new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "8.0.*" }, + new Package { Id = "Microsoft.JSInterop", Version = "8.0.*" }, + new Package { Id = "System.Text.Json", Version = "8.0.*" }, }, Sources = { new BuildItem ("EmbeddedResource", "Foo.resx") { 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 4bf05607623..0945b8428d2 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,49 +5,49 @@ "Size": 3036 }, "classes.dex": { - "Size": 19476 + "Size": 22488 }, "lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": { "Size": 1027 }, "lib/arm64-v8a/lib_Java.Interop.dll.so": { - "Size": 64655 + "Size": 64653 }, "lib/arm64-v8a/lib_Mono.Android.dll.so": { - "Size": 92217 + "Size": 92659 }, "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": { - "Size": 5320 + "Size": 5394 }, "lib/arm64-v8a/lib_System.Console.dll.so": { - "Size": 6541 + "Size": 6512 }, "lib/arm64-v8a/lib_System.Linq.dll.so": { - "Size": 8524 + "Size": 8489 }, "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": { - "Size": 571267 + "Size": 575506 }, "lib/arm64-v8a/lib_System.Runtime.dll.so": { - "Size": 2544 + "Size": 2554 }, "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": { - "Size": 4020 + "Size": 3999 }, "lib/arm64-v8a/lib_UnnamedProject.dll.so": { - "Size": 2931 + "Size": 2934 }, "lib/arm64-v8a/libarc.bin.so": { "Size": 1586 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 87352 + "Size": 87432 }, "lib/arm64-v8a/libmonodroid.so": { "Size": 492104 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3154304 + "Size": 3163208 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { "Size": 67248 @@ -56,13 +56,13 @@ "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 95296 + "Size": 95680 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 155568 + "Size": 159544 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 17952 + "Size": 17984 }, "META-INF/BNDLTOOL.RSA": { "Size": 1223 @@ -98,5 +98,5 @@ "Size": 1904 } }, - "PackageSize": 2681365 + "PackageSize": 2693653 } \ 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 0ff5edd31a0..2570efeba27 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 @@ -5,7 +5,7 @@ "Size": 6652 }, "classes.dex": { - "Size": 9170480 + "Size": 9173020 }, "kotlin/annotation/annotation.kotlin_builtins": { "Size": 928 @@ -35,130 +35,133 @@ "Size": 8330 }, "lib/arm64-v8a/lib_Java.Interop.dll.so": { - "Size": 72813 + "Size": 72814 }, "lib/arm64-v8a/lib_Mono.Android.dll.so": { - "Size": 458967 + "Size": 459203 }, "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": { - "Size": 5320 + "Size": 5392 }, "lib/arm64-v8a/lib_mscorlib.dll.so": { - "Size": 3989 + "Size": 4000 }, "lib/arm64-v8a/lib_netstandard.dll.so": { - "Size": 5623 + "Size": 5634 }, "lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": { - "Size": 11517 + "Size": 11901 }, "lib/arm64-v8a/lib_System.Collections.dll.so": { - "Size": 15411 + "Size": 15960 }, "lib/arm64-v8a/lib_System.Collections.NonGeneric.dll.so": { - "Size": 7438 + "Size": 7964 + }, + "lib/arm64-v8a/lib_System.Collections.Specialized.dll.so": { + "Size": 5896 }, "lib/arm64-v8a/lib_System.ComponentModel.dll.so": { - "Size": 1932 + "Size": 1943 }, "lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": { - "Size": 2547 + "Size": 3632 }, "lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": { - "Size": 6082 + "Size": 22409 }, "lib/arm64-v8a/lib_System.Console.dll.so": { - "Size": 6573 + "Size": 6542 }, "lib/arm64-v8a/lib_System.Core.dll.so": { - "Size": 1968 + "Size": 1977 }, "lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": { - "Size": 9059 + "Size": 9493 }, "lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": { - "Size": 6544 + "Size": 7009 }, "lib/arm64-v8a/lib_System.dll.so": { - "Size": 2325 + "Size": 2371 }, "lib/arm64-v8a/lib_System.Drawing.dll.so": { - "Size": 1930 + "Size": 1942 }, "lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": { - "Size": 11962 + "Size": 11940 }, "lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": { - "Size": 11143 + "Size": 11627 }, "lib/arm64-v8a/lib_System.IO.Compression.dll.so": { - "Size": 15861 + "Size": 15753 }, "lib/arm64-v8a/lib_System.IO.IsolatedStorage.dll.so": { - "Size": 9901 + "Size": 10293 }, "lib/arm64-v8a/lib_System.Linq.dll.so": { - "Size": 20210 + "Size": 20088 }, "lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": { - "Size": 164581 + "Size": 164366 }, "lib/arm64-v8a/lib_System.Net.Http.dll.so": { - "Size": 68045 + "Size": 68333 }, "lib/arm64-v8a/lib_System.Net.Primitives.dll.so": { - "Size": 22265 + "Size": 22619 }, "lib/arm64-v8a/lib_System.Net.Requests.dll.so": { - "Size": 3586 + "Size": 3597 }, "lib/arm64-v8a/lib_System.ObjectModel.dll.so": { - "Size": 8561 + "Size": 9090 }, "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": { - "Size": 876073 + "Size": 879691 }, "lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": { - "Size": 193452 + "Size": 192540 }, "lib/arm64-v8a/lib_System.Private.Uri.dll.so": { - "Size": 42907 + "Size": 43081 }, "lib/arm64-v8a/lib_System.Private.Xml.dll.so": { - "Size": 216091 + "Size": 215206 }, "lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": { - "Size": 16621 + "Size": 17138 }, "lib/arm64-v8a/lib_System.Runtime.dll.so": { - "Size": 2700 + "Size": 2708 }, "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": { - "Size": 4020 + "Size": 3999 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": { - "Size": 1856 + "Size": 1867 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": { - "Size": 2477 + "Size": 2531 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": { - "Size": 3749 + "Size": 3761 }, "lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": { - "Size": 8447 + "Size": 8770 }, "lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": { - "Size": 161293 + "Size": 161067 }, "lib/arm64-v8a/lib_System.Xml.dll.so": { - "Size": 1752 + "Size": 1763 }, "lib/arm64-v8a/lib_System.Xml.Linq.dll.so": { - "Size": 1767 + "Size": 1781 }, "lib/arm64-v8a/lib_UnnamedProject.dll.so": { - "Size": 4998 + "Size": 5007 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.Activity.dll.so": { "Size": 16323 @@ -233,13 +236,13 @@ "Size": 1586 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 87352 + "Size": 87432 }, "lib/arm64-v8a/libmonodroid.so": { "Size": 492104 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3154304 + "Size": 3163208 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { "Size": 67248 @@ -248,13 +251,13 @@ "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 95296 + "Size": 95680 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 155568 + "Size": 159544 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 348336 + "Size": 348544 }, "META-INF/androidx.activity_activity.version": { "Size": 6 @@ -407,10 +410,10 @@ "Size": 6 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1223 + "Size": 1221 }, "META-INF/BNDLTOOL.SF": { - "Size": 98214 + "Size": 98341 }, "META-INF/com.android.tools/proguard/coroutines.pro": { "Size": 1345 @@ -437,7 +440,7 @@ "Size": 5 }, "META-INF/MANIFEST.MF": { - "Size": 98087 + "Size": 98214 }, "META-INF/maven/com.google.guava/listenablefuture/pom.properties": { "Size": 96 @@ -2477,5 +2480,5 @@ "Size": 812848 } }, - "PackageSize": 10238958 + "PackageSize": 10267731 } \ No newline at end of file diff --git a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs index 33132c9479e..ca85dceabeb 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs +++ b/tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs @@ -181,6 +181,7 @@ public void VirtualMethodBinding () } [Test] + [Ignore("https://github.com/dotnet/runtime/issues/103987")] [RequiresUnreferencedCode ("Tests trimming unsafe features")] public void JavaAbstractMethodTest () {