<value>Insufficient memory to continue the execution of the program.</value>
</data>
<data name="Arg_ParamName_Name" xml:space="preserve">
- <value>Parameter name: {0}</value>
+ <value>(Parameter '{0}')</value>
</data>
<data name="Arg_ParmArraySize" xml:space="preserve">
<value>Must specify one or more parameters.</value>
for (int i = 0; i < m_innerExceptions.Count; i++)
{
- text.AppendLine();
- text.Append("---> ");
+ if (m_innerExceptions[i] == InnerException)
+ continue; // Already logged in base.ToString()
+
+ text.Append(Environment.NewLine).Append(InnerExceptionPrefix);
text.AppendFormat(CultureInfo.InvariantCulture, SR.AggregateException_InnerException, i);
text.Append(m_innerExceptions[i].ToString());
text.Append("<---");
string s = base.Message;
if (!string.IsNullOrEmpty(_paramName))
{
- string resourceString = SR.Format(SR.Arg_ParamName_Name, _paramName);
- return s + Environment.NewLine + resourceString;
+ s += " " + SR.Format(SR.Arg_ParamName_Name, _paramName);
}
- else
- return s;
+
+ return s;
}
}
s += Environment.NewLine + SR.Format(SR.IO_FileName_Name, _fileName);
if (InnerException != null)
- s = s + " ---> " + InnerException.ToString();
+ s = s + InnerExceptionPrefix + InnerException.ToString();
if (StackTrace != null)
s += Environment.NewLine + StackTrace;
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public partial class Exception : ISerializable
{
+ internal protected const string InnerExceptionPrefix = " ---> ";
+
public Exception()
{
_HResult = HResults.COR_E_EXCEPTION;
if (_innerException != null)
{
- s = s + " ---> " + _innerException.ToString() + Environment.NewLine +
+ s = s + Environment.NewLine + InnerExceptionPrefix + _innerException.ToString() + Environment.NewLine +
" " + SR.Exception_EndOfInnerExceptionStack;
}
s += Environment.NewLine + SR.Format(SR.IO_FileName_Name, FileName);
if (InnerException != null)
- s = s + " ---> " + InnerException.ToString();
+ s = s + Environment.NewLine + InnerExceptionPrefix + InnerException.ToString();
if (StackTrace != null)
s += Environment.NewLine + StackTrace;
s += Environment.NewLine + SR.Format(SR.IO_FileName_Name, FileName);
if (InnerException != null)
- s = s + " ---> " + InnerException.ToString();
+ s = s + Environment.NewLine + InnerExceptionPrefix + InnerException.ToString();
if (StackTrace != null)
s += Environment.NewLine + StackTrace;
public override string ToString()
{
StringBuilder s = new StringBuilder();
-
+
string className = GetType().ToString();
s.Append(className).Append(" (0x").Append(HResult.ToString("X8", CultureInfo.InvariantCulture)).Append(')');
Exception? innerException = InnerException;
if (innerException != null)
{
- s.Append(" ---> ").Append(innerException.ToString());
+ s.Append(Environment.NewLine).Append(InnerExceptionPrefix).Append(innerException.ToString());
}
string? stackTrace = StackTrace;
Exception? innerException = InnerException;
if (innerException != null)
{
- s = s + " ---> " + innerException.ToString();
+ s = s + Environment.NewLine + InnerExceptionPrefix + innerException.ToString();
}
if (StackTrace != null)
# Assert: https://github.com/dotnet/coreclr/issues/25050
-nonamespace System.Data.Common.Tests
+# requires corefx test updates
+-nomethod System.Data.Tests.Common.DbConnectionStringBuilderTest.Add_Keyword_Invalid
+-nomethod System.Data.Tests.Common.DbConnectionStringBuilderTest.Indexer_Keyword_Invalid
+
# requires corefx test updates https://github.com/dotnet/corefx/pull/38452
-nomethod System.SpanTests.ReadOnlySpanTests.ZeroLengthIndexOfAny_ManyInteger
-nomethod System.SpanTests.ReadOnlySpanTests.ZeroLengthIndexOfAny_ManyString