From 5accbc5e2a874a11a298147e6858dd4e9eccde82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Apr 2023 15:32:15 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/installer build 20230427.3 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.4.23224.14 -> To Version 8.0.100-preview.5.23227.3 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 8.0.0-preview.4.23221.1 -> To Version 8.0.0-preview.4.23225.14 (parent: Microsoft.Dotnet.Sdk.Internal --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e95fa3c35d1..d7fbad9579c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - f876fb51a4fb6bc4b8db13d05e88e846ae1dad21 + ec53a09bd8a975f07c298689bc709e280e18a70f - + https://github.com/dotnet/runtime - ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff + 9a7db5556f4ad892c611b2e174594db17fdec3af - + https://github.com/dotnet/runtime - ab2b80d06dd4d997df5ffa72a3c4a99cb36ccbff + 9a7db5556f4ad892c611b2e174594db17fdec3af - + https://github.com/dotnet/emsdk - 2327f6b63d887979222f5bcf15f3322f800b9695 + 31a4a877360713c4345ce48662e5baeeadfda898 - + https://github.com/dotnet/cecil - 9a7551fa7ba8218affbc1148eabc4b5c9f4e1151 + 80d3f38fc59c351fa1942209e66f54a6fc912deb diff --git a/eng/Versions.props b/eng/Versions.props index 9a5edd497d7..45e28f88b13 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-preview.4.23224.14 - 8.0.0-preview.4.23221.1 - 8.0.0-preview.4.23221.1 + 8.0.100-preview.5.23227.3 + 8.0.0-preview.4.23225.14 + 8.0.0-preview.4.23225.14 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-preview.4.23218.1 + 8.0.0-preview.4.23219.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23178.1 + 0.11.4-alpha.23218.2 $(MicrosoftNETCoreAppRefPackageVersion) From 510775a7617387fd55ec9fb6723155e717700ffd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 May 2023 12:51:17 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/installer build 20230428.7 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-preview.4.23224.14 -> To Version 8.0.100-preview.5.23228.7 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 8.0.0-preview.4.23221.1 -> To Version 8.0.0-preview.4.23225.14 (parent: Microsoft.Dotnet.Sdk.Internal --- 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 d7fbad9579c..c978fc8f66d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - ec53a09bd8a975f07c298689bc709e280e18a70f + 0ce891843a4ee251d356cd429c596ba25ee15dc3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 45e28f88b13..d4a3c25a03e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-preview.5.23227.3 + 8.0.100-preview.5.23228.7 8.0.0-preview.4.23225.14 8.0.0-preview.4.23225.14 7.0.0-beta.22103.1 From 7ddeeb133a5b725ec8c5db7b351aeeee9402b19d Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 1 May 2023 11:16:59 -0500 Subject: [PATCH 3/4] Add exclusion for `libSystem.Globalization.Native.so` --- .../targets/Microsoft.Android.Sdk.AssemblyResolution.targets | 2 ++ .../Tasks/ProcessNativeLibraries.cs | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets index 51a009bd776..d903fd1fe7f 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets @@ -216,9 +216,11 @@ _ResolveAssemblies MSBuild target. <_MonoComponent Condition=" '$(AndroidUseInterpreter)' == 'true' " Include="hot_reload" /> <_MonoComponent Condition=" '$(AndroidIncludeDebugSymbols)' == 'true' " Include="debugger" /> <_MonoComponent Condition=" '$(_AndroidExcludeMarshalIlgenComponent)' != 'true' " Include="marshal-ilgen" /> + <_MonoExcludedLibraries Condition=" '$(_AndroidIncludeSystemGlobalizationNative)' != 'true' " Include="libSystem.Globalization.Native" /> diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs index f853c2c98b2..a39c89f2a40 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using Microsoft.Build.Framework; using Microsoft.Android.Build.Tasks; @@ -26,6 +27,7 @@ public class ProcessNativeLibraries : AndroidTask /// public ITaskItem [] InputLibraries { get; set; } public ITaskItem [] Components { get; set; } + public string [] ExcludedLibraries { get; set; } public bool IncludeDebugSymbols { get; set; } @@ -80,6 +82,9 @@ public override bool RunTask () if (!wantedComponents.Contains (fileName)) { continue; } + } else if (ExcludedLibraries != null && ExcludedLibraries.Contains (fileName)) { + Log.LogDebugMessage ($"Excluding '{library.ItemSpec}'"); + continue; } output.Add (library); From f71b443105da1b8dfbf8bc74acbaa514c7e05619 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 2 May 2023 11:03:24 -0500 Subject: [PATCH 4/4] PR feedback --- .../targets/Microsoft.Android.Sdk.AssemblyResolution.targets | 1 + src/Xamarin.Android.Build.Tasks/Tasks/ProcessNativeLibraries.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets index d903fd1fe7f..d7883d600d2 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.AssemblyResolution.targets @@ -216,6 +216,7 @@ _ResolveAssemblies MSBuild target. <_MonoComponent Condition=" '$(AndroidUseInterpreter)' == 'true' " Include="hot_reload" /> <_MonoComponent Condition=" '$(AndroidIncludeDebugSymbols)' == 'true' " Include="debugger" /> <_MonoComponent Condition=" '$(_AndroidExcludeMarshalIlgenComponent)' != 'true' " Include="marshal-ilgen" /> + <_MonoExcludedLibraries Condition=" '$(_AndroidIncludeSystemGlobalizationNative)' != 'true' " Include="libSystem.Globalization.Native" />