Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -44,6 +44,7 @@ namespace System.Drawing.Printing {
// this.settings = settings;
}
#if !NETSTANDARD1_6
protected InvalidPrinterException (SerializationInfo info, StreamingContext context)
: base (info, context)
{
@@ -56,6 +57,7 @@ namespace System.Drawing.Printing {
base.GetObjectData (info, context);
}
#endif
private static string GetMessage(PrinterSettings settings)
{

View File

@@ -103,7 +103,7 @@ namespace System.Drawing.Printing {
}
if (destinationType == typeof (InstanceDescriptor) && value is Margins) {
Margins c = (Margins) value;
ConstructorInfo ctor = typeof(Margins).GetConstructor (new Type[] {typeof(int), typeof(int), typeof(int), typeof(int)} );
ConstructorInfo ctor = typeof(Margins).GetTypeInfo ().GetConstructor (new Type[] {typeof(int), typeof(int), typeof(int), typeof(int)} );
return new InstanceDescriptor (ctor, new object[] {c.Left, c.Right, c.Top, c.Bottom});
}