From 1645726c50d133e89f3a094f1fa2b48d0e6c1add Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 8 Feb 2025 05:02:06 +0000 Subject: [PATCH 01/13] Update dependencies from https://github.com/dotnet/sdk build 20250207.22 Microsoft.NET.Sdk From Version 10.0.100-preview.1.25106.28 -> To Version 10.0.100-preview.1.25107.22 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3217daf46a3..5b9eaf0dbea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - e1a2886f5628dfdf192225870a62a1d029da68fb + 9f59e2c82b8cf8df8bee604a50e886fe78482702 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 02fae9a1a73..2a792f28f38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25106.28 + 10.0.100-preview.1.25107.22 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25080.5 10.0.0-preview.1.25080.5 From 3cd13e3a566d018199deaae05ad3ccf1c40391d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Feb 2025 05:02:20 +0000 Subject: [PATCH 02/13] Update dependencies from https://github.com/dotnet/sdk build 20250210.2 Microsoft.NET.Sdk From Version 10.0.100-preview.1.25106.28 -> To Version 10.0.100-preview.1.25110.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b9eaf0dbea..c8d86e45bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 9f59e2c82b8cf8df8bee604a50e886fe78482702 + 014e3fbe988739794492665e849e25bb8e8221e2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a792f28f38..9561fb24c75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25107.22 + 10.0.100-preview.1.25110.2 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25080.5 10.0.0-preview.1.25080.5 From dd86ab73bd3c15c33c8607adcca6c49c967d89b7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 11 Feb 2025 09:03:29 -0600 Subject: [PATCH 03/13] Suppress `NU1510` in a few places Context: https://github.com/NuGet/NuGet.Client/pull/6239 .NET 10 Preview 1 enables `$(RestoreEnablePackagePruning)=true` by default. This produces multiple warnings as errors in dotnet/android: src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Xamarin.ProjectTools.csproj : warning NU1510: PackageReference System.Formats.Asn1 will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Xamarin.ProjectTools.csproj : warning NU1510: PackageReference Microsoft.Win32.Registry will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. src\Xamarin.Android.Build.Tasks\Tests\Xamarin.Android.Build.Tests\Xamarin.Android.Build.Tests.csproj : warning NU1510: PackageReference System.Formats.Asn1 will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj : warning NU1510: PackageReference System.Buffers will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. external\debugger-libs\Mono.Debugging\Mono.Debugging.csproj : warning NU1510: PackageReference System.Collections.Immutable will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj : warning NU1510: PackageReference System.Runtime will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. external\debugger-libs\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj : warning NU1510: PackageReference System.Reflection.Metadata will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. tests\MSBuildDeviceIntegration\MSBuildDeviceIntegration.csproj : warning NU1510: PackageReference System.Formats.Asn1 will not be pruned. Consider removing this package from your dependencies, as it is likely unnecessary. --- external/Java.Interop.override.props | 2 ++ external/debugger-libs.override.props | 2 ++ .../Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj | 3 ++- .../Xamarin.Android.Build.Tasks.csproj | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index ad655e1986b..adcc574c56c 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -1,6 +1,8 @@ + + true $(MSBuildThisFileDirectory)xamarin-android-tools True diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props index 6a5165d7a76..3148abde274 100644 --- a/external/debugger-libs.override.props +++ b/external/debugger-libs.override.props @@ -1,5 +1,7 @@ + + true true diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj index 5109e4beef7..beb61d22655 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj @@ -9,6 +9,8 @@ $(NoWarn);CA1305 <_IncludeMicrosoftBuildPackage>true annotations + + true @@ -28,7 +30,6 @@ - {E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index 9586df6e7c1..fa1e6d9c76c 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -23,6 +23,8 @@ $(NoWarn);CA1310;CA1305 Nullable + + true From 81a4d1ac11afc863e14522a46bc70c2a54832d65 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 11 Feb 2025 11:06:13 -0600 Subject: [PATCH 04/13] RestoreEnablePackagePruning --- external/debugger-libs | 2 +- external/debugger-libs.override.props | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/external/debugger-libs b/external/debugger-libs index d56643445cf..2aba417c9f2 160000 --- a/external/debugger-libs +++ b/external/debugger-libs @@ -1 +1 @@ -Subproject commit d56643445cfc6ed312cfc100be915be401396132 +Subproject commit 2aba417c9f206a706f8c42248e95b0eafa57e8e3 diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props index 3148abde274..6a5165d7a76 100644 --- a/external/debugger-libs.override.props +++ b/external/debugger-libs.override.props @@ -1,7 +1,5 @@ - - true true From a482cfe143da4d83fbbda8a2b0098ab939de098c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 11 Feb 2025 11:19:52 -0600 Subject: [PATCH 05/13] Update debugger-libs --- external/debugger-libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/debugger-libs b/external/debugger-libs index 2aba417c9f2..e9c0d631f82 160000 --- a/external/debugger-libs +++ b/external/debugger-libs @@ -1 +1 @@ -Subproject commit 2aba417c9f206a706f8c42248e95b0eafa57e8e3 +Subproject commit e9c0d631f826334bcf31c587974a37fb429a0635 From c71553e4be809404ca38274614398477ac4bd570 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 11 Feb 2025 15:06:13 -0600 Subject: [PATCH 06/13] Update Java.Interop --- external/Java.Interop | 2 +- external/Java.Interop.override.props | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/external/Java.Interop b/external/Java.Interop index e288589d92a..57f7bc849f3 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit e288589d92afc9edd9070638ebed72f67e310117 +Subproject commit 57f7bc849f36ec7c3159cc7729c7276b8dcd3ca4 diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index adcc574c56c..ad655e1986b 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -1,8 +1,6 @@ - - true $(MSBuildThisFileDirectory)xamarin-android-tools True From bd6daad402be87138999fb6a11060e0d10148bd2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 11 Feb 2025 15:06:55 -0600 Subject: [PATCH 07/13] Update debugger-libs --- external/debugger-libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/debugger-libs b/external/debugger-libs index e9c0d631f82..c0353072de4 160000 --- a/external/debugger-libs +++ b/external/debugger-libs @@ -1 +1 @@ -Subproject commit e9c0d631f826334bcf31c587974a37fb429a0635 +Subproject commit c0353072de4a6cd4813964a0536c48df3e9ceb4e From 3fb5b8d9040f72193a76f77b464e70fc4771e644 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Tue, 11 Feb 2025 15:26:33 -1000 Subject: [PATCH 08/13] Bump to dotnet/java-interop/main@57f7bc84 (#9724) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: https://github.com/dotnet/java-interop/compare/6bc87e8b55bc00ae1423a5ae92cf5db573fc76ed...57f7bc849f36ec7c3159cc7729c7276b8dcd3ca4 * dotnet/java-interop@57f7bc84: [generator] Avoid non-blittable types in native callback methods (dotnet/java-interop#1296) * dotnet/java-interop@9369d4fd: [tests] fix `NU1510` warning as error (dotnet/java-interop#1306) Context: https://github.com/dotnet/java-interop/commit/57f7bc849f36ec7c3159cc7729c7276b8dcd3ca4 Context: https://github.com/dotnet/java-interop/issues/1027 dotnet/java-interop@57f7bc84 updated `generator --codegen-target=XAJavaInterop1` marshal methods to contain only blittable types in parameter and return types. Instead of `bool`, use `sbyte`; instead of `char`, use `ushort`. This change causes warnings when `MarshalMethodsClassifier` verifies that the marshal types match the native types: …/Xamarin.Android.Common.targets(1502,3): Method 'System.SByte Java.Lang.Object::n_Equals_Ljava_lang_Object_(System.IntPtr,System.IntPtr,System.IntPtr)' doesn't match native callback signature (invalid return type: expected 'System.Boolean', found 'System.SByte') …/Xamarin.Android.Common.targets(1502,3): Unable to find native callback method 'n_Equals_Ljava_lang_Object_' in type 'Java.Lang.Object', matching the 'System.Boolean Java.Lang.Object::Equals(Java.Lang.Object)' signature (jniName: 'equals') [Arch: X86_64; Assembly: obj/Release/android-x64/linked/Mono.Android.dll] …/Xamarin.Android.Common.targets(1502,3): Method 'System.Boolean Java.Lang.Object::Equals(Java.Lang.Object)' will be registered dynamically [Arch: X86_64; Assembly: obj/Release/android-x64/linked/Mono.Android.dll] …/Xamarin.Android.Common.targets(1502,3): Method 'System.SByte Java.Lang.Object::n_Equals_Ljava_lang_Object_(System.IntPtr,System.IntPtr,System.IntPtr)' doesn't match native callback signature (invalid return type: expected 'System.Boolean', found 'System.SByte') …/Xamarin.Android.Common.targets(1502,3): Unable to find native callback method 'n_Equals_Ljava_lang_Object_' in type 'Java.Lang.Object', matching the 'System.Boolean Java.Lang.Object::Equals(Java.Lang.Object)' signature (jniName: 'equals') [Arch: Arm64; Assembly: obj/Release/android-arm64/linked/Mono.Android.dll] …/Xamarin.Android.Common.targets(1502,3): Method 'System.Boolean Java.Lang.Object::Equals(Java.Lang.Object)' will be registered dynamically [Arch: Arm64; Assembly: obj/Release/android-arm64/linked/Mono.Android.dll] …/Xamarin.Android.Common.targets(1502,3): Type 'Android.Runtime.JavaObject, Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065' will register some of its Java override methods dynamically. This may adversely affect runtime performance. See preceding warnings for names of dynamically registered methods. …/Xamarin.Android.Common.targets(1502,3): [Arm64] Number of methods in the project that will be registered dynamically: 1 …/Xamarin.Android.Common.targets(1502,3): [X86_64] Number of methods in the project that will be registered dynamically: 1 These warnings occur because the marshal method signature now differs from the public API signature. Consider: namespace Java.Lang; partial class Object { static sbyte n_Equals_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_obj) => … [Register ("equals", "(Ljava/lang/Object;)Z", "GetEquals_Ljava_lang_Object_Handler")] public virtual unsafe bool Equals (Java.Lang.Object? obj) => … } `MarshalMethodsClassifier` uses the 3rd `connector` parameter to `RegisterAttribute` to determine the name of the marshal method -- string processing `GetEquals_Ljava_lang_Object_Handler` to obtain `n_Equals_Ljava_lang_Object_` -- and then checks that the parameter and return types match between the two methods. Now that we're emitting blittable types, they *don't* match, thus the warning. Fix this by treating our blittable types as equivalent to their native types in `MarshalMethodsClassifier`. Additionally, `Mono.Android` has "built-in delegates" that marshal `bool` types, e.g. `_JniMarshal_PP_Z`. Because `generator` no longer creates these delegates -- it will now create `_JniMarshal_PP_B` instead -- we need to add them manually. --- .../Android.Runtime/ExtraDelegates.cs | 30 +++++++++++++++++++ src/Mono.Android/Mono.Android.csproj | 1 + .../Utilities/MarshalMethodsClassifier.cs | 27 +++++++++++++++-- 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 src/Mono.Android/Android.Runtime/ExtraDelegates.cs diff --git a/src/Mono.Android/Android.Runtime/ExtraDelegates.cs b/src/Mono.Android/Android.Runtime/ExtraDelegates.cs new file mode 100644 index 00000000000..26101d9a2ea --- /dev/null +++ b/src/Mono.Android/Android.Runtime/ExtraDelegates.cs @@ -0,0 +1,30 @@ +// There are built-in delegates for these, but we no longer generate them in Mono.Android.dll +// because bool is not a blittable type. But we still need them for pre-existing bindings. +using System; + +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PP_Z (IntPtr jnienv, IntPtr klass); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPL_Z (IntPtr jnienv, IntPtr klass, IntPtr p0); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPJ_Z (IntPtr jnienv, IntPtr klass, long p0); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate void _JniMarshal_PPLZ_V (IntPtr jnienv, IntPtr klass, IntPtr p0, bool p1); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPLL_Z (IntPtr jnienv, IntPtr klass, IntPtr p0, IntPtr p1); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPIL_Z (IntPtr jnienv, IntPtr klass, int p0, IntPtr p1); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPLII_Z (IntPtr jnienv, IntPtr klass, IntPtr p0, int p1, int p2); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPLLJ_Z (IntPtr jnienv, IntPtr klass, IntPtr p0, IntPtr p1, long p2); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPLIL_Z (IntPtr jnienv, IntPtr klass, IntPtr p0, int p1, IntPtr p2); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPLLL_Z (IntPtr jnienv, IntPtr klass, IntPtr p0, IntPtr p1, IntPtr p2); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate IntPtr _JniMarshal_PPIZI_L (IntPtr jnienv, IntPtr klass, int p0, bool p1, int p2); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate bool _JniMarshal_PPLZZL_Z (IntPtr jnienv, IntPtr klass, IntPtr p0, bool p1, bool p2, IntPtr p3); +[global::System.Runtime.InteropServices.UnmanagedFunctionPointer (global::System.Runtime.InteropServices.CallingConvention.Winapi)] +delegate void _JniMarshal_PPZIIII_V (IntPtr jnienv, IntPtr klass, bool p0, int p1, int p2, int p3, int p4); diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index 093a6d6a8ac..6c409057f53 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -96,6 +96,7 @@ + diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs index 1507084dfc0..211baaf0948 100644 --- a/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs +++ b/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsClassifier.cs @@ -208,7 +208,7 @@ public bool Matches (MethodDefinition method) return false; } - if (String.Compare (returnType, method.ReturnType.FullName, StringComparison.Ordinal) != 0) { + if (!TypeMatches (returnType, method.ReturnType.FullName)) { log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature (invalid return type: expected '{returnType}', found '{method.ReturnType.FullName}')"); return false; } @@ -223,7 +223,7 @@ public bool Matches (MethodDefinition method) parameterTypeName = pd.ParameterType.FullName; } - if (String.Compare (parameterTypeName, paramTypes[i], StringComparison.Ordinal) != 0) { + if (!TypeMatches (parameterTypeName, paramTypes[i])) { log.LogWarning ($"Method '{method.FullName}' doesn't match native callback signature, expected parameter type '{paramTypes[i]}' at position {i}, found '{parameterTypeName}'"); return false; } @@ -231,6 +231,29 @@ public bool Matches (MethodDefinition method) return true; } + + // Because these types are marshaled as different blittable types, + // we need to accept them as equivalent + static readonly (string Source, string Replacement)[] equivalent_types = [ + (Source: "System.Boolean", Replacement: "System.SByte"), + (Source: "System.Char", Replacement: "System.UInt16"), + ]; + + static bool TypeMatches (string type, string methodType) + { + if (String.Compare (type, methodType, StringComparison.Ordinal) == 0) + return true; + + foreach (var eq in equivalent_types) { + if (string.Compare (eq.Source, type, StringComparison.Ordinal) == 0 && string.Compare (eq.Replacement, methodType, StringComparison.Ordinal) == 0) + return true; + + if (string.Compare (eq.Source, methodType, StringComparison.Ordinal) == 0 && string.Compare (eq.Replacement, type, StringComparison.Ordinal) == 0) + return true; + } + + return false; + } } TypeDefinitionCache tdCache; From 7d91861fa35a000e7579941d2fa105327f1c87d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2025 05:01:57 +0000 Subject: [PATCH 09/13] Update dependencies from https://github.com/dotnet/sdk build 20250210.21 Microsoft.NET.Sdk From Version 10.0.100-preview.1.25106.28 -> To Version 10.0.100-preview.1.25110.21 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8d86e45bc7..9b90b1a7e9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 014e3fbe988739794492665e849e25bb8e8221e2 + d1382d9b07310de51feef4b00ab46e9648cb9919 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9561fb24c75..97174797703 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25110.2 + 10.0.100-preview.1.25110.21 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25080.5 10.0.0-preview.1.25080.5 From aea6ec64b51ce676fdff107fc5ca1a1a2832adb0 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 12 Feb 2025 10:25:06 -0600 Subject: [PATCH 10/13] Update BuildTest.cs --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 1 - 1 file changed, 1 deletion(-) 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 48c1ed3685b..5f3188499f7 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 @@ -41,7 +41,6 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo 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", "Resource.resx") { From b23bc7e0f96b7ea67f48685feb2417aa7ab5a4a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Feb 2025 05:02:03 +0000 Subject: [PATCH 11/13] Update dependencies from https://github.com/dotnet/sdk build 20250212.18 Microsoft.NET.Sdk From Version 10.0.100-preview.1.25106.28 -> To Version 10.0.100-preview.1.25112.18 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b90b1a7e9c..41ad4f83d46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - d1382d9b07310de51feef4b00ab46e9648cb9919 + 854cc61f42d7ff8006b4f21f48e6db3b260083c2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 97174797703..09f383c6f3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25110.21 + 10.0.100-preview.1.25112.18 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25080.5 10.0.0-preview.1.25080.5 From 8b5977ca722567ffe2d7c2890ca104da5cc8e833 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Feb 2025 05:01:54 +0000 Subject: [PATCH 12/13] Update dependencies from https://github.com/dotnet/sdk build 20250219.17 Microsoft.NET.Sdk From Version 10.0.100-preview.1.25106.28 -> To Version 10.0.100-preview.1.25119.17 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41ad4f83d46..39479f1b8d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 854cc61f42d7ff8006b4f21f48e6db3b260083c2 + 3031aa88a71f7cf56cf27e563c05e8f1bb844cac https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 09f383c6f3c..2b4c4038956 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25112.18 + 10.0.100-preview.1.25119.17 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25080.5 10.0.0-preview.1.25080.5 From 71769826678a63c24198517a4c9b7847f37eb0d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Feb 2025 05:01:30 +0000 Subject: [PATCH 13/13] Update dependencies from https://github.com/dotnet/sdk build 20250220.13 Microsoft.NET.Sdk From Version 10.0.100-preview.1.25106.28 -> To Version 10.0.100-preview.1.25120.13 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39479f1b8d8..89dfd5bbe35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 3031aa88a71f7cf56cf27e563c05e8f1bb844cac + ba56a9974738e0462269bfbcd89360d8a5064402 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2b4c4038956..602c803f25d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25119.17 + 10.0.100-preview.1.25120.13 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25080.5 10.0.0-preview.1.25080.5