Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -173,11 +173,9 @@ namespace System.IO
Init(stream, encoding, detectEncodingFromByteOrderMarks, bufferSize, leaveOpen);
}
#if FEATURE_LEGACYNETCFIOSECURITY
[System.Security.SecurityCritical]
#elif FEATURE_LEGACYNETCF
#if FEATURE_LEGACYNETCF
[System.Security.SecuritySafeCritical]
#endif // FEATURE_LEGACYNETCFIOSECURITY
#endif // FEATURE_LEGACYNETCF
[ResourceExposure(ResourceScope.Machine)]
[ResourceConsumption(ResourceScope.Machine)]
public StreamReader(String path)
@@ -198,38 +196,25 @@ namespace System.IO
#endif // FEATURE_LEGACYNETCF
}
#if FEATURE_LEGACYNETCFIOSECURITY
[System.Security.SecurityCritical]
#endif //FEATURE_LEGACYNETCFIOSECURITY
[ResourceExposure(ResourceScope.Machine)]
[ResourceConsumption(ResourceScope.Machine)]
public StreamReader(String path, bool detectEncodingFromByteOrderMarks)
: this(path, Encoding.UTF8, detectEncodingFromByteOrderMarks, DefaultBufferSize) {
}
#if FEATURE_LEGACYNETCFIOSECURITY
[System.Security.SecurityCritical]
#endif //FEATURE_LEGACYNETCFIOSECURITY
[ResourceExposure(ResourceScope.Machine)]
[ResourceConsumption(ResourceScope.Machine)]
public StreamReader(String path, Encoding encoding)
: this(path, encoding, true, DefaultBufferSize) {
}
#if FEATURE_LEGACYNETCFIOSECURITY
[System.Security.SecurityCritical]
#endif //FEATURE_LEGACYNETCFIOSECURITY
[ResourceExposure(ResourceScope.Machine)]
[ResourceConsumption(ResourceScope.Machine)]
public StreamReader(String path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
: this(path, encoding, detectEncodingFromByteOrderMarks, DefaultBufferSize) {
}
#if FEATURE_LEGACYNETCFIOSECURITY
[System.Security.SecurityCritical]
#else
[System.Security.SecuritySafeCritical]
#endif //FEATURE_LEGACYNETCFIOSECURITY
[ResourceExposure(ResourceScope.Machine)]
[ResourceConsumption(ResourceScope.Machine)]
public StreamReader(String path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)