From b9bae8864a2603d31ea8456111457d718a354be3 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Tue, 29 Jun 2021 19:41:50 -0400 Subject: [PATCH 1/5] Preserve necessary type and method --- eng/testing/ILLink.Descriptor.xunit.xml | 8 ++++++++ .../InteropServices/IDispatchImplAttributeTests.cs | 1 - .../CollectionTests/CollectionTests.Generic.Write.cs | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml index 8e6986d8a51719..823b13896e297b 100644 --- a/eng/testing/ILLink.Descriptor.xunit.xml +++ b/eng/testing/ILLink.Descriptor.xunit.xml @@ -15,5 +15,13 @@ + + + + + + + + diff --git a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs index 59274bd8a298f8..ee117220bcce4f 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs @@ -12,7 +12,6 @@ public class IDispatchImplAttributeTests private const string ValueName = "Value"; [Theory] - [ActiveIssue("https://github.com/dotnet/runtime/issues/50717", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))] [InlineData(-1)] [InlineData(0)] [InlineData(2)] diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CollectionTests/CollectionTests.Generic.Write.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CollectionTests/CollectionTests.Generic.Write.cs index 33fc759ae82308..e6963f2ca07a3d 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CollectionTests/CollectionTests.Generic.Write.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/CollectionTests/CollectionTests.Generic.Write.cs @@ -633,7 +633,6 @@ public static void WritePrimitiveQueueT() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/50721", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))] public static void WriteHashSetTOfHashSetT() { HashSet> input = new HashSet>(new List> From e67171c21cf7d0ef0411e0b17d7b9ddd547f7f40 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 30 Jun 2021 09:20:08 -0400 Subject: [PATCH 2/5] Change the way of getting the type --- eng/testing/ILLink.Descriptor.xunit.xml | 3 --- .../Runtime/InteropServices/IDispatchImplAttributeTests.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml index 823b13896e297b..9866068fd7a02f 100644 --- a/eng/testing/ILLink.Descriptor.xunit.xml +++ b/eng/testing/ILLink.Descriptor.xunit.xml @@ -20,8 +20,5 @@ - - - diff --git a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs index ee117220bcce4f..a6d2dad48f6e80 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs @@ -17,7 +17,7 @@ public class IDispatchImplAttributeTests [InlineData(2)] public void Ctor_ImplTypeShort(short implType) { - Type type = typeof(HandleCollector).Assembly.GetType(TypeName); + Type type = Type.GetType("System.Runtime.InteropServices.IDispatchImplAttribute, System.Runtime.InteropServices"); PropertyInfo valueProperty = type.GetProperty(ValueName); Assert.NotNull(type); Assert.NotNull(valueProperty); From 07080e315c31967a5a05e1b5ec8dfd57e4f5fa95 Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 30 Jun 2021 09:57:31 -0400 Subject: [PATCH 3/5] Inline the constants --- .../Runtime/InteropServices/IDispatchImplAttributeTests.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs index a6d2dad48f6e80..ac192126f64891 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/IDispatchImplAttributeTests.cs @@ -8,9 +8,6 @@ namespace System.Runtime.InteropServices.Tests { public class IDispatchImplAttributeTests { - private const string TypeName = "System.Runtime.InteropServices.IDispatchImplAttribute"; - private const string ValueName = "Value"; - [Theory] [InlineData(-1)] [InlineData(0)] @@ -18,7 +15,7 @@ public class IDispatchImplAttributeTests public void Ctor_ImplTypeShort(short implType) { Type type = Type.GetType("System.Runtime.InteropServices.IDispatchImplAttribute, System.Runtime.InteropServices"); - PropertyInfo valueProperty = type.GetProperty(ValueName); + PropertyInfo valueProperty = type.GetProperty("Value"); Assert.NotNull(type); Assert.NotNull(valueProperty); From 2930a28a3e0a1eaa5da17a91b929f938524c3fbc Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 30 Jun 2021 10:48:44 -0400 Subject: [PATCH 4/5] Enable NonValidated_ValidAndInvalidValues_DictionaryMembersWork --- .../System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs index 2a25ea71961915..2486e8bc45b0b8 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs +++ b/src/libraries/System.Net.Http/tests/UnitTests/Headers/HttpHeadersTest.cs @@ -1501,7 +1501,6 @@ public void NonValidated_SetMultipleValuesOnSingleValueHeader_AllHeaderValuesRet } } - [ActiveIssue("https://github.com/dotnet/runtime/issues/53647", TestPlatforms.Browser)] [Fact] public void NonValidated_ValidAndInvalidValues_DictionaryMembersWork() { From 2458f3bc0d5643595b03a2cf6ba6406c02dcf3fa Mon Sep 17 00:00:00 2001 From: Fan Yang Date: Wed, 30 Jun 2021 10:56:04 -0400 Subject: [PATCH 5/5] Enable TransformStrStrResolver3 --- .../tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs index 878eb87aad97ce..54d1fd9a7f87f2 100644 --- a/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs +++ b/src/libraries/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/XslCompiledTransform.cs @@ -3002,7 +3002,6 @@ public void TransformStrStrResolver2(XslInputType xslInputType, ReaderType reade } //[Variation("Pass XmlUrlResolver, load style sheet with document function, should resolve during transform", Param = "xmlResolver_document_function.txt")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/51911", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))] [InlineData("xmlResolver_document_function.txt", XslInputType.Reader, ReaderType.XmlValidatingReader)] [InlineData("xmlResolver_document_function.txt", XslInputType.URI, ReaderType.XmlValidatingReader)] [InlineData("xmlResolver_document_function.txt", XslInputType.Navigator, ReaderType.XmlValidatingReader)]