Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -4,7 +4,8 @@ SUBDIRS =
LIBRARY = System.Drawing.dll
LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \
LIB_REFS = System
LIB_MCS_FLAGS = /unsafe /r:$(corlib) \
-resource:Assembly/Mono.ico,Mono.ico -resource:Assembly/Information.ico,Information.ico \
-resource:Assembly/Error.ico,Error.ico -resource:Assembly/Warning.ico,Warning.ico \
-resource:Assembly/Question.ico,Question.ico -resource:Assembly/Shield.ico,Shield.ico

View File

@@ -582,8 +582,10 @@ namespace MonoTests.System.Drawing{
Font f1 = new Font("Arial", 8.25F, GraphicsUnit.Point);
Font f2 = new Font("Courier New", 8.25F, GraphicsUnit.Point);
Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(),
"Hashcodes should differ if _name member differs");
if (f1.Name != f2.Name) {
Assert.IsFalse(f1.GetHashCode() == f2.GetHashCode(),
"Hashcodes should differ if _name member differs");
}
}
[Test]