Fix some linker annotations in S.CM.TypeConverter

For dotnet#48527 (comment)
pgovind · Apr 1, 2021 · 47fa9a8 · 47fa9a8
1 parent 5e79b4f
commit 47fa9a8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 116 deletions.
diff --git a/...aries/System.ComponentModel.TypeConverter/src/ILLink/ILLink.Suppressions.LibraryBuild.xml b/...aries/System.ComponentModel.TypeConverter/src/ILLink/ILLink.Suppressions.LibraryBuild.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<linker>
+  <assembly fullname="System.ComponentModel.TypeConverter, PublicKeyToken=b03f5f7f11d50a3a">
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2026</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.ComponentModel.Design.DesigntimeLicenseContextSerializer.SerializeWithBinaryFormatter(System.IO.Stream,System.String,System.ComponentModel.Design.DesigntimeLicenseContext)</property>
+      <property name="Justification">This warning is left in the product so developers get an ILLink warning when trimming an app with System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization=true.</property>
+    </attribute>
+    <attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
+      <argument>ILLink</argument>
+      <argument>IL2026</argument>
+      <property name="Scope">member</property>
+      <property name="Target">M:System.ComponentModel.Design.DesigntimeLicenseContextSerializer.DeserializeUsingBinaryFormatter(System.ComponentModel.Design.DesigntimeLicenseContextSerializer.StreamWrapper,System.String,System.ComponentModel.Design.RuntimeLicenseContext)</property>
+      <property name="Justification">This warning is left in the product so developers get an ILLink warning when trimming an app with System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization=true.</property>
+    </attribute>
+  </assembly>
+</linker
diff --git a/...odel.TypeConverter/src/System/ComponentModel/Design/DesigntimeLicenseContextSerializer.cs b/...odel.TypeConverter/src/System/ComponentModel/Design/DesigntimeLicenseContextSerializer.cs
@@ -50,8 +50,6 @@ public static void Serialize(Stream o, string cryptoKey, DesigntimeLicenseContex
             }
         }
 
-        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode",
-            Justification = "Only simple types (string and HashTable) are serialized with BinaryFormatter. These types can be serialized in a trimmed application.")]
         private static void SerializeWithBinaryFormatter(Stream o, string cryptoKey, DesigntimeLicenseContext context)
         {
             IFormatter formatter = new BinaryFormatter();
@@ -127,9 +125,6 @@ private static bool StreamIsBinaryFormatted(StreamWrapper stream)
             return true;
         }
 
-        [DynamicDependency(DynamicallyAccessedMemberTypes.NonPublicConstructors, typeof(Hashtable))]
-        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode",
-            Justification = "HashTable's Serialization ctor will be preserved by the DynamicDependency.")]
         private static void DeserializeUsingBinaryFormatter(StreamWrapper wrappedStream, string cryptoKey, RuntimeLicenseContext context)
         {
             if (EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization)

diff --git a/...el.TypeConverter/tests/TrimmingTests/DesigntimeLicenseContextSerialization_Deserialize.cs b/...el.TypeConverter/tests/TrimmingTests/DesigntimeLicenseContextSerialization_Deserialize.cs
diff --git a/...odel.TypeConverter/tests/TrimmingTests/DesigntimeLicenseContextSerialization_Serialize.cs b/...odel.TypeConverter/tests/TrimmingTests/DesigntimeLicenseContextSerialization_Serialize.cs
diff --git a/...ntModel.TypeConverter/tests/TrimmingTests/DesigntimeLicenseContextSerialization_Stream.cs b/...ntModel.TypeConverter/tests/TrimmingTests/DesigntimeLicenseContextSerialization_Stream.cs
diff --git a/....TypeConverter/tests/TrimmingTests/System.ComponentModel.TypeConverter.TrimmingTests.proj b/....TypeConverter/tests/TrimmingTests/System.ComponentModel.TypeConverter.TrimmingTests.proj
@@ -3,18 +3,6 @@
 
   <ItemGroup>
     <TestConsoleAppSourceFiles Include="ComObjectTypeTest.cs" />
-    <TestConsoleAppSourceFiles Include="DesigntimeLicenseContextSerialization_Serialize.cs" TrimmerRootAssemblies="mscorlib">
-      <ExtraTrimmerArgs>--feature System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization true</ExtraTrimmerArgs>
-      <AdditionalSourceFiles>DesigntimeLicenseContextSerialization_Stream.cs</AdditionalSourceFiles>
-      <!-- Justification: BinaryFormatter is not available on wasm-->
-      <SkipOnTestRuntimes>browser-wasm</SkipOnTestRuntimes>
-    </TestConsoleAppSourceFiles>
-    <TestConsoleAppSourceFiles Include="DesigntimeLicenseContextSerialization_Deserialize.cs" TrimmerRootAssemblies="mscorlib">
-      <ExtraTrimmerArgs>--feature System.ComponentModel.TypeConverter.EnableUnsafeBinaryFormatterInDesigntimeLicenseContextSerialization true</ExtraTrimmerArgs>
-      <AdditionalSourceFiles>DesigntimeLicenseContextSerialization_Stream.cs</AdditionalSourceFiles>
-      <!-- Justification: BinaryFormatter is not available on wasm-->
-      <SkipOnTestRuntimes>browser-wasm</SkipOnTestRuntimes>
-    </TestConsoleAppSourceFiles>
     <TestConsoleAppSourceFiles Include="InterfaceTypeTest.cs" />
     <TestConsoleAppSourceFiles Include="TypeConverterIsReadOnly.cs" />
     <TestConsoleAppSourceFiles Include="TypeConverterTest.cs" />