Bump corefx (#5167)

* Bump corefx

* Bump API snapshot submodule

diff --git a/external/api-snapshot b/external/api-snapshot
index 9103ec71e245dd3002a3c1190ee1acb4f1c8bcba..e0b1b010275d55a264c98de930e2750680ae148e 160000 (submodule)
--- a/external/api-snapshot
+++ b/external/api-snapshot
@@ -1 +1 @@
-Subproject commit 9103ec71e245dd3002a3c1190ee1acb4f1c8bcba
+Subproject commit e0b1b010275d55a264c98de930e2750680ae148e

diff --git a/external/corefx b/external/corefx
index e9e1fb251df4be19b142f0cef2c7dcc13b84f2f2..7e70a4e9236104c350e7d9ca3505225755065569 160000 (submodule)
--- a/external/corefx
+++ b/external/corefx
@@ -1 +1 @@
-Subproject commit e9e1fb251df4be19b142f0cef2c7dcc13b84f2f2
+Subproject commit 7e70a4e9236104c350e7d9ca3505225755065569

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs b/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs
index 0b731a01f2ed182fe4fc31cd3daefa803baee2e3..bc8daea7471fb9c8ced842f511fe2cee706d5699 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.cs
@@ -40,7 +40,7 @@ namespace System.Drawing.Text {
 
                public PrivateFontCollection ()
                {
-                       Status status = GDIPlus.GdipNewPrivateFontCollection (out nativeFontCollection);
+                       Status status = GDIPlus.GdipNewPrivateFontCollection (out _nativeFontCollection);
                        GDIPlus.CheckStatus (status);
                }
                
@@ -57,27 +57,27 @@ namespace System.Drawing.Text {
                                throw new FileNotFoundException ();
 
                        // note: MS throw the same exception FileNotFoundException if the file exists but isn't a valid font file
-                       Status status = GDIPlus.GdipPrivateAddFontFile (nativeFontCollection, fname);
+                       Status status = GDIPlus.GdipPrivateAddFontFile (_nativeFontCollection, fname);
                        GDIPlus.CheckStatus (status);                   
                }
 
                public void AddMemoryFont (IntPtr memory, int length) 
                {
                        // note: MS throw FileNotFoundException if something is bad with the data (except for a null pointer)
-                       Status status = GDIPlus.GdipPrivateAddMemoryFont (nativeFontCollection, memory, length);
+                       Status status = GDIPlus.GdipPrivateAddMemoryFont (_nativeFontCollection, memory, length);
                        GDIPlus.CheckStatus (status);                                           
                }
                
                // methods      
                protected override void Dispose (bool disposing)
                {
-                       if (nativeFontCollection!=IntPtr.Zero) {
-                               GDIPlus.GdipDeletePrivateFontCollection (ref nativeFontCollection);                                                     
+                       if (_nativeFontCollection!=IntPtr.Zero) {
+                               GDIPlus.GdipDeletePrivateFontCollection (ref _nativeFontCollection);                                                    
 
                                // This must be zeroed out, otherwise our base will also call
                                // the GDI+ delete method on unix platforms. We're keeping the
                                // base.Dispose() call in case other cleanup ever gets added there
-                               nativeFontCollection = IntPtr.Zero;
+                               _nativeFontCollection = IntPtr.Zero;
                        }
                        
                        base.Dispose (disposing);

diff --git a/mcs/class/System.Drawing/System.Drawing.dll.sources b/mcs/class/System.Drawing/System.Drawing.dll.sources
index 097b6cabc982f3ce751de57e7f27406802fc4a89..582cdc47bf597623b782f41849539d07641de38f 100755 (executable)
--- a/mcs/class/System.Drawing/System.Drawing.dll.sources
+++ b/mcs/class/System.Drawing/System.Drawing.dll.sources
@@ -178,21 +178,26 @@ System.Drawing.Imaging/MetaHeader.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Imaging/WmfPlaceableFileHeader.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/Duplex.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/InvalidPrinterException.cs
+../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/InvalidPrinterException.Serializable.cs
 System.Drawing.Printing/MarginsConverter.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/Margins.cs
+../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/Margins.Serializable.cs
 System.Drawing.Printing/PrintingServices.cs
 System.Drawing.Printing/PrintingServicesWin32.cs
 System.Drawing.Printing/PrintingServicesUnix.cs
 System.Drawing.Printing/PageSettings.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PaperKinds.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSize.cs
+../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSize.Serializable.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSource.cs
+../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSource.Serializable.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PaperSourceKind.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PreviewPageInfo.cs
 System.Drawing.Printing/PreviewPrintController.cs
 System.Drawing.Printing/PrintController.cs
 System.Drawing.Printing/PrintDocument.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterResolution.cs
+../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterResolution.Serializable.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterResolutionKind.cs
 System.Drawing.Printing/PrinterSettings.cs
 ../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Printing/PrinterUnit.cs

diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
index 04f8c087e025ee757b8d13644f666063ff3cdf22..73acc4bedb263b8f118e9bfdb37d3b8daac0445d 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
+++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.cs
@@ -108,7 +108,7 @@ namespace System.Drawing {
 
                public FontFamily (string name, FontCollection fontCollection) 
                {
-                       IntPtr handle = (fontCollection == null) ? IntPtr.Zero : fontCollection.nativeFontCollection;
+                       IntPtr handle = (fontCollection == null) ? IntPtr.Zero : fontCollection._nativeFontCollection;
                        Status status = GDIPlus.GdipCreateFontFamilyFromName (name, handle, out nativeFontFamily);
                        GDIPlus.CheckStatus (status);
                }