Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/System.Drawing/Makefile

@@ -5,11 +5,17 @@ SUBDIRS =
 LIBRARY = System.Drawing.dll
 
 LIB_REFS = System
-LIB_MCS_FLAGS = /unsafe -d:FEATURE_TYPECONVERTER \
+LIB_MCS_FLAGS = /unsafe \
 	-resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \
 	-resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
 	-resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico
 
+ifneq (winaot, $(PROFILE))
+LIB_MCS_FLAGS += -d:FEATURE_TYPECONVERTER,SUPPORTS_WINDOWS_COLORS
+else
+LIB_MCS_FLAGS += /keyfile:../msfinal.pub
+endif
+
 TEST_LIB_REFS = System.Drawing System.Runtime.Serialization.Formatters.Soap System.Xml
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -define:TEST -resource:Test/resources/indexed.png,indexed.png \

mcs/class/System.Drawing/System.Drawing.Printing/PageSettings.cs

@@ -48,11 +48,12 @@ namespace System.Drawing.Printing
 
 		// create a new default Margins object (is 1 inch for all margins)
 		Margins margins = new Margins();
-
+#pragma warning disable 649
 		float hardMarginX;
 		float hardMarginY;
 		RectangleF printableArea;		
 		PrinterSettings printerSettings;
+#pragma warning restore 649
 		
 		public PageSettings() : this(new PrinterSettings())
 		{

mcs/class/System.Drawing/System.Drawing.Printing/PrintEventArgs.cs

@@ -39,11 +39,17 @@ namespace System.Drawing.Printing
 	public class PrintEventArgs : System.ComponentModel.CancelEventArgs
 	{
 		private GraphicsPrinter graphics_context;
-		internal PrintAction action;
+		private PrintAction action;
 		
 		public PrintEventArgs()
 		{
 		}
+
+		internal PrintEventArgs (PrintAction action)
+		{
+			this.action = action;
+		}
+
 		public PrintAction PrintAction {
 			get { return action; }
 		}

mcs/class/System.Drawing/System.Drawing.Printing/PrintingServices.cs

@@ -114,13 +114,13 @@ namespace System.Drawing.Printing
 		}
 
 		internal class Printer {
-			public readonly string Name;
+			//public readonly string Name;
 			public readonly string Comment;
 			public readonly string Port;
 			public readonly string Type;
 			public readonly string Status;
 			public PrinterSettings Settings;
-			public bool IsDefault;
+			//public bool IsDefault;
 			
 			public Printer (string port, string type, string status, string comment) {
 				Port = port;

mcs/class/System.Drawing/System.Drawing.Printing/PrintingServicesUnix.cs

@@ -925,6 +925,7 @@ namespace System.Drawing.Printing
 
 		#endregion
 
+#pragma warning disable 649
 		#region Struct
 		public struct DOCINFO
 		{
@@ -1037,6 +1038,7 @@ namespace System.Drawing.Printing
 		}
 		
 		#endregion
+#pragma warning restore 649
 	}
 
 	class GlobalPrintingServicesUnix : GlobalPrintingServices

mcs/class/System.Drawing/System.Drawing/BitmapSuffixInSameAssemblyAttribute.cs

@@ -38,11 +38,5 @@ namespace System.Drawing
 			: base ()
 		{
 		}
-
-		public virtual object TypeId {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
 	}
 }

mcs/class/System.Drawing/System.Drawing/BitmapSuffixInSatelliteAssemblyAttribute.cs

@@ -38,11 +38,5 @@ namespace System.Drawing
 			: base ()
 		{
 		}
-
-		public virtual object TypeId {
-			get {
-				throw new NotImplementedException ();
-			}
-		}
 	}
 }

mcs/class/System.Drawing/System.Drawing/Color.cs

@@ -38,7 +38,7 @@ using System.Runtime.InteropServices;
 
 namespace System.Drawing 
 {
-#if !MONOTOUCH && !MONOMAC
+#if !MONOTOUCH && !MONOMAC && FEATURE_TYPECONVERTER
 	[TypeConverter(typeof(ColorConverter))]
 	[Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
 #endif

mcs/class/System.Drawing/System.Drawing/KnownColors.cs

@@ -210,7 +210,7 @@ namespace System.Drawing {
 			0xFF316AC5,	/* 174 - MenuHighlight */
 		};
 
-#if !MONOTOUCH && !MONOMAC
+#if !MONOTOUCH && !MONOMAC && SUPPORTS_WINDOWS_COLORS
 		static KnownColors ()
 		{
 			if (GDIPlus.RunningOnWindows ()) {

mcs/class/System.Drawing/System.Drawing_test.dll.sources

@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 ../../../build/common/Locale.cs
 ../System.Drawing/gdipEnums.cs    
 ../System.Drawing/gdipFunctions.cs

mcs/class/System.Drawing/winaot_System.Drawing.dll.sources

@@ -0,0 +1,3 @@
+Assembly/AssemblyInfo.cs
+../../build/common/Consts.cs
+#include netstandard.sources