Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -22,7 +22,7 @@ namespace System {
using System.Runtime.CompilerServices;
using System.Runtime.ConstrainedExecution;
using System.Diagnostics.Contracts;
#if FEATURE_CAS_POLICY || FEATURE_LEGACYNETCFCRYPTO
#if FEATURE_CAS_POLICY || FEATURE_LEGACYNETCFCRYPTO || MONO
using StringMaker = System.Security.Util.Tokenizer.StringMaker;
#endif // FEATURE_CAS_POLICY
@@ -69,7 +69,7 @@ namespace System {
}
}
#if FEATURE_CAS_POLICY || FEATURE_LEGACYNETCFCRYPTO
#if FEATURE_CAS_POLICY || FEATURE_LEGACYNETCFCRYPTO || MONO
private StringMaker _maker;
[System.Security.SecuritySafeCritical] // auto-generated
static public StringMaker GetSharedStringMaker()