Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -74,11 +74,13 @@ namespace IKVM.Reflection
{
get
{
#if !CORECLR
if (Universe.MonoRuntime)
{
// MONOBUG workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=5299
return MonoGetPublicKey();
}
#endif
using (RSACryptoServiceProvider rsa = CreateRSA())
{
byte[] cspBlob = rsa.ExportCspBlob(false);
@ -125,6 +127,7 @@ namespace IKVM.Reflection
}
}
#if !CORECLR
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private byte[] MonoGetPublicKey()
{
@ -132,5 +135,6 @@ namespace IKVM.Reflection
? new System.Reflection.StrongNameKeyPair(keyPairArray).PublicKey
: new System.Reflection.StrongNameKeyPair(keyPairContainer).PublicKey;
}
#endif
}
}