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

@@ -507,8 +507,8 @@ namespace System.Diagnostics {
if(traceFormat != TraceFormat.NoResourceLookup)
{
word_At = Environment.GetRuntimeResourceString("Word_At");
inFileLineNum = Environment.GetRuntimeResourceString("StackTrace_InFileLineNumber");
word_At = Environment.GetResourceString("Word_At");
inFileLineNum = Environment.GetResourceString("StackTrace_InFileLineNumber");
}
bool fFirstFrame = true;
@@ -616,7 +616,7 @@ namespace System.Diagnostics {
if (sf.GetIsLastFrameFromForeignExceptionStackTrace())
{
sb.Append(Environment.NewLine);
sb.Append(Environment.GetRuntimeResourceString("Exception_EndStackTraceFromPreviousThrow"));
sb.Append(Environment.GetResourceString("Exception_EndStackTraceFromPreviousThrow"));
}
#endif // FEATURE_EXCEPTIONDISPATCHINFO
}