dotnet · stephentoub · Nov 15, 2018 · Nov 14, 2018
diff --git a/src/System.Drawing.Common/src/System/Drawing/Bitmap.cs b/src/System.Drawing.Common/src/System/Drawing/Bitmap.cs
@@ -12,6 +12,7 @@
 namespace System.Drawing
 {
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
     public sealed partial class Bitmap : Image
     {
         private static Color s_defaultTransparentColor = Color.LightGray;

diff --git a/src/System.Drawing.Common/src/System/Drawing/Font.cs b/src/System.Drawing.Common/src/System/Drawing/Font.cs
@@ -18,6 +18,7 @@ namespace System.Drawing
     [TypeConverter("System.Drawing.FontConverter, System.Windows.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")]
 #endif
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
     public sealed partial class Font : MarshalByRefObject, ICloneable, IDisposable, ISerializable
     {
         private IntPtr _nativeFont;

diff --git a/src/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/Icon.Unix.cs
@@ -55,6 +55,7 @@ namespace System.Drawing
 #endif
 #endif
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
     public sealed partial class Icon : MarshalByRefObject, ISerializable, ICloneable, IDisposable
     {
         // The PNG signature is specified at http://www.w3.org/TR/PNG/#5PNG-file-signature

diff --git a/src/System.Drawing.Common/src/System/Drawing/Icon.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Icon.Windows.cs
@@ -14,6 +14,7 @@
 namespace System.Drawing
 {
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #if netcoreapp
     [TypeConverter("System.Drawing.IconConverter, System.Windows.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")]
 #endif

diff --git a/src/System.Drawing.Common/src/System/Drawing/Image.cs b/src/System.Drawing.Common/src/System/Drawing/Image.cs
@@ -17,6 +17,7 @@ namespace System.Drawing
     /// </summary>
     [ImmutableObject(true)]
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #if netcoreapp
     [TypeConverter("System.Drawing.ImageConverter, System.Windows.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")]
 #endif

diff --git a/src/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs b/src/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Unix.cs
@@ -44,6 +44,7 @@ namespace System.Drawing.Imaging
     [Editor ("System.Drawing.Design.MetafileEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
 #endif
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
     public sealed class Metafile : Image
     {
 

diff --git a/src/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Windows.cs b/src/System.Drawing.Common/src/System/Drawing/Imaging/Metafile.Windows.cs
@@ -15,6 +15,7 @@ namespace System.Drawing.Imaging
     /// can be recorded and played back.
     /// </summary>
     [Serializable]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
     public sealed partial class Metafile : Image
     {
         // GDI+ doesn't handle filenames over MAX_PATH very well

diff --git a/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs b/src/System.Runtime.Serialization.Formatters/tests/BinaryFormatterTestData.cs