From 8dab63d48258ae1dab7b819cb0f66b78dd20a1b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Apr 2022 12:20:06 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/linker build 20220406.2 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22206.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 4a0f42c9def382..a073ef0e90a0b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - c6434f6e8a0a1bfbb77261ac9f85c98b781613e5 + e8b0ba08dcee4350cc76c8cd160140b0684020af https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 1d482aee1df6b8..0171bf72b4910e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22205.1 + 7.0.100-1.22206.2 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From 848bfeb0ff47253b13feefe1eec90148760eb35f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Apr 2022 12:25:41 +0000 Subject: [PATCH 02/17] Update dependencies from https://github.com/dotnet/linker build 20220407.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22207.1 --- 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 a073ef0e90a0b7..317e18c5ce7349 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - e8b0ba08dcee4350cc76c8cd160140b0684020af + bacafd1df813b04c5f5758ba0d65b26ee423b150 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 0171bf72b4910e..b61cb171ab0484 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22206.2 + 7.0.100-1.22207.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From 53795e77bd58babd7d33bb1f05dbdf8fd27acd8f Mon Sep 17 00:00:00 2001 From: vitek-karas <10670590+vitek-karas@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:37:33 -0700 Subject: [PATCH 03/17] Remove unused method The GetSerializationCtor doesn't seem to be used. It's actually not in the build output since it's trimmed away. With the improved linker it produces a warning (correctly), but as it's not needed, it can be removed. --- .../src/System/RuntimeType.Mono.cs | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs b/src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs index 0ea6071efc529a..733cebdd4c36b4 100644 --- a/src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs +++ b/src/mono/System.Private.CoreLib/src/System/RuntimeType.Mono.cs @@ -1609,24 +1609,6 @@ internal override FieldInfo GetField(FieldInfo fromNoninstanciated) return att.Length != 0 ? ((DefaultMemberAttribute)att[0]).MemberName : null; } - private RuntimeConstructorInfo? m_serializationCtor; - internal RuntimeConstructorInfo? GetSerializationCtor() - { - if (m_serializationCtor == null) - { - var s_SICtorParamTypes = new Type[] { typeof(SerializationInfo), typeof(StreamingContext) }; - - m_serializationCtor = GetConstructor( - BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, - null, - CallingConventions.Any, - s_SICtorParamTypes, - null) as RuntimeConstructorInfo; - } - - return m_serializationCtor; - } - private object? CreateInstanceMono(bool nonPublic, bool wrapExceptions) { RuntimeConstructorInfo? ctor = GetDefaultConstructor(); From 1d0aedd36b0541e983302bea1c8555e93e82c2f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Apr 2022 12:20:20 +0000 Subject: [PATCH 04/17] Update dependencies from https://github.com/dotnet/linker build 20220408.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22208.1 --- 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 317e18c5ce7349..659e3351fd8424 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - bacafd1df813b04c5f5758ba0d65b26ee423b150 + 3292e23c9011c9822ab3d9b28a1e8f5bc570047e https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index b61cb171ab0484..4099383456a8e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22207.1 + 7.0.100-1.22208.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From dcf8462b17aae94f8fe8b83d6629c5a44c6874ac Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Mon, 11 Apr 2022 18:12:04 +0200 Subject: [PATCH 05/17] Improve test checks --- .../System.Globalization/tests/IcuTests.cs | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/libraries/System.Globalization/tests/IcuTests.cs b/src/libraries/System.Globalization/tests/IcuTests.cs index e5433487ac9deb..cbf629632dc674 100644 --- a/src/libraries/System.Globalization/tests/IcuTests.cs +++ b/src/libraries/System.Globalization/tests/IcuTests.cs @@ -17,18 +17,27 @@ public class IcuTests [ConditionalFact(nameof(IsIcuCompatiblePlatform))] public static void IcuShouldBeUsedByDefault() { - Type globalizationMode = Type.GetType("System.Globalization.GlobalizationMode"); - if (globalizationMode != null) + if (PlatformDetection.IsNotWindows) { - MethodInfo methodInfo = globalizationMode.GetProperty("UseNls", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod; - if (methodInfo != null) - { - Assert.False((bool)methodInfo.Invoke(null, null)); - return; - } + Type cultureDataType = Type.GetType("System.Globalization.CultureData"); + Assert.NotNull(cultureDataType); + + MethodInfo methodInfo = cultureDataType.GetMethod("NlsGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); + Assert.Null(methodInfo); + + methodInfo = cultureDataType.GetMethod("IcuGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); + Assert.NotNull(methodInfo); } + else + { + Type globalizationMode = Type.GetType("System.Globalization.GlobalizationMode"); + Assert.NotNull(globalizationMode); - throw new XunitException("Couldn't get System.Globalization.GlobalizationMode.UseIcu property."); + MethodInfo methodInfo = globalizationMode.GetProperty("UseNls", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod; + Assert.NotNull(methodInfo); + + Assert.False((bool)methodInfo.Invoke(null, null)); + } } [ConditionalFact(nameof(IsIcuCompatiblePlatform))] From e39dc5c24682d13ba89c96723c47dc6dc2e5f97c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Apr 2022 12:28:24 +0000 Subject: [PATCH 06/17] Update dependencies from https://github.com/dotnet/linker build 20220411.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22211.1 --- 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 659e3351fd8424..963ca1451c0559 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - 3292e23c9011c9822ab3d9b28a1e8f5bc570047e + 805c6a7f868348bc2400fcacb4f00998bd67b60d https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 4099383456a8e8..ed57301db26d19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22208.1 + 7.0.100-1.22211.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From 6d6863f0843bbecd5ee7456dcec758b2835d4859 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 12 Apr 2022 19:04:42 +0200 Subject: [PATCH 07/17] Tweak the test more (instead of messing with debug builds) --- .../System.Globalization/tests/IcuTests.cs | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/libraries/System.Globalization/tests/IcuTests.cs b/src/libraries/System.Globalization/tests/IcuTests.cs index cbf629632dc674..4c56f27fe20f46 100644 --- a/src/libraries/System.Globalization/tests/IcuTests.cs +++ b/src/libraries/System.Globalization/tests/IcuTests.cs @@ -17,27 +17,26 @@ public class IcuTests [ConditionalFact(nameof(IsIcuCompatiblePlatform))] public static void IcuShouldBeUsedByDefault() { - if (PlatformDetection.IsNotWindows) + Type globalizationMode = Type.GetType("System.Globalization.GlobalizationMode"); + MethodInfo methodInfo = globalizationMode?.GetProperty("UseNls", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod; + + if (methodInfo != null) + { + // When it's present + Assert.False((bool)methodInfo.Invoke(null, null)); + } + else { + // When it's trimmed Type cultureDataType = Type.GetType("System.Globalization.CultureData"); Assert.NotNull(cultureDataType); - MethodInfo methodInfo = cultureDataType.GetMethod("NlsGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); + methodInfo = cultureDataType.GetMethod("NlsGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); Assert.Null(methodInfo); methodInfo = cultureDataType.GetMethod("IcuGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); Assert.NotNull(methodInfo); } - else - { - Type globalizationMode = Type.GetType("System.Globalization.GlobalizationMode"); - Assert.NotNull(globalizationMode); - - MethodInfo methodInfo = globalizationMode.GetProperty("UseNls", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod; - Assert.NotNull(methodInfo); - - Assert.False((bool)methodInfo.Invoke(null, null)); - } } [ConditionalFact(nameof(IsIcuCompatiblePlatform))] From 5b71e465b915c619f3502363ad3a2d7977fb446c Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 13 Apr 2022 11:56:16 +0200 Subject: [PATCH 08/17] Remove explicit InitializeBinaryFormatter substitution for wasm Same is done at SDK level --- .../src/ILLink/ILLink.Substitutions.wasm.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.wasm.xml b/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.wasm.xml index 4ee64149df2f53..f0304dd4631658 100644 --- a/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.wasm.xml +++ b/src/mono/System.Private.CoreLib/src/ILLink/ILLink.Substitutions.wasm.xml @@ -9,8 +9,5 @@ - - - From 436d24c6d1107ef62095f94a692b04092419b8ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Apr 2022 12:32:12 +0000 Subject: [PATCH 09/17] Update dependencies from https://github.com/dotnet/linker build 20220412.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22212.1 --- 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 963ca1451c0559..686d2831247aa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - 805c6a7f868348bc2400fcacb4f00998bd67b60d + 8c33ad3ad8cba002301cf7341ba9003379247edb https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index ed57301db26d19..f5e284a4f10c40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22211.1 + 7.0.100-1.22212.1 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From 6f9ee2e88236f521f7f0299bac9446f3fe222f5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Apr 2022 12:28:48 +0000 Subject: [PATCH 10/17] Update dependencies from https://github.com/dotnet/linker build 20220413.2 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22213.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 686d2831247aa8..1b34b188d51f8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - 8c33ad3ad8cba002301cf7341ba9003379247edb + 6564aad35881703832aab9edb81558e0b6dd5698 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index f5e284a4f10c40..6030256be1c027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22212.1 + 7.0.100-1.22213.2 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From a0155566ac576809d0b3bd7f83fe56576d02851e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Apr 2022 12:28:22 +0000 Subject: [PATCH 11/17] Update dependencies from https://github.com/dotnet/linker build 20220418.2 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22218.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 1b34b188d51f8c..87ba3c6d7b7281 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - 6564aad35881703832aab9edb81558e0b6dd5698 + 5c69665bbb929b8decacb266dc2edeb3e32b9858 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 6030256be1c027..a98ff951c581d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22213.2 + 7.0.100-1.22218.2 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From cfde4e267b74353b862e77e4466d1e90d81c26c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Apr 2022 12:21:21 +0000 Subject: [PATCH 12/17] Update dependencies from https://github.com/dotnet/linker build 20220419.2 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22219.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 87ba3c6d7b7281..5cd1c2e0a2a631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - 5c69665bbb929b8decacb266dc2edeb3e32b9858 + 36b61348be2b93f2add8886174f19c0ed4aacd36 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index a98ff951c581d1..406a164a8325c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22218.2 + 7.0.100-1.22219.2 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From 622a565b6f0d2803f404d77dacde507bacef0d0b Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 20 Apr 2022 17:31:21 +0200 Subject: [PATCH 13/17] Update error code --- .../src/System/Reflection/DispatchProxyGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs b/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs index b9e3fdac3051a6..0352f3a30fef9e 100644 --- a/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs +++ b/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs @@ -170,7 +170,7 @@ public GeneratedTypeInfo GetProxyType( } // Unconditionally generates a new proxy type derived from 'baseType' and implements 'interfaceType' - [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2062:UnrecognizedReflectionPattern", + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2072:UnrecognizedReflectionPattern", Justification = "interfaceType is annotated as preserve All members, so any Types returned from GetInterfaces should be preserved as well once https://github.com/mono/linker/issues/1731 is fixed.")] private GeneratedTypeInfo GenerateProxyType( [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] Type baseType, From 26752011658b052703b501aa5a6ebdf4539dc6f5 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 20 Apr 2022 17:47:00 +0200 Subject: [PATCH 14/17] Get better fix --- .../src/System/Reflection/DispatchProxyGenerator.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs b/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs index 0352f3a30fef9e..832312ab7e5951 100644 --- a/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs +++ b/src/libraries/System.Reflection.DispatchProxy/src/System/Reflection/DispatchProxyGenerator.cs @@ -170,6 +170,8 @@ public GeneratedTypeInfo GetProxyType( } // Unconditionally generates a new proxy type derived from 'baseType' and implements 'interfaceType' + [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2062:UnrecognizedReflectionPattern", + Justification = "interfaceType is annotated as preserve All members, so any Types returned from GetInterfaces should be preserved as well once https://github.com/mono/linker/issues/1731 is fixed.")] [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2072:UnrecognizedReflectionPattern", Justification = "interfaceType is annotated as preserve All members, so any Types returned from GetInterfaces should be preserved as well once https://github.com/mono/linker/issues/1731 is fixed.")] private GeneratedTypeInfo GenerateProxyType( From 349c7a5388570cd7b9f21e0f2d6cea98853df0b4 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Thu, 21 Apr 2022 14:11:36 +0200 Subject: [PATCH 15/17] Continue tweaking the test --- src/libraries/System.Globalization/tests/IcuTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Globalization/tests/IcuTests.cs b/src/libraries/System.Globalization/tests/IcuTests.cs index 4c56f27fe20f46..671c5036fbd979 100644 --- a/src/libraries/System.Globalization/tests/IcuTests.cs +++ b/src/libraries/System.Globalization/tests/IcuTests.cs @@ -22,19 +22,19 @@ public static void IcuShouldBeUsedByDefault() if (methodInfo != null) { - // When it's present + // When GlobalizationMode is present Assert.False((bool)methodInfo.Invoke(null, null)); } else { - // When it's trimmed + // When GlobalizationMode is trimmed Type cultureDataType = Type.GetType("System.Globalization.CultureData"); Assert.NotNull(cultureDataType); methodInfo = cultureDataType.GetMethod("NlsGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); Assert.Null(methodInfo); - methodInfo = cultureDataType.GetMethod("IcuGetCultureDataFromRegionName", BindingFlags.NonPublic | BindingFlags.Static); + methodInfo = cultureDataType.GetMethod("InitIcuCultureDataCore", BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance); Assert.NotNull(methodInfo); } } From 53bd4a8f49093658897742e746b20c950e059a2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Apr 2022 12:30:34 +0000 Subject: [PATCH 16/17] Update dependencies from https://github.com/dotnet/linker build 20220420.4 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22205.1 -> To Version 7.0.100-1.22220.4 --- 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 5cd1c2e0a2a631..0e947671c001e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime eb51b02b158c3ff71a1ec7eac8a211d1d464c1a5 - + https://github.com/dotnet/linker - 36b61348be2b93f2add8886174f19c0ed4aacd36 + 6374217e191b8cef0c5a3d862f4291583eb959f4 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 406a164a8325c8..b16b95f4f7b53b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,7 +177,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22219.2 + 7.0.100-1.22220.4 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22178.2 From e336258b376abe9b5b65a4e7e3db30ebb0478461 Mon Sep 17 00:00:00 2001 From: vitek-karas <10670590+vitek-karas@users.noreply.github.com> Date: Thu, 21 Apr 2022 13:27:15 -0700 Subject: [PATCH 17/17] Disable trimming of sgen The analyzer was kicking in producing warnings. The sgen tool is not going to be trimmed, so there's no point running the analyzer on it. --- .../src/Microsoft.XmlSerializer.Generator.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj index b3345cdd982ff2..60ae63b5e20242 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/src/Microsoft.XmlSerializer.Generator.csproj @@ -15,6 +15,7 @@ true false + false