Merge branch 'upstream'
Former-commit-id: 3c5d84519e7766f3744f5250a08565eb360f23f8
This commit is contained in:
commit
36661229dc
@ -1 +1 @@
|
||||
5ea0274145c02531858c989f1ac0e5e14a153cf5
|
||||
a5369f5f09670efe25898d47fbac22036bb252ea
|
@ -1 +1 @@
|
||||
60da131af7360f1dbc3a537f8ea11adc9cc7e997
|
||||
c55cb6decfc6e9fe67278e2f584be6549cdcc373
|
@ -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";
|
||||
|
@ -1 +1 @@
|
||||
6e48d3edd50a7737adc6ec6d9325e46139ed8ffc
|
||||
4f98dd44c4ad965aaddbb1adaa28149767c715b2
|
@ -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 ())
|
||||
|
@ -1 +1 @@
|
||||
7805f334132a106e3aad5c3a8462675c3dab938c
|
||||
c9fdb4babc518a11ad6c0d93028b088b817cf83d
|
@ -1 +1 @@
|
||||
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
|
||||
ec17194b631ee15781082a8b9868e049381698a0
|
@ -1 +1 @@
|
||||
e1b875997af0ecb18c2560f766beb60f49ed92a7
|
||||
77d766ad011f247086635e3685bdd2a58395cbb0
|
@ -1 +1 @@
|
||||
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
|
||||
2bd0f554f512f004ed57c34e9f4e4256af35cafd
|
@ -1 +1 @@
|
||||
320e1131777f12fc0d331c1396e8303948bd1c8d
|
||||
35d5aaa31beb70a7a0170479b2f307fd0edcbd8d
|
@ -1 +1 @@
|
||||
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
|
||||
39f1d2bfef60a3c69441454c437b0cd95a518fac
|
@ -1 +1 @@
|
||||
cc242a59836737c028571d639b1be8afe9fb8799
|
||||
b6b8b2aed36d96a0e533a62ce3e342daf8b68500
|
@ -1 +1 @@
|
||||
7805f334132a106e3aad5c3a8462675c3dab938c
|
||||
c9fdb4babc518a11ad6c0d93028b088b817cf83d
|
@ -1 +1 @@
|
||||
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
|
||||
ec17194b631ee15781082a8b9868e049381698a0
|
@ -1 +1 @@
|
||||
e1b875997af0ecb18c2560f766beb60f49ed92a7
|
||||
77d766ad011f247086635e3685bdd2a58395cbb0
|
@ -1 +1 @@
|
||||
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
|
||||
2bd0f554f512f004ed57c34e9f4e4256af35cafd
|
@ -1 +1 @@
|
||||
320e1131777f12fc0d331c1396e8303948bd1c8d
|
||||
35d5aaa31beb70a7a0170479b2f307fd0edcbd8d
|
@ -1 +1 @@
|
||||
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
|
||||
39f1d2bfef60a3c69441454c437b0cd95a518fac
|
@ -1 +1 @@
|
||||
cc242a59836737c028571d639b1be8afe9fb8799
|
||||
b6b8b2aed36d96a0e533a62ce3e342daf8b68500
|
@ -1 +1 @@
|
||||
7805f334132a106e3aad5c3a8462675c3dab938c
|
||||
c9fdb4babc518a11ad6c0d93028b088b817cf83d
|
@ -1 +1 @@
|
||||
d5782dc53683b9e5d9732ba8ca5d0aad61f99cd6
|
||||
ec17194b631ee15781082a8b9868e049381698a0
|
@ -1 +1 @@
|
||||
e1b875997af0ecb18c2560f766beb60f49ed92a7
|
||||
77d766ad011f247086635e3685bdd2a58395cbb0
|
@ -1 +1 @@
|
||||
7b67956ad5fa1d7d2bf6519e6bda7f84755ee58b
|
||||
2bd0f554f512f004ed57c34e9f4e4256af35cafd
|
@ -1 +1 @@
|
||||
320e1131777f12fc0d331c1396e8303948bd1c8d
|
||||
35d5aaa31beb70a7a0170479b2f307fd0edcbd8d
|
@ -1 +1 @@
|
||||
505e4d98d39c5b0f7484eaf5fbff2c75bc8d70a2
|
||||
39f1d2bfef60a3c69441454c437b0cd95a518fac
|
@ -1 +1 @@
|
||||
cc242a59836737c028571d639b1be8afe9fb8799
|
||||
b6b8b2aed36d96a0e533a62ce3e342daf8b68500
|
@ -1 +1 @@
|
||||
8397456fca14422578ee02395c3e5cb6be9c5a07
|
||||
6863ee6aca5068eb9377397e32a610d27382a0cf
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/b232a39"
|
||||
#define FULL_VERSION "explicit/c67ec40"
|
||||
|
@ -934,6 +934,13 @@ CI_DISABLED_TESTS = \
|
||||
CI_PR_DISABLED_TESTS = \
|
||||
appdomain-threadpool-unload.exe
|
||||
|
||||
if ENABLE_COOP
|
||||
CI_PR_DISABLED_TESTS += \
|
||||
abort-cctor.exe \
|
||||
bug-58782-plain-throw.exe \
|
||||
bug-58782-capture-and-throw.exe
|
||||
endif
|
||||
|
||||
# appdomain-threadpool-unload.exe creates 100 appdomains, takes too long with llvm
|
||||
LLVM_DISABLED_TESTS = \
|
||||
finally_block_ending_in_dead_bb.exe \
|
||||
|
@ -1 +1 @@
|
||||
67cf75fd4661799d57cab93e7fb17e972ebb99c4
|
||||
798d565c128d4c2d6653556ce82d6d1a36ee1467
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a58eb5da43f30e62e3cd09eefedafdcdc9ed1f38
|
||||
5c9988df374daf08c58f88d8f7c2d45aa77bd940
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
10d948b25ce09fbde9c105cf58df188ac4ece281
|
||||
0e4cdd9021bd0fa959e62869965714fe157689a0
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
8e3bc694a856de2b043760c4798b1638b5d58524
|
||||
1e4960a35be2691e40c3d7208e79c6b2170efa55
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.0.118\n"
|
||||
"Project-Id-Version: mono 5.10.0.125\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-02-16 18:52+0000\n"
|
||||
"POT-Creation-Date: 2018-02-17 19:29+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
abfedf0ac19cdc117054b74de10243a1f56df24f
|
||||
2b44b3e8e649e2dfc8dd12c3fd78561b3a0d65f0
|
Loading…
x
Reference in New Issue
Block a user