mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.4.0.199

Browse Source 
Former-commit-id: f4d318e4b2f128fa9f4d31b37bb3839a3fc0dfb2
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-09-25 16:57:44 +00:00
parent 536cd135cc
commit 5924117973
223 changed files with 3826 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/corlib/System/Delegate.cs
View File

@@ -499,7 +499,7 @@ namespace System
m = Method;
return (m != null ? m.GetHashCode () : GetType ().GetHashCode ()) ^ (m_target != null ? m_target.GetHashCode () : 0);
return (m != null ? m.GetHashCode () : GetType ().GetHashCode ()) ^ RuntimeHelpers.GetHashCode (m_target);
}
protected virtual MethodInfo GetMethodImpl ()

10
mcs/class/corlib/Test/System.Globalization/NumberFormatInfoTest.cs
View File

@@ -49,9 +49,15 @@ namespace MonoTests.System.Globalization
c = CultureInfo.InvariantCulture;
Assert.AreEqual (2, c.NumberFormat.CurrencyDecimalDigits, "#3");
}
[Test]
public void AllCulturesCanParseNegativeNumber ()
{
foreach (var c in CultureInfo.GetCultures (CultureTypes.AllCultures))
{
int.Parse ("-1", c);
}
}
}
}

2
mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
View File

@@ -1258,7 +1258,7 @@ namespace MonoTests.System.Threading.Tasks
{
var t = Task.Delay (300);
Assert.IsTrue (TaskStatus.WaitingForActivation == t.Status || TaskStatus.Running == t.Status, "#1");
Assert.IsTrue (t.Wait (400), "#2");
Assert.IsTrue (t.Wait (1200), "#2");
}
[Test]