Imported Upstream version 5.10.0.69

Former-commit-id: fc39669a0b707dd3c063977486506b6793da2890
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-29 19:03:06 +00:00
parent d8f8abd549
commit e2950ec768
6283 changed files with 453847 additions and 91879 deletions

View File

@@ -1,5 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
@@ -68,7 +127,7 @@
<value>Illegal characters in drive name '{0}'.</value>
</data>
<data name="Argument_InvalidPathChars" xml:space="preserve">
<value>Illegal characters in path.</value>
<value>Illegal characters in path '{0}'.</value>
</data>
<data name="ArgumentOutOfRange_FileLengthTooBig" xml:space="preserve">
<value>Specified file length was too large for the file system.</value>
@@ -115,4 +174,7 @@
<data name="UnauthorizedAccess_IODenied_Path" xml:space="preserve">
<value>Access to the path '{0}' is denied.</value>
</data>
<data name="IO_PathTooLong_Path" xml:space="preserve">
<value>The path '{0}' is too long, or a component of the specified path is too long.</value>
</data>
</root>

View File

@@ -98,7 +98,6 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="System.Diagnostics.Contracts" />
<Reference Include="System.Diagnostics.Debug" />
<Reference Include="System.Diagnostics.Tools" />
<Reference Include="System.IO.FileSystem" />
@@ -109,4 +108,4 @@
<Reference Include="System.Threading.Tasks" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>

View File

@@ -36,7 +36,6 @@ namespace System.IO
public DriveType DriveType
{
[SecuritySafeCritical]
get
{
DriveType type;
@@ -67,7 +66,6 @@ namespace System.IO
public string DriveFormat
{
[SecuritySafeCritical]
get
{
string format = string.Empty;
@@ -78,7 +76,6 @@ namespace System.IO
public long AvailableFreeSpace
{
[SecuritySafeCritical]
get
{
Interop.Sys.MountPointInformation mpi = default(Interop.Sys.MountPointInformation);
@@ -89,7 +86,6 @@ namespace System.IO
public long TotalFreeSpace
{
[SecuritySafeCritical]
get
{
Interop.Sys.MountPointInformation mpi = default(Interop.Sys.MountPointInformation);
@@ -100,7 +96,6 @@ namespace System.IO
public long TotalSize
{
[SecuritySafeCritical]
get
{
Interop.Sys.MountPointInformation mpi = default(Interop.Sys.MountPointInformation);
@@ -111,12 +106,10 @@ namespace System.IO
public string VolumeLabel
{
[SecuritySafeCritical]
get
{
return Name;
}
[SecuritySafeCritical]
set
{
throw new PlatformNotSupportedException();

View File

@@ -21,10 +21,6 @@ namespace System.IO
name = driveName + ":\\";
else
{
// GetPathRoot does not check all invalid characters
if (PathInternal.HasIllegalCharacters(driveName))
throw new ArgumentException(SR.Format(SR.Arg_InvalidDriveChars, driveName), nameof(driveName));
name = Path.GetPathRoot(driveName);
// Disallow null or empty drive letters and UNC paths
if (name == null || name.Length == 0 || name.StartsWith("\\\\", StringComparison.Ordinal))
@@ -48,7 +44,6 @@ namespace System.IO
public DriveType DriveType
{
[System.Security.SecuritySafeCritical]
get
{
// GetDriveType can't fail
@@ -58,7 +53,6 @@ namespace System.IO
public String DriveFormat
{
[System.Security.SecuritySafeCritical] // auto-generated
get
{
const int volNameLen = 50;
@@ -88,7 +82,6 @@ namespace System.IO
public long AvailableFreeSpace
{
[System.Security.SecuritySafeCritical]
get
{
long userBytes, totalBytes, freeBytes;
@@ -111,7 +104,6 @@ namespace System.IO
public long TotalFreeSpace
{
[System.Security.SecuritySafeCritical] // auto-generated
get
{
long userBytes, totalBytes, freeBytes;
@@ -134,7 +126,6 @@ namespace System.IO
public long TotalSize
{
[System.Security.SecuritySafeCritical]
get
{
// Don't cache this, to handle variable sized floppy drives
@@ -170,7 +161,6 @@ namespace System.IO
// Null is a valid volume label.
public String VolumeLabel
{
[System.Security.SecuritySafeCritical] // auto-generated
get
{
// NTFS uses a limit of 32 characters for the volume label,
@@ -203,7 +193,6 @@ namespace System.IO
}
return volumeName.ToString();
}
[System.Security.SecuritySafeCritical] // auto-generated
set
{
uint oldMode;

View File

@@ -21,8 +21,7 @@ namespace System.IO
_name = NormalizeDriveName(driveName);
}
private DriveInfo(SerializationInfo info, StreamingContext context) :
this((string)info.GetValue("_name", typeof(string)))
private DriveInfo(SerializationInfo info, StreamingContext context)
{
throw new PlatformNotSupportedException();
}

View File

@@ -8,6 +8,9 @@ namespace System.IO
{
//Thrown when trying to access a drive that is not available.
[Serializable]
#if !MONO
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
#endif
public class DriveNotFoundException : IOException
{
public DriveNotFoundException()
@@ -30,7 +33,6 @@ namespace System.IO
protected DriveNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
{
throw new PlatformNotSupportedException();
}
}
}

View File

@@ -6,22 +6,18 @@ using System;
using System.Runtime.InteropServices;
using System.Text;
using System.Globalization;
using System.Diagnostics.Contracts;
namespace System.IO
{
[Pure]
internal static class Error
{
// An alternative to Win32Marshal with friendlier messages for drives
[System.Security.SecuritySafeCritical] // auto-generated
internal static Exception GetExceptionForLastWin32DriveError(String driveName)
{
int errorCode = Marshal.GetLastWin32Error();
return GetExceptionForWin32DriveError(errorCode, driveName);
}
[System.Security.SecurityCritical] // auto-generated
internal static Exception GetExceptionForWin32DriveError(int errorCode, String driveName)
{
switch (errorCode)

View File

@@ -17,7 +17,6 @@ namespace System.IO.FileSystem.DriveInfoTests
public class DriveInfoWindowsTests
{
[Theory]
[InlineData(":\0", "driveName")]
[InlineData(":", null)]
[InlineData("://", null)]
[InlineData(@":\", null)]

View File

@@ -4,7 +4,6 @@
<PropertyGroup>
<ProjectGuid>{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}</ProjectGuid>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />