Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -362,8 +362,7 @@ namespace System.Reflection {
}
}
// We don't support key migration on Silverlight, as libraries should all be distributed with the application.
#if FEATURE_STRONGNAME_MIGRATION || FEATURE_NETCORE
#if FEATURE_STRONGNAME_MIGRATION
[AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple=false)]
public sealed class AssemblySignatureKeyAttribute : Attribute
{
@@ -388,7 +387,6 @@ namespace System.Reflection {
}
#endif
#if FEATURE_CORECLR || !FEATURE_PAL || MONO
[AttributeUsage (AttributeTargets.Assembly, Inherited=false)]
[System.Runtime.InteropServices.ComVisible(true)]
public sealed class AssemblyKeyNameAttribute : Attribute
@@ -405,7 +403,6 @@ namespace System.Reflection {
get { return m_keyName; }
}
}
#endif // FEATURE_CORECLR || !FEATURE_PAL
}