Merge branch 'upstream'

Former-commit-id: 3c5d84519e7766f3744f5250a08565eb360f23f8
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-17 20:06:17 +00:00
commit 36661229dc
39 changed files with 44 additions and 34 deletions

View File

@ -1 +1 @@
5ea0274145c02531858c989f1ac0e5e14a153cf5
a5369f5f09670efe25898d47fbac22036bb252ea

View File

@ -1 +1 @@
60da131af7360f1dbc3a537f8ea11adc9cc7e997
c55cb6decfc6e9fe67278e2f584be6549cdcc373

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.118";
public const string MonoVersion = "5.10.0.125";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
6e48d3edd50a7737adc6ec6d9325e46139ed8ffc
4f98dd44c4ad965aaddbb1adaa28149767c715b2

View File

@ -308,6 +308,7 @@ namespace MonoTests.System.Drawing.Imaging {
/* Checks bitmap features on a known 2bbp bitmap */
[Test]
[Category("NotWorking")]
public void Bitmap2bitFeatures ()
{
if (IsArm64Process ())
@ -339,6 +340,7 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
[Category("NotWorking")]
public void Bitmap2bitPixels ()
{
if (IsArm64Process ())
@ -374,6 +376,7 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
[Category("NotWorking")]
public void Bitmap2bitData ()
{
if (IsArm64Process ())

View File

@ -1 +1 @@
7805f334132a106e3aad5c3a8462675c3dab938c
c9fdb4babc518a11ad6c0d93028b088b817cf83d

View File

@ -1 +1 @@
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
ec17194b631ee15781082a8b9868e049381698a0

View File

@ -1 +1 @@
e1b875997af0ecb18c2560f766beb60f49ed92a7
77d766ad011f247086635e3685bdd2a58395cbb0

View File

@ -1 +1 @@
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
2bd0f554f512f004ed57c34e9f4e4256af35cafd

View File

@ -1 +1 @@
320e1131777f12fc0d331c1396e8303948bd1c8d
35d5aaa31beb70a7a0170479b2f307fd0edcbd8d

View File

@ -1 +1 @@
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
39f1d2bfef60a3c69441454c437b0cd95a518fac

View File

@ -1 +1 @@
cc242a59836737c028571d639b1be8afe9fb8799
b6b8b2aed36d96a0e533a62ce3e342daf8b68500

View File

@ -1 +1 @@
7805f334132a106e3aad5c3a8462675c3dab938c
c9fdb4babc518a11ad6c0d93028b088b817cf83d

View File

@ -1 +1 @@
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
ec17194b631ee15781082a8b9868e049381698a0

View File

@ -1 +1 @@
e1b875997af0ecb18c2560f766beb60f49ed92a7
77d766ad011f247086635e3685bdd2a58395cbb0

View File

@ -1 +1 @@
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
2bd0f554f512f004ed57c34e9f4e4256af35cafd

View File

@ -1 +1 @@
320e1131777f12fc0d331c1396e8303948bd1c8d
35d5aaa31beb70a7a0170479b2f307fd0edcbd8d

View File

@ -1 +1 @@
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
39f1d2bfef60a3c69441454c437b0cd95a518fac

View File

@ -1 +1 @@
cc242a59836737c028571d639b1be8afe9fb8799
b6b8b2aed36d96a0e533a62ce3e342daf8b68500

View File

@ -1 +1 @@
7805f334132a106e3aad5c3a8462675c3dab938c
c9fdb4babc518a11ad6c0d93028b088b817cf83d

Some files were not shown because too many files have changed in this diff Show More