diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-05-30 19:34:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 19:34:53 +0300 |
| commit | 37fe83f6eaf073ae7ecd470bf3d2541af5829652 (patch) | |
| tree | a559e8ddcc72d01d73a4616bf54d84712e2f7719 /mcs/class/corlib/Assembly | |
| parent | e06781fb7a9404144a12c9ae9cd04a4bdf337601 (diff) | |
[S.R.I.RuntimeInformation] Fix FrameworkDescription on Android (#4946)
* [S.R.I.RuntimeInformation] Fix FrameworkDescription on Android
It turns out using `DllImport ["__Internal"]` doesn't work on
XA (and other cases where Mono is embedded) because it searches
for the method in the host which embeds Mono and doesn't find it,
resulting in an EntryPointNotFoundException.
We need to switch to an icall instead. However there's already
an existing icall+BCL wrapper: Mono.Runtime.GetDisplayName().
Added IVT from corlib to S.R.I.RuntimeInformation so we can call it.
* Update API snapshot
Diffstat (limited to 'mcs/class/corlib/Assembly')
| -rw-r--r-- | mcs/class/corlib/Assembly/AssemblyInfo.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs index 6e1e9ef1264..54b21cdf3ba 100644 --- a/mcs/class/corlib/Assembly/AssemblyInfo.cs +++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs @@ -79,6 +79,8 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo ("System.Runtime.WindowsRuntime, PublicKey=00000000000000000400000000000000")] [assembly: InternalsVisibleTo ("System.Runtime.WindowsRuntime.UI.Xaml, PublicKey=00000000000000000400000000000000")] +[assembly: InternalsVisibleTo ("System.Runtime.InteropServices.RuntimeInformation, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] + #if MONOTOUCH #if MONOTOUCH_TV [assembly: InternalsVisibleTo ("Xamarin.TVOS, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] |