Merge branch 'upstream'
Former-commit-id: bf3242079231e412032421f9e870144907be7b9c
This commit is contained in:
commit
b8dc8b1daf
@ -1 +1 @@
|
||||
e3fddfdc54d7204c3e52ef2273ea8a313426467c
|
||||
50b8a3ec381dbed9a226af25917bb89e42d14807
|
@ -1 +1 @@
|
||||
f4f0b4d1402862ad9ca37078d37fedfb7dd03bed
|
||||
1850540ae94c01271acde0c080cf58aa4f16b8e1
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.18.0.239";
|
||||
public const string MonoVersion = "5.18.0.240";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -85,6 +85,31 @@ public class Tests2 {
|
||||
}
|
||||
}
|
||||
|
||||
public struct TestEnumeratorInsideGenericStruct<TKey, TValue>
|
||||
{
|
||||
private KeyValuePair<TKey, TValue> _bucket;
|
||||
private Position _currentPosition;
|
||||
internal TestEnumeratorInsideGenericStruct(KeyValuePair<TKey, TValue> bucket)
|
||||
{
|
||||
_bucket = bucket;
|
||||
_currentPosition = Position.BeforeFirst;
|
||||
}
|
||||
|
||||
public KeyValuePair<TKey, TValue> Current
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_currentPosition == Position.BeforeFirst)
|
||||
return _bucket;
|
||||
return _bucket;
|
||||
}
|
||||
}
|
||||
private enum Position
|
||||
{
|
||||
BeforeFirst
|
||||
}
|
||||
}
|
||||
|
||||
public struct AStruct : ITest2 {
|
||||
public int i;
|
||||
public string s;
|
||||
@ -384,6 +409,7 @@ public class Tests : TestsBase, ITest2
|
||||
new Tests ().invoke_abort ();
|
||||
new Tests ().evaluate_method ();
|
||||
Bug59649 ();
|
||||
inspect_enumerator_in_generic_struct();
|
||||
return 3;
|
||||
}
|
||||
|
||||
@ -576,6 +602,11 @@ public class Tests : TestsBase, ITest2
|
||||
ss_nested_with_two_args(ss_nested_arg (), ss_nested_arg ());
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void inspect_enumerator_in_generic_struct() {
|
||||
TestEnumeratorInsideGenericStruct<String, String> generic_struct = new TestEnumeratorInsideGenericStruct<String, String>(new KeyValuePair<string, string>("0", "f1"));
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_with_two_args (int a1, int a2) {
|
||||
return a1 + a2;
|
||||
|
@ -1 +1 @@
|
||||
7de7a22a0ef9acbae4274e23f83698cd8a31f7da
|
||||
a57e595679838703ee0f1cc00d816eb02c1202dd
|
@ -1 +1 @@
|
||||
6906969e1560c229aa270d601a88da36d3b87383
|
||||
99ac89762b0486143cd94389d663f3d468971049
|
@ -1 +1 @@
|
||||
8260010ca66cf7bf43ddbb1ae0b222492747167a
|
||||
92150a4adbc3693f0a537d4684a70db6ff76fe4e
|
@ -1 +1 @@
|
||||
2d5243eb818f2ae2bd193faffdc1cd4ea4700dd7
|
||||
75ad79098e2f89377f4df5957f76b1ef29d83a5c
|
Binary file not shown.
@ -1 +1 @@
|
||||
3883499a603ad6ea46014f6bb783606055560eda
|
||||
79c306cbcdb607dbe5d0473cfafe486e74caeade
|
@ -1 +1 @@
|
||||
812d2587a089ec5a9f3a2433ebb0b07215307bd5
|
||||
cb1d70a2508cb6cfa69074beae16b8723cad144b
|
@ -1 +1 @@
|
||||
8f029d8d6f60059315f0005365154e32d83d659e
|
||||
4f81f19a4003e667bea57bf013de300e57fb70f7
|
@ -1 +1 @@
|
||||
a0c4a95a9d6ac6211cff450c608792d78d313b7e
|
||||
41ea2cd740048d39a162fc9e475ba138c9597395
|
@ -1 +1 @@
|
||||
6906969e1560c229aa270d601a88da36d3b87383
|
||||
99ac89762b0486143cd94389d663f3d468971049
|
@ -1 +1 @@
|
||||
8260010ca66cf7bf43ddbb1ae0b222492747167a
|
||||
92150a4adbc3693f0a537d4684a70db6ff76fe4e
|
@ -1 +1 @@
|
||||
2d5243eb818f2ae2bd193faffdc1cd4ea4700dd7
|
||||
75ad79098e2f89377f4df5957f76b1ef29d83a5c
|
Binary file not shown.
@ -1 +1 @@
|
||||
3883499a603ad6ea46014f6bb783606055560eda
|
||||
79c306cbcdb607dbe5d0473cfafe486e74caeade
|
@ -1 +1 @@
|
||||
812d2587a089ec5a9f3a2433ebb0b07215307bd5
|
||||
cb1d70a2508cb6cfa69074beae16b8723cad144b
|
@ -1 +1 @@
|
||||
8f029d8d6f60059315f0005365154e32d83d659e
|
||||
4f81f19a4003e667bea57bf013de300e57fb70f7
|
@ -1 +1 @@
|
||||
a0c4a95a9d6ac6211cff450c608792d78d313b7e
|
||||
41ea2cd740048d39a162fc9e475ba138c9597395
|
@ -1 +1 @@
|
||||
6906969e1560c229aa270d601a88da36d3b87383
|
||||
99ac89762b0486143cd94389d663f3d468971049
|
@ -1 +1 @@
|
||||
8260010ca66cf7bf43ddbb1ae0b222492747167a
|
||||
92150a4adbc3693f0a537d4684a70db6ff76fe4e
|
@ -1 +1 @@
|
||||
2d5243eb818f2ae2bd193faffdc1cd4ea4700dd7
|
||||
75ad79098e2f89377f4df5957f76b1ef29d83a5c
|
Binary file not shown.
@ -1 +1 @@
|
||||
3883499a603ad6ea46014f6bb783606055560eda
|
||||
79c306cbcdb607dbe5d0473cfafe486e74caeade
|
@ -1 +1 @@
|
||||
812d2587a089ec5a9f3a2433ebb0b07215307bd5
|
||||
cb1d70a2508cb6cfa69074beae16b8723cad144b
|
@ -1 +1 @@
|
||||
8f029d8d6f60059315f0005365154e32d83d659e
|
||||
4f81f19a4003e667bea57bf013de300e57fb70f7
|
@ -1 +1 @@
|
||||
a0c4a95a9d6ac6211cff450c608792d78d313b7e
|
||||
41ea2cd740048d39a162fc9e475ba138c9597395
|
@ -1 +1 @@
|
||||
6906969e1560c229aa270d601a88da36d3b87383
|
||||
99ac89762b0486143cd94389d663f3d468971049
|
@ -1 +1 @@
|
||||
8260010ca66cf7bf43ddbb1ae0b222492747167a
|
||||
92150a4adbc3693f0a537d4684a70db6ff76fe4e
|
@ -1 +1 @@
|
||||
2d5243eb818f2ae2bd193faffdc1cd4ea4700dd7
|
||||
75ad79098e2f89377f4df5957f76b1ef29d83a5c
|
Binary file not shown.
@ -1 +1 @@
|
||||
3883499a603ad6ea46014f6bb783606055560eda
|
||||
79c306cbcdb607dbe5d0473cfafe486e74caeade
|
@ -1 +1 @@
|
||||
812d2587a089ec5a9f3a2433ebb0b07215307bd5
|
||||
cb1d70a2508cb6cfa69074beae16b8723cad144b
|
@ -1 +1 @@
|
||||
8f029d8d6f60059315f0005365154e32d83d659e
|
||||
4f81f19a4003e667bea57bf013de300e57fb70f7
|
@ -1 +1 @@
|
||||
a0c4a95a9d6ac6211cff450c608792d78d313b7e
|
||||
41ea2cd740048d39a162fc9e475ba138c9597395
|
@ -1 +1 @@
|
||||
c595475b79fef1ad30a051f10f01650b79524be3
|
||||
ab6ba3420956c21d329bdb767fc76f3544561763
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/0d988bc"
|
||||
#define FULL_VERSION "explicit/5266e6a"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
18b1807a4d1acdb4c1525b1b58f8ee1c7180f20a
|
||||
22d793cf55f4e65d7ea22c880f635ea3e53b4efe
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6e89df71c925ed8a137134b58c22502325be917c
|
||||
83ee0931a990937d24a4e5c3a7678f92b5b59318
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
3a581243027655a91f7ea8149e2cd44124293f47
|
||||
9f47718a78dbacaa98540ea1e64b5b1e6f98c649
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.18.0.239\n"
|
||||
"Project-Id-Version: mono 5.18.0.240\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-01-15 08:09+0000\n"
|
||||
"POT-Creation-Date: 2019-01-16 08:06+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 @@
|
||||
a626d442d10692d9e6487fe822577c949347180b
|
||||
13411aa82567d6f9d53d693835f1f048d65e19a7
|
Loading…
x
Reference in New Issue
Block a user