diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-10-29 19:09:52 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-10-29 19:09:52 -0700 |
| commit | a8192fbc7064ed96cfeb8872bcb6479c217f7b5f (patch) | |
| tree | 738c092202d3ce5c7ed4ec08114c3c41b7b005d8 /src/md | |
| parent | 3c50dec5796206c6042fd6adc3133a0ad22649e5 (diff) | |
| download | coreclr-a8192fbc7064ed96cfeb8872bcb6479c217f7b5f.tar.gz coreclr-a8192fbc7064ed96cfeb8872bcb6479c217f7b5f.tar.bz2 coreclr-a8192fbc7064ed96cfeb8872bcb6479c217f7b5f.zip | |
Port .NET Framework 4.6.1 changes
Core runtime and GC changes from https://github.com/Microsoft/dotnet/blob/master/docs/releases/net461/dotnet461-changes.md that are not in CoreCLR yet
[tfs-changeset: 1543382]
Diffstat (limited to 'src/md')
| -rw-r--r-- | src/md/winmd/inc/adapter.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/md/winmd/inc/adapter.h b/src/md/winmd/inc/adapter.h index 748d65d473..111c9bd94d 100644 --- a/src/md/winmd/inc/adapter.h +++ b/src/md/winmd/inc/adapter.h @@ -633,7 +633,11 @@ public: case FrameworkAssembly_SystemRuntimeWindowsRuntimeUIXaml: return "System.Runtime.WindowsRuntime.UI.Xaml"; case FrameworkAssembly_SystemNumericsVectors: +#ifdef FEATURE_CORECLR return "System.Numerics.Vectors"; +#else + return "System.Numerics"; +#endif default: _ASSERTE(!"Invalid AssemblyRef token!"); return NULL; |