From 8e564fc61e5861bb380431a244e2c9041f8e4b26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Apr 2022 12:26:30 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/linker build 20220425.3 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22222.1 -> To Version 7.0.100-1.22225.3 --- 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 04145b5d1c6172..4293ebf5f15be1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime b8dc04b445fc98d24fd92262364a9e5b5e23a5b9 - + https://github.com/dotnet/linker - dec9a23c4c164111df76d427656357113c0d705a + 4418cce12192f379b9b4d5baa111812e40707f84 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 7872dc4af8c679..9a414b3552c3cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,7 +178,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22222.1 + 7.0.100-1.22225.3 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22214.2 From f1ca7b8a8f0835d9469a2cbfac11e7c1b1b6edaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Apr 2022 12:20:34 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/linker build 20220426.3 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22222.1 -> To Version 7.0.100-1.22226.3 --- 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 4293ebf5f15be1..1638add2993ca8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -238,9 +238,9 @@ https://github.com/dotnet/runtime b8dc04b445fc98d24fd92262364a9e5b5e23a5b9 - + https://github.com/dotnet/linker - 4418cce12192f379b9b4d5baa111812e40707f84 + 6ffb647f615c9ae18e3af4ccf075e83c27855ef5 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 9a414b3552c3cd..9a547519bac8a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,7 +178,7 @@ 7.0.0-preview-20220331.1 - 7.0.100-1.22225.3 + 7.0.100-1.22226.3 $(MicrosoftNETILLinkTasksVersion) 7.0.0-preview.4.22214.2 From a82f38c05dff3dc591075af4819227b167ff436d Mon Sep 17 00:00:00 2001 From: tlakollo Date: Wed, 27 Apr 2022 12:34:12 -0700 Subject: [PATCH 3/3] Remove dead code type that generates analyzer warning --- .../Runtime/Serialization/ClassDataContract.cs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs index ef799d5265e58c..c90bc4a6a76aa7 100644 --- a/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs +++ b/src/libraries/System.Private.DataContractSerialization/src/System/Runtime/Serialization/ClassDataContract.cs @@ -1624,20 +1624,5 @@ internal void UpdateNamespaceAndMembers(Type type, XmlDictionaryString ns, strin this.MemberNamespaces[i] = ns; } } - - internal Type UnadaptedClassType - { - get - { - if (IsKeyValuePairAdapter) - { - return Globals.TypeOfKeyValuePair.MakeGenericType(KeyValuePairGenericArguments); - } - else - { - return UnderlyingType; - } - } - } } }