diff options
| author | Maxim Lipnin <mlipnin@gmail.com> | 2018-08-28 13:26:57 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-28 13:26:57 +0300 |
| commit | 1450bde147ba8c8ad1aa347a3c00b877b7fa799e (patch) | |
| tree | f3f8f50dadf47d04fc893003557d838676afe4ba /mcs/class/System.Data.Linq | |
| parent | ce3c8ec3f2d4e89e4b43800ddc3fbc8361c2c9f9 (diff) | |
[System.Reflection] CoreFX import for MemberInfo (#9746)
Part of #9660.
The imported CoreFX types:
- MemberInfo;
The changes:
- used MemberInfo type from CoreFX;
- moved MetadataToken property from MemberInfo to leaf classes; added unit tests.
- updated icall-def.h for related types;
- updated corlib version;
- added overridings for new HasSameMetadataDefinitionAs property to leaf classes;
- included more MemberInfo xunit tests to verify HasSameMetadataDefinitionAs property;
- renamed MemberInfoExtensions class to DbLinqMemberInfoExtensions in System.Data.Linq assembly to avoid a conflict with the class imported to System.Reflection namespace.
- [acceptance-tests] removed AssemblyExtensions class which duplicates the same functionality introduced in System.Reflection.
Diffstat (limited to 'mcs/class/System.Data.Linq')
| -rw-r--r-- | mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/Adapter/EnumType.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System.Data.Linq/src/DbLinq/Util/MemberInfoExtensions.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/Adapter/EnumType.cs b/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/Adapter/EnumType.cs index 8d2a5f67e81..1df830139f7 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/Adapter/EnumType.cs +++ b/mcs/class/System.Data.Linq/src/DbLinq/Schema/Dbml/Adapter/EnumType.cs @@ -139,7 +139,7 @@ namespace DbLinq.Schema.Dbml.Adapter string literalType = string.IsNullOrEmpty(Name) ? "enum" : Name;
literalType += " ";
literalType += string.Join(", ", keyValues.ToArray());
- MemberInfoExtensions.SetMemberValue(memberInfo, owner, literalType);
+ DbLinqMemberInfoExtensions.SetMemberValue(memberInfo, owner, literalType);
}
internal EnumType(object owner, MemberInfo memberInfo)
diff --git a/mcs/class/System.Data.Linq/src/DbLinq/Util/MemberInfoExtensions.cs b/mcs/class/System.Data.Linq/src/DbLinq/Util/MemberInfoExtensions.cs index cbc9324022f..d750ef4ee62 100644 --- a/mcs/class/System.Data.Linq/src/DbLinq/Util/MemberInfoExtensions.cs +++ b/mcs/class/System.Data.Linq/src/DbLinq/Util/MemberInfoExtensions.cs @@ -35,7 +35,7 @@ namespace DbLinq.Util #if !MONO_STRICT
public
#endif
- static class MemberInfoExtensions
+ static class DbLinqMemberInfoExtensions
{
/// <summary>
/// Returns the type of the specified member
|