Imported Upstream version 6.12.0.154

Former-commit-id: 4110a97c739003f763b0c5b8a1561339cda7cda3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2021-09-03 21:58:24 +00:00
parent cb227eef93
commit 4651b7ea22
53 changed files with 765 additions and 757 deletions

View File

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

@ -192,14 +192,20 @@ namespace System.Reflection
override
object[] GetCustomAttributes (bool inherit)
{
return MonoCustomAttrs.GetCustomAttributes (this, inherit);
// It is documented that the inherit flag is ignored.
// Attribute.GetCustomAttributes is to be used to search
// inheritance chain.
return MonoCustomAttrs.GetCustomAttributes (this, false);
}
public
override
object[] GetCustomAttributes (Type attributeType, bool inherit)
{
return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
// It is documented that the inherit flag is ignored.
// Attribute.GetCustomAttributes is to be used to search
// inheritance chain.
return MonoCustomAttrs.GetCustomAttributes (this, attributeType, false);
}
internal object GetDefaultValueImpl (ParameterInfo pinfo)

View File

@ -1 +1 @@
9f1a0bd9178e3a6159583955be181434ebd880b1
da956bfb7de7549706847fa09a12bc2d37476b85

View File

@ -1 +1 @@
ea3b729a65c4fc500b16e3ed8eaf03be873b4f6f
a5284facf5b1e1a8a4c20bae8fe6ce727421e156

View File

@ -1 +1 @@
d50d12c3e242830f3fd481295a5b0c05eefb5ae7
462f2d54ad4fe5700a067544d4dd6c3a5906cb6c

View File

@ -1 +1 @@
933ae46e5f4ddeefd540f33b77e3265e5db48ac7
01eedb674c05a54a30cb6dac583e715122a17553

View File

@ -1 +1 @@
20a1ba1dc04f916e5b37a061f62ba1e2682f6842
76dac215e150f05f9babab9f8959957bd4103b8b

View File

@ -1 +1 @@
3f74f0c1d792c05b8a18abd281695f2b68dbf389
267a51d5112e6dbb9f29e426d8c81b33ca17f1c5

View File

@ -1 +1 @@
a1ff5e48169a9110dfb9054fb06696a3a85f3ce7
58edb4924657d68ca84d376f7d1b45b6943fa327

View File

@ -1 +1 @@
4ffa65a98dc09dfa1e88cc62fd2006bcd1c3b128
bfbf938f131dd34436f55e6807f6c6f80d1a871e

View File

@ -1 +1 @@
9f1a0bd9178e3a6159583955be181434ebd880b1
da956bfb7de7549706847fa09a12bc2d37476b85

View File

@ -1 +1 @@
ea3b729a65c4fc500b16e3ed8eaf03be873b4f6f
a5284facf5b1e1a8a4c20bae8fe6ce727421e156

View File

@ -1 +1 @@
d50d12c3e242830f3fd481295a5b0c05eefb5ae7
462f2d54ad4fe5700a067544d4dd6c3a5906cb6c

View File

@ -1 +1 @@
933ae46e5f4ddeefd540f33b77e3265e5db48ac7
01eedb674c05a54a30cb6dac583e715122a17553

View File

@ -1 +1 @@
20a1ba1dc04f916e5b37a061f62ba1e2682f6842
76dac215e150f05f9babab9f8959957bd4103b8b

View File

@ -1 +1 @@
3f74f0c1d792c05b8a18abd281695f2b68dbf389
267a51d5112e6dbb9f29e426d8c81b33ca17f1c5

View File

@ -1 +1 @@
a1ff5e48169a9110dfb9054fb06696a3a85f3ce7
58edb4924657d68ca84d376f7d1b45b6943fa327

View File

@ -1 +1 @@
4ffa65a98dc09dfa1e88cc62fd2006bcd1c3b128
bfbf938f131dd34436f55e6807f6c6f80d1a871e

View File

@ -1 +1 @@
9f1a0bd9178e3a6159583955be181434ebd880b1
da956bfb7de7549706847fa09a12bc2d37476b85

View File

@ -1 +1 @@
ea3b729a65c4fc500b16e3ed8eaf03be873b4f6f
a5284facf5b1e1a8a4c20bae8fe6ce727421e156

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