Fixes the ifdefs for the mscorlib and System facades to build for aot…

… as well. Also includes a minor rd.xml tweak for BinaryFormatter. Fixes hundreds of BinaryFormatter tests. Progress on #19119
morganbr · Jun 17, 2017 · 18921a9 · 18921a9
1 parent f61885c
commit 18921a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/...ime.Serialization.Formatters/src/Resources/System.Runtime.Serialization.Formatters.rd.xml b/...ime.Serialization.Formatters/src/Resources/System.Runtime.Serialization.Formatters.rd.xml
@@ -21,6 +21,13 @@
         <!-- This is dynamically called by SerializationInfoExtensions.UpdateValue -->
         <Method Name="UpdateValue" Dynamic="Required" />
       </Type>
+      <!-- Comparers are usually only referred to by interface, so analysis is unlikely to find them -->
+      <Type Name="System.Collections.IEqualityComparer">
+        <Subtypes BinaryFormatter="All" />
+      </Type>
+      <Type Name="System.Collections.IComparer">
+        <Subtypes BinaryFormatter="All" />
+      </Type>
     </Assembly>
   </Library>
 </Directives>
diff --git a/src/shims/manual/System.forwards.cs b/src/shims/manual/System.forwards.cs
@@ -5,8 +5,6 @@
 // Add any internal types that we need to forward from System. 
 
 // These types are required for Desktop <--> Core serialization as they are not covered by GenAPI because they are not exposed.
-#if netcoreapp
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.TreeSet<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.CookieVariant))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.PathList))]
-#endif
diff --git a/src/shims/manual/mscorlib.forwards.cs b/src/shims/manual/mscorlib.forwards.cs
@@ -5,17 +5,12 @@
 // Add any internal types that we need to forward from mscorlib. 
 
 // These types are required for Desktop to Core serialization as they are not covered by GenAPI because they are marked as internal.
-#if netcoreapp
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.CultureAwareComparer))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.OrdinalComparer))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.OrdinalIgnoreCaseComparer))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.GenericComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.NullableComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.ObjectComparer<>))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.Int32EnumComparer<>))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.UInt32EnumComparer<>))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.Int64EnumComparer<>))]
-[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.UInt64EnumComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.GenericEqualityComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.NullableEqualityComparer<>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.ObjectEqualityComparer<>))]
@@ -37,4 +32,3 @@
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,,>))]
 [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ValueTuple<,,,,,,,>))]
-#endif