diff options
Diffstat (limited to 'src/System.Private.CoreLib/src/System/Diagnostics/Contracts')
| -rw-r--r-- | src/System.Private.CoreLib/src/System/Diagnostics/Contracts/Contracts.cs | 52 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/src/System/Diagnostics/Contracts/ContractsBCL.cs | 38 |
2 files changed, 45 insertions, 45 deletions
diff --git a/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/Contracts.cs b/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/Contracts.cs index 4ff7706e9..dbc814ded 100644 --- a/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/Contracts.cs +++ b/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/Contracts.cs @@ -161,14 +161,14 @@ namespace System.Diagnostics.Contracts [SuppressMessage("Microsoft.Design", "CA1019:DefineAccessorsForAttributeArguments", Justification = "Thank you very much, but we like the names we've defined for the accessors")] public sealed class ContractPublicPropertyNameAttribute : Attribute { - private String _publicName; + private string _publicName; - public ContractPublicPropertyNameAttribute(String name) + public ContractPublicPropertyNameAttribute(string name) { _publicName = name; } - public String Name + public string Name { get { return _publicName; } } @@ -200,31 +200,31 @@ namespace System.Diagnostics.Contracts [Conditional("CONTRACTS_FULL")] public sealed class ContractOptionAttribute : Attribute { - private String _category; - private String _setting; + private string _category; + private string _setting; private bool _enabled; - private String _value; + private string _value; - public ContractOptionAttribute(String category, String setting, bool enabled) + public ContractOptionAttribute(string category, string setting, bool enabled) { _category = category; _setting = setting; _enabled = enabled; } - public ContractOptionAttribute(String category, String setting, String value) + public ContractOptionAttribute(string category, string setting, string value) { _category = category; _setting = setting; _value = value; } - public String Category + public string Category { get { return _category; } } - public String Setting + public string Setting { get { return _setting; } } @@ -234,7 +234,7 @@ namespace System.Diagnostics.Contracts get { return _enabled; } } - public String Value + public string Value { get { return _value; } } @@ -293,7 +293,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void Assume(bool condition, String userMessage) + public static void Assume(bool condition, string userMessage) { if (!condition) { @@ -332,7 +332,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void Assert(bool condition, String userMessage) + public static void Assert(bool condition, string userMessage) { if (!condition) ReportFailure(ContractFailureKind.Assert, userMessage, null, null); @@ -376,7 +376,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void Requires(bool condition, String userMessage) + public static void Requires(bool condition, string userMessage) { AssertMustUseRewriter(ContractFailureKind.Precondition, "Requires"); } @@ -418,7 +418,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void Requires<TException>(bool condition, String userMessage) where TException : Exception + public static void Requires<TException>(bool condition, string userMessage) where TException : Exception { AssertMustUseRewriter(ContractFailureKind.Precondition, "Requires<TException>"); } @@ -461,7 +461,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void Ensures(bool condition, String userMessage) + public static void Ensures(bool condition, string userMessage) { AssertMustUseRewriter(ContractFailureKind.Postcondition, "Ensures"); } @@ -504,7 +504,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void EnsuresOnThrow<TException>(bool condition, String userMessage) where TException : Exception + public static void EnsuresOnThrow<TException>(bool condition, string userMessage) where TException : Exception { AssertMustUseRewriter(ContractFailureKind.PostconditionOnException, "EnsuresOnThrow"); } @@ -598,7 +598,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static void Invariant(bool condition, String userMessage) + public static void Invariant(bool condition, string userMessage) { AssertMustUseRewriter(ContractFailureKind.Invariant, "Invariant"); } @@ -733,7 +733,7 @@ namespace System.Diagnostics.Contracts /// The runtime value is 2^64 - 1 or 2^32 - 1. /// </summary> [SuppressMessage("Microsoft.Performance", "CA1802", Justification = "FxCop is confused")] - static readonly ulong MaxWritableExtent = (UIntPtr.Size == 4) ? UInt32.MaxValue : UInt64.MaxValue; + static readonly ulong MaxWritableExtent = (UIntPtr.Size == 4) ? uint.MaxValue : ulong.MaxValue; /// <summary> /// Allows specifying a writable extent for a UIntPtr, similar to SAL's writable extent. @@ -851,13 +851,13 @@ namespace System.Diagnostics.Contracts /// System.Runtime.CompilerServices.ContractHelper.RaiseContractFailedEvent, followed by /// System.Runtime.CompilerServices.ContractHelper.TriggerFailure. /// </summary> - static partial void ReportFailure(ContractFailureKind failureKind, String userMessage, String conditionText, Exception innerException); + static partial void ReportFailure(ContractFailureKind failureKind, string userMessage, string conditionText, Exception innerException); /// <summary> /// This method is used internally to trigger a failure indicating to the "programmer" that he is using the interface incorrectly. /// It is NEVER used to indicate failure of actual contracts at runtime. /// </summary> - static partial void AssertMustUseRewriter(ContractFailureKind kind, String contractKind); + static partial void AssertMustUseRewriter(ContractFailureKind kind, string contractKind); #endregion } @@ -936,9 +936,9 @@ namespace System.Runtime.CompilerServices #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public static string RaiseContractFailedEvent(ContractFailureKind failureKind, String userMessage, String conditionText, Exception innerException) + public static string RaiseContractFailedEvent(ContractFailureKind failureKind, string userMessage, string conditionText, Exception innerException) { - String resultFailureMessage = "Contract failed"; // default in case implementation does not assign anything. + string resultFailureMessage = "Contract failed"; // default in case implementation does not assign anything. RaiseContractFailedEventImplementation(failureKind, userMessage, conditionText, innerException, ref resultFailureMessage); return resultFailureMessage; } @@ -951,7 +951,7 @@ namespace System.Runtime.CompilerServices #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)] #endif - public static void TriggerFailure(ContractFailureKind kind, String displayMessage, String userMessage, String conditionText, Exception innerException) + public static void TriggerFailure(ContractFailureKind kind, string displayMessage, string userMessage, string conditionText, Exception innerException) { TriggerFailureImplementation(kind, displayMessage, userMessage, conditionText, innerException); } @@ -971,12 +971,12 @@ namespace System.Runtime.CompilerServices /// <param name="resultFailureMessage">Should really be out (or the return value), but partial methods are not flexible enough. /// On exit: null if the event was handled and should not trigger a failure. /// Otherwise, returns the localized failure message</param> - static partial void RaiseContractFailedEventImplementation(ContractFailureKind failureKind, String userMessage, String conditionText, Exception innerException, ref string resultFailureMessage); + static partial void RaiseContractFailedEventImplementation(ContractFailureKind failureKind, string userMessage, string conditionText, Exception innerException, ref string resultFailureMessage); /// <summary> /// Implements the default failure behavior of the platform. Under the BCL, it triggers an Assert box. /// </summary> - static partial void TriggerFailureImplementation(ContractFailureKind kind, String displayMessage, String userMessage, String conditionText, Exception innerException); + static partial void TriggerFailureImplementation(ContractFailureKind kind, string displayMessage, string userMessage, string conditionText, Exception innerException); #endregion Implementation Stubs } } // namespace System.Runtime.CompilerServices diff --git a/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/ContractsBCL.cs b/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/ContractsBCL.cs index 56626bb8f..38b080bcb 100644 --- a/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/ContractsBCL.cs +++ b/src/System.Private.CoreLib/src/System/Diagnostics/Contracts/ContractsBCL.cs @@ -36,7 +36,7 @@ namespace System.Diagnostics.Contracts /// </summary> #if FEATURE_UNTRUSTED_CALLERS #endif - static partial void AssertMustUseRewriter(ContractFailureKind kind, String contractKind) + static partial void AssertMustUseRewriter(ContractFailureKind kind, string contractKind) { //TODO: Implement CodeContract failure mechanics including enabling CCIRewrite @@ -65,7 +65,7 @@ namespace System.Diagnostics.Contracts //if (probablyNotRewritten == null) // probablyNotRewritten = thisAssembly; //String simpleName = probablyNotRewritten.GetName().Name; - String simpleName = "System.Private.CoreLib"; + string simpleName = "System.Private.CoreLib"; System.Runtime.CompilerServices.ContractHelper.TriggerFailure(kind, SR.Format(SR.MustUseCCRewrite, contractKind, simpleName), null, null, null); t_assertingMustUseRewriter = false; @@ -85,14 +85,14 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - static partial void ReportFailure(ContractFailureKind failureKind, String userMessage, String conditionText, Exception innerException) + static partial void ReportFailure(ContractFailureKind failureKind, string userMessage, string conditionText, Exception innerException) { if (failureKind < ContractFailureKind.Precondition || failureKind > ContractFailureKind.Assume) throw new ArgumentException(SR.Format(SR.Arg_EnumIllegalVal, failureKind), nameof(failureKind)); Contract.EndContractBlock(); // displayMessage == null means: yes we handled it. Otherwise it is the localized failure message - String displayMessage = System.Runtime.CompilerServices.ContractHelper.RaiseContractFailedEvent(failureKind, userMessage, conditionText, innerException); + string displayMessage = System.Runtime.CompilerServices.ContractHelper.RaiseContractFailedEvent(failureKind, userMessage, conditionText, innerException); if (displayMessage == null) return; @@ -139,8 +139,8 @@ namespace System.Diagnostics.Contracts public sealed class ContractFailedEventArgs : EventArgs { private ContractFailureKind _failureKind; - private String _message; - private String _condition; + private string _message; + private string _condition; private Exception _originalException; private bool _handled; private bool _unwind; @@ -150,7 +150,7 @@ namespace System.Diagnostics.Contracts #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - public ContractFailedEventArgs(ContractFailureKind failureKind, String message, String condition, Exception originalException) + public ContractFailedEventArgs(ContractFailureKind failureKind, string message, string condition, Exception originalException) { Contract.Requires(originalException == null || failureKind == ContractFailureKind.PostconditionOnException); _failureKind = failureKind; @@ -159,8 +159,8 @@ namespace System.Diagnostics.Contracts _originalException = originalException; } - public String Message { get { return _message; } } - public String Condition { get { return _condition; } } + public string Message { get { return _message; } } + public string Condition { get { return _condition; } } public ContractFailureKind FailureKind { get { return _failureKind; } } public Exception OriginalException { get { return _originalException; } } @@ -257,7 +257,7 @@ namespace System.Runtime.CompilerServices #if !FEATURE_CORECLR private static volatile EventHandler<ContractFailedEventArgs> s_contractFailedEvent; - private static readonly Object s_lockObject = new Object(); + private static readonly object s_lockObject = new object(); #endif // !FEATURE_CORECLR internal const int COR_E_CODECONTRACTFAILED = unchecked((int)0x80131542); @@ -321,14 +321,14 @@ namespace System.Runtime.CompilerServices [System.Diagnostics.DebuggerNonUserCode] #if FEATURE_RELIABILITY_CONTRACTS #endif - static partial void RaiseContractFailedEventImplementation(ContractFailureKind failureKind, String userMessage, String conditionText, Exception innerException, ref string resultFailureMessage) + static partial void RaiseContractFailedEventImplementation(ContractFailureKind failureKind, string userMessage, string conditionText, Exception innerException, ref string resultFailureMessage) { if (failureKind < ContractFailureKind.Precondition || failureKind > ContractFailureKind.Assume) throw new ArgumentException(SR.Format(SR.Arg_EnumIllegalVal, failureKind), nameof(failureKind)); Contract.EndContractBlock(); string returnValue; - String displayMessage = "contract failed."; // Incomplete, but in case of OOM during resource lookup... + string displayMessage = "contract failed."; // Incomplete, but in case of OOM during resource lookup... #if !FEATURE_CORECLR ContractFailedEventArgs eventArgs = null; // In case of OOM. #endif // !FEATURE_CORECLR @@ -392,7 +392,7 @@ namespace System.Runtime.CompilerServices [System.Diagnostics.DebuggerNonUserCode] #if FEATURE_UNTRUSTED_CALLERS && !FEATURE_CORECLR #endif - static partial void TriggerFailureImplementation(ContractFailureKind kind, String displayMessage, String userMessage, String conditionText, Exception innerException) + static partial void TriggerFailureImplementation(ContractFailureKind kind, string displayMessage, string userMessage, string conditionText, Exception innerException) { // If we're here, our intent is to pop up a dialog box (if we can). For developers // interacting live with a debugger, this is a good experience. For Silverlight @@ -414,7 +414,7 @@ namespace System.Runtime.CompilerServices //TODO: Implement CodeContract failure mechanics including enabling CCIRewrite - String stackTrace = null; //@todo: Any reasonable way to get a stack trace here? + string stackTrace = null; //@todo: Any reasonable way to get a stack trace here? bool userSelectedIgnore = DeveloperExperience.Default.OnContractFailure(stackTrace, kind, displayMessage, userMessage, conditionText, innerException); if (userSelectedIgnore) return; @@ -431,9 +431,9 @@ namespace System.Runtime.CompilerServices // If we got here, the user selected Ignore. Continue. } - private static String GetFailureMessage(ContractFailureKind failureKind, String conditionText) + private static string GetFailureMessage(ContractFailureKind failureKind, string conditionText) { - bool hasConditionText = !String.IsNullOrEmpty(conditionText); + bool hasConditionText = !string.IsNullOrEmpty(conditionText); switch (failureKind) { case ContractFailureKind.Assert: @@ -463,7 +463,7 @@ namespace System.Runtime.CompilerServices #if FEATURE_RELIABILITY_CONTRACTS [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)] #endif - private static String GetDisplayMessage(ContractFailureKind failureKind, String userMessage, String conditionText) + private static string GetDisplayMessage(ContractFailureKind failureKind, string userMessage, string conditionText) { // Well-formatted English messages will take one of four forms. A sentence ending in // either a period or a colon, the condition string, then the message tacked @@ -471,9 +471,9 @@ namespace System.Runtime.CompilerServices // Note that both the conditionText and userMessage may be null. Also, // on Silverlight we may not be able to look up a friendly string for the // error message. Let's leverage Silverlight's default error message there. - String failureMessage = GetFailureMessage(failureKind, conditionText); + string failureMessage = GetFailureMessage(failureKind, conditionText); // Now add in the user message, if present. - if (!String.IsNullOrEmpty(userMessage)) + if (!string.IsNullOrEmpty(userMessage)) { return failureMessage + " " + userMessage; } |