Merge branch 'upstream'

Former-commit-id: 5e0c57c29d2ea67d84c6d64c53ff577ee3fe5e7d
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-12-20 09:14:22 +00:00
commit bf253ec163
54 changed files with 102 additions and 82 deletions

View File

@ -1 +1 @@
8ebc8326f0876923619de5e491b3e62664479d18
2ce6c2131f7b8b3079c900084af3240c24f86340

View File

@ -1 +1 @@
ee891702d74552bf93cab3258e51f559981be94e
c0e743df5fbb47a5fe35a704f8e79be992a3eadc

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.219";
public const string MonoVersion = "5.18.0.223";
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

@ -506,5 +506,14 @@ namespace MonoTests.System.Reflection
Assert.AreEqual (expected, actual, "#1");
}
[Test]
public void ReturnParameter_IsDefined_False ()
{
Type type = typeof (object);
MethodInfo method = type.GetMethod ("ToString");
ParameterInfo paramInfo = method.ReturnParameter;
Assert.IsFalse (paramInfo.IsDefined (typeof (Attribute)));
}
}
}

View File

@ -1 +1 @@
95acc042739943bbd3647602cba9333708296d2a
ec1b95ed84e41497894ff47af284d09441fe2b9d

View File

@ -1 +1 @@
0bb1a2c71384164b93825b44667cf43cd7514002
da93afc853249356333970bf2e895a79a4396aa5

View File

@ -1 +1 @@
725c090642989743bad4eec52fd95b35e3b6997d
87756e5e0786babce29f2252713def5f5097f608

View File

@ -1 +1 @@
cf9a42775b0d1659120c13af9cbbd7e707515320
c1868137ecbfd58a439cb2869f9a49d51ac9c2ae

View File

@ -1 +1 @@
6c29afb83173af842fee496f1a22db5c53d143b8
4f811e6e585a4688a3d06c49fcf3c80bd71530e2

View File

@ -1 +1 @@
d1616fed145503cb7e440209f90de14b222e0521
57d5497782de74426d145cc380ba1a72ca4c9da2

View File

@ -1 +1 @@
371b9785e82b18a1731f250d5eacaa3d1975eada
b7be922d9ee313758f015735c542889ec22647c4

View File

@ -1 +1 @@
95acc042739943bbd3647602cba9333708296d2a
ec1b95ed84e41497894ff47af284d09441fe2b9d

View File

@ -1 +1 @@
0bb1a2c71384164b93825b44667cf43cd7514002
da93afc853249356333970bf2e895a79a4396aa5

View File

@ -1 +1 @@
725c090642989743bad4eec52fd95b35e3b6997d
87756e5e0786babce29f2252713def5f5097f608

View File

@ -1 +1 @@
cf9a42775b0d1659120c13af9cbbd7e707515320
c1868137ecbfd58a439cb2869f9a49d51ac9c2ae

View File

@ -1 +1 @@
6c29afb83173af842fee496f1a22db5c53d143b8
4f811e6e585a4688a3d06c49fcf3c80bd71530e2

View File

@ -1 +1 @@
d1616fed145503cb7e440209f90de14b222e0521
57d5497782de74426d145cc380ba1a72ca4c9da2

View File

@ -1 +1 @@
371b9785e82b18a1731f250d5eacaa3d1975eada
b7be922d9ee313758f015735c542889ec22647c4

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