Merge branch 'upstream'

Former-commit-id: 9b3c937299322cc7b4e88f63492b05a9754560c7

configure.REMOVED.git-id

@@ -1 +1 @@
-ba1784f90767e3d03c6b54bf98772182d52e800b
+e51c0e1f864d708f76cd1c664b2e141b1248df61

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-b47556c41715a88e1a5e14e5b839a3f1394745dd
+f4d1ed8dc18898ec8c74a2831a50329d54f05d95

external/corefx/src/Common/tests/System/IO/PathFeatures.cs

@@ -93,7 +93,11 @@ namespace System.IO
             return s_osEnabled == State.True;
         }
 
+#if MONO && MOBILE
+        private static bool RtlAreLongPathsEnabled() => throw new PlatformNotSupportedException();
+#else
         [DllImport("ntdll", ExactSpelling = true)]
         private static extern bool RtlAreLongPathsEnabled();
+#endif
     }
 }

external/corefx/src/Common/tests/System/Net/Capability.Sockets.cs

@@ -9,9 +9,13 @@ namespace System.Net.Test.Common
 {
     public static partial class Capability
     {
+#if MONO && MOBILE
+        private static int RtlGetVersion(ref RTL_OSVERSIONINFOW lpVersionInformation) => throw new PlatformNotSupportedException();
+#else
         // TODO: Using RtlGetVersion is temporary until issue #4741 gets resolved.
         [DllImport("ntdll", CharSet = CharSet.Unicode)]
         private static extern int RtlGetVersion(ref RTL_OSVERSIONINFOW lpVersionInformation);
+#endif
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
         private struct RTL_OSVERSIONINFOW

external/corefx/src/System.IO.FileSystem/tests/PortedCommon/DllImports.cs

@@ -8,6 +8,15 @@ using System.Text;
 
 internal static class DllImports
 {
+#if MONO && MOBILE
+    internal static int GetLogicalDrives() => throw new PlatformNotSupportedException();
+
+    internal static bool GetDiskFreeSpaceEx(String drive, out long freeBytesForUser, out long totalBytes, out long freeBytes) => throw new PlatformNotSupportedException();
+
+    internal static bool GetVolumeInformation(String drive, [Out]StringBuilder volumeName, int volumeNameBufLen, out int volSerialNumber, out int maxFileNameLen, out int fileSystemFlags, [Out]StringBuilder fileSystemName, int fileSystemNameBufLen) => throw new PlatformNotSupportedException();
+
+    internal static int GetDriveType(string drive) => throw new PlatformNotSupportedException();
+#else
     [DllImport("kernel32.dll", SetLastError = true)]
     internal static extern int GetLogicalDrives();
 
@@ -19,5 +28,6 @@ internal static class DllImports
 
     [DllImport("kernel32.dll", EntryPoint = "GetDriveTypeW", CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
     internal static extern int GetDriveType(string drive);
+#endif
 }
 

external/corefx/src/System.IO.FileSystem/tests/PortedCommon/ReparsePointUtilities.cs

@@ -21,6 +21,11 @@ using System.Threading;
 using System.Threading.Tasks;
 public static class MountHelper
 {
+#if MONO && MOBILE
+    private static bool GetVolumeNameForVolumeMountPoint(String volumeName, StringBuilder uniqueVolumeName, int uniqueNameBufferCapacity) => throw new PlatformNotSupportedException();
+    private static bool SetVolumeMountPoint(String mountPoint, String uniqueVolumeName) => throw new PlatformNotSupportedException();
+    private static bool DeleteVolumeMountPoint(String mountPoint) => throw new PlatformNotSupportedException();
+#else
     [DllImport("kernel32.dll", EntryPoint = "GetVolumeNameForVolumeMountPointW", CharSet = CharSet.Unicode, BestFitMapping = false, SetLastError = true)]
     private static extern bool GetVolumeNameForVolumeMountPoint(String volumeName, StringBuilder uniqueVolumeName, int uniqueNameBufferCapacity);
     // unique volume name must be "\\?\Volume{GUID}\"
@@ -28,6 +33,7 @@ public static class MountHelper
     private static extern bool SetVolumeMountPoint(String mountPoint, String uniqueVolumeName);
     [DllImport("kernel32.dll", EntryPoint = "DeleteVolumeMountPointW", CharSet = CharSet.Unicode, BestFitMapping = false, SetLastError = true)]
     private static extern bool DeleteVolumeMountPoint(String mountPoint);
+#endif
 
     /// <summary>Creates a symbolic link using command line tools</summary>
     /// <param name="linkPath">The existing file</param>

external/corefx/src/System.Runtime.Extensions/tests/System/Environment.ProcessorCount.cs

@@ -64,8 +64,12 @@ namespace System.Tests
         private static extern long sysconf(int name);
 #endif
 
+#if MONO && MOBILE
+        internal static void GetSystemInfo(ref SYSTEM_INFO lpSystemInfo) => throw new PlatformNotSupportedException();
+#else
         [DllImport("kernel32.dll", SetLastError = true)]
         internal static extern void GetSystemInfo(ref SYSTEM_INFO lpSystemInfo);
+#endif
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct SYSTEM_INFO

mcs/build/common/Consts.cs

@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "6.0.0.259";
+	public const string MonoVersion = "6.0.0.265";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/class/System/monotouch_runtime_System.dll.exclude.sources

@@ -0,0 +1,2 @@
+#include monotouch_System.dll.exclude.sources
+

mcs/class/System/monotouch_tv_runtime_System.dll.exclude.sources

@@ -0,0 +1,2 @@
+#include monotouch_System.dll.exclude.sources
+

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-9dc03b0dca3a091e4ac2ddd5d728e3d26a5d932e
+203435678f5d99962a59b166c6f8477089409e69

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-04f97c37b51e418ea1af197553131047499cab62
+75c33dc1e1f39d6be5d4248fd53e053850bf623c

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-296b6252413645b66b0b30a8113ce75b75c11cd9
+6fd5e0f9295d73cc23d2ea00c89d6afe63e90249

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-57ded3591080d30e69c5d29606e1f6791f91ce66
+4d8afb8824c1057b2cf667f4ca4a0c15b195c478

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-3202e79921954dba22d63ecbf2f8fcddcbcb16a2
+b76682372cbd0666707115605695df85d1184dcc

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-aaee731cfa5a449be1adca8388869d1139f5fcc9
+08876e557061e83f44045fddb04a71731a88682e

mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-819f1d6e5fa5d08eb07aec3b576abadfd5b04f19
+87311132b75300d9386c73dfd439125bff2d7e00

mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-9dc03b0dca3a091e4ac2ddd5d728e3d26a5d932e
+203435678f5d99962a59b166c6f8477089409e69

mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-04f97c37b51e418ea1af197553131047499cab62
+75c33dc1e1f39d6be5d4248fd53e053850bf623c