Remove ILLinkTrim.xml from System.Text.Json (dotnet/corefx#42118)

* Remove ILLinkTrim.xml from System.Text.Json

Instead use PreserveDependencyAttribute.

* Address PR feedback

Commit migrated from https://github.com/dotnet/corefx/commit/567241af05d1e43142d04572dee84870b78761aa

diff --git a/src/libraries/Common/src/System/Runtime/CompilerServices/PreserveDependencyAttribute.cs b/src/libraries/Common/src/System/Runtime/CompilerServices/PreserveDependencyAttribute.cs
new file mode 100644 (file)
index 0000000..de14ff3
--- /dev/null
+++ b/src/libraries/Common/src/System/Runtime/CompilerServices/PreserveDependencyAttribute.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+
+// TODO https://github.com/dotnet/corefx/issues/41201: Design and expose this publicly.
+
+namespace System.Runtime.CompilerServices
+{
+    /// <summary>States a dependency that one member has on another.</summary>
+    /// <remarks>
+    /// This can be used to inform tooling of a dependency that is otherwise not evident purely from
+    /// metadata and IL, for example a member relied on via reflection.
+    /// </remarks>
+    [AttributeUsage(
+        AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Field /* AttributeTargets.Class | AttributeTargets.Struct */, // TODO: https://github.com/mono/linker/issues/797
+        AllowMultiple = true, Inherited = false)]
+    internal sealed class PreserveDependencyAttribute : Attribute
+    {
+        /// <summary>Initializes the attribute.</summary>
+        /// <param name="memberSignature">The signature of the member depended.</param>
+        public PreserveDependencyAttribute(string memberSignature)
+        {
+            MemberSignature = memberSignature;
+        }
+
+        /// <summary>Initializes the attribute.</summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        /// <param name="typeName">The full name of the type containing <paramref name="memberSignature"/>.</param>
+        public PreserveDependencyAttribute(string memberSignature, string typeName)
+        {
+            MemberSignature = memberSignature;
+            TypeName = typeName;
+        }
+
+        /// <summary>Initializes the attribute.</summary>
+        /// <param name="memberSignature">The signature of the member depended on.</param>
+        /// <param name="typeName">The full name of the type containing <paramref name="memberSignature"/>.</param>
+        /// <param name="assemblyName">The name of the assembly containing <paramref name="typeName"/>.</param>
+        public PreserveDependencyAttribute(string memberSignature, string typeName, string assemblyName)
+        {
+            MemberSignature = memberSignature;
+            TypeName = typeName;
+            AssemblyName = assemblyName;
+        }
+
+        /// <summary>Gets the signature of the member depended on.</summary>
+        public string MemberSignature { get; }
+
+        /// <summary>Gets the full name of the type containing the specified member.</summary>
+        /// <remarks>If no type name is specified, the type of the consumer is assumed.</remarks>
+        public string? TypeName { get; }
+
+        /// <summary>Gets the assembly name of the specified type.</summary>
+        /// <remarks>If no assembly name is specified, the assembly of the consumer is assumed.</remarks>
+        public string? AssemblyName { get; }
+
+        /// <summary>Gets or sets the condition in which the dependency is applicable, e.g. "DEBUG".</summary>
+        public string? Condition { get; set; }
+    }
+}

diff --git a/src/libraries/System.Text.Json/src/ILLinkTrim.xml b/src/libraries/System.Text.Json/src/ILLinkTrim.xml
deleted file mode 100644 (file)
index 603e305..0000000
--- a/src/libraries/System.Text.Json/src/ILLinkTrim.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<linker>
-  <assembly fullname="System.Text.Json">
-    <type fullname="System.Text.Json.JsonPropertyInfoNullable`2">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-    <type fullname="System.Text.Json.Serialization.JsonPropertyInfoNotNullableContravariant`4">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-    <type fullname="System.Text.Json.Serialization.Converters.JsonConverterEnum`1">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-    <type fullname="System.Text.Json.Serialization.Converters.JsonKeyValuePairConverter`2">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-    <type fullname="System.Text.Json.ImmutableCollectionCreator">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-    <type fullname="System.Text.Json.ImmutableDictionaryCreator`2">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-    <type fullname="System.Text.Json.ImmutableEnumerableCreator`2">
-      <!-- Instantiated via reflection -->
-      <method name=".ctor" />
-    </type>
-  </assembly>
-</linker>

diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index 5eec31c1495c07dc5606d9a7115c3eafadbcbd27..de2e37da40f4d3e754c17cd3694fc4e9dc597439 100644 (file)
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -166,6 +166,9 @@
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.SignedNumber.cs" />
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.String.cs" />
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.UnsignedNumber.cs" />
+    <Compile Include="$(CommonPath)\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
+      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNETStandard)' == 'true' OR '$(TargetsNetFx)' == 'true'">
     <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" />

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConverterEnum.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConverterEnum.cs
index 7cdada18c4666cfe43b2e444fb47dd2745933d9d..17bb89ab4a3525a2050159180875857a54b0b11a 100644 (file)
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConverterEnum.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConverterEnum.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace System.Text.Json.Serialization.Converters
 {
@@ -17,6 +18,10 @@ namespace System.Text.Json.Serialization.Converters
             return type.IsEnum;
         }
 
+        [PreserveDependency(
+            ".ctor(System.Text.Json.Serialization.Converters.EnumConverterOptions)",
+            "System.Text.Json.Serialization.Converters.JsonConverterEnum`1",
+            "System.Text.Json")]
         public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options)
         {
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonKeyValuePairConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonKeyValuePairConverter.cs
index 90d31281c30013808c9db5f1cfdeb9442518046a..13aa4e775e5d64fa9e559f256d29cf15e7a2e687 100644 (file)
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonKeyValuePairConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonKeyValuePairConverter.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace System.Text.Json.Serialization.Converters
 {
@@ -18,6 +19,7 @@ namespace System.Text.Json.Serialization.Converters
             return (generic == typeof(KeyValuePair<,>));
         }
 
+        [PreserveDependency(".ctor()", "System.Text.Json.Serialization.Converters.JsonKeyValuePairConverter`2", "System.Text.Json")]
         public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options)
         {
             Type keyType = type.GetGenericArguments()[0];

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.AddProperty.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.AddProperty.cs
index 2bf05a929d2bda397400240f93f03c6e7503e492..09397871eec4c5909485d74c65386d04074625c8 100644 (file)
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.AddProperty.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.AddProperty.cs
@@ -5,6 +5,7 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text.Json.Serialization;
 using System.Threading;
 
@@ -44,6 +45,8 @@ namespace System.Text.Json
                 options);
         }
 
+        [PreserveDependency(".ctor()", "System.Text.Json.JsonPropertyInfoNullable`2", "System.Text.Json")]
+        [PreserveDependency(".ctor()", "System.Text.Json.Serialization.JsonPropertyInfoNotNullableContravariant`4", "System.Text.Json")]
         internal static JsonPropertyInfo CreateProperty(
             Type declaredPropertyType,
             Type runtimePropertyType,

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs
index 2cbd3a11675ad07283b6ad38cfb06561712d0224..bdd227bd6d9082231d2c46d5d688a70d5952bffb 100644 (file)
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text.Json.Serialization.Converters;
 
 namespace System.Text.Json.Serialization
@@ -53,6 +54,10 @@ namespace System.Text.Json.Serialization
         }
 
         /// <inheritdoc />
+        [PreserveDependency(
+            ".ctor(System.Text.Json.Serialization.Converters.EnumConverterOptions, System.Text.Json.JsonNamingPolicy)",
+            "System.Text.Json.Serialization.Converters.JsonConverterEnum`1",
+            "System.Text.Json")]
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionEmitMemberAccessor.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionEmitMemberAccessor.cs
index baa6bc105f07cbe989aab1efd01d6c898742d890..de70079b4949e395c54d3ba7f4c8708f1cc91576 100644 (file)
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionEmitMemberAccessor.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionEmitMemberAccessor.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
 
 namespace System.Text.Json
 {
@@ -60,6 +61,7 @@ namespace System.Text.Json
             return (Action<TProperty>)addMethod.CreateDelegate(typeof(Action<TProperty>), target);
         }
 
+        [PreserveDependency(".ctor()", "System.Text.Json.ImmutableEnumerableCreator`2", "System.Text.Json")]
         public override ImmutableCollectionCreator ImmutableCollectionCreateRange(Type constructingType, Type collectionType, Type elementType)
         {
             MethodInfo createRange = ImmutableCollectionCreateRangeMethod(constructingType, elementType);
@@ -99,7 +101,7 @@ namespace System.Text.Json
             return creator;
         }
 
-
+        [PreserveDependency(".ctor()", "System.Text.Json.ImmutableDictionaryCreator`2", "System.Text.Json")]
         public override ImmutableCollectionCreator ImmutableDictionaryCreateRange(Type constructingType, Type collectionType, Type elementType)
         {
             Debug.Assert(collectionType.IsGenericType);

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionMemberAccessor.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionMemberAccessor.cs
index 9d16c5b1cfcc6319d74227d9d214f2c14bc622bf..83aedd14ffa76ed608af4c277612e7f83b818eb1 100644 (file)
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionMemberAccessor.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ReflectionMemberAccessor.cs
@@ -48,6 +48,7 @@ namespace System.Text.Json
             return (Action<TProperty>)addMethod.CreateDelegate(typeof(Action<TProperty>), target);
         }
 
+        [PreserveDependency(".ctor()", "System.Text.Json.ImmutableEnumerableCreator`2", "System.Text.Json")]
         public override ImmutableCollectionCreator ImmutableCollectionCreateRange(Type constructingType, Type collectionType, Type elementType)
         {
             MethodInfo createRange = ImmutableCollectionCreateRangeMethod(constructingType, elementType);
@@ -70,7 +71,7 @@ namespace System.Text.Json
             return creator;
         }
 
-
+        [PreserveDependency(".ctor()", "System.Text.Json.ImmutableDictionaryCreator`2", "System.Text.Json")]
         public override ImmutableCollectionCreator ImmutableDictionaryCreateRange(Type constructingType, Type collectionType, Type elementType)
         {
             Debug.Assert(collectionType.IsGenericType);