diff options
| author | Ryan Byington <ryanbyi@microsoft.com> | 2015-04-13 08:36:34 -0700 |
|---|---|---|
| committer | Ryan Byington <ryanbyi@microsoft.com> | 2015-04-13 08:36:34 -0700 |
| commit | c37fb9584fa4fcfc384f8679e1282a0a71448e45 (patch) | |
| tree | b93c051a69f80c31ba639597e302bd93fa67427b /src/vm | |
| parent | 45a81063b35cac88303b098a26950924bd08008f (diff) | |
| download | coreclr-c37fb9584fa4fcfc384f8679e1282a0a71448e45.tar.gz coreclr-c37fb9584fa4fcfc384f8679e1282a0a71448e45.tar.bz2 coreclr-c37fb9584fa4fcfc384f8679e1282a0a71448e45.zip | |
Fixing the public key token that gets used to find System.Uri in System.Runtime during marshaling.
[tfs-changeset: 1451527]
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/mlinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm/mlinfo.cpp b/src/vm/mlinfo.cpp index ca16e3b8e8..9b1b34c993 100644 --- a/src/vm/mlinfo.cpp +++ b/src/vm/mlinfo.cpp @@ -57,7 +57,7 @@ DEFINE_ASM_QUAL_TYPE_NAME(COLOR_TRANSLATOR_ASM_QUAL_TYPE_NAME, g_ColorTranslatorClassName, g_DrawingAsmName, VER_ASSEMBLYVERSION_STR, g_FXKeyToken); DEFINE_ASM_QUAL_TYPE_NAME(COLOR_ASM_QUAL_TYPE_NAME, g_ColorClassName, g_DrawingAsmName, VER_ASSEMBLYVERSION_STR, g_FXKeyToken); - DEFINE_ASM_QUAL_TYPE_NAME(URI_ASM_QUAL_TYPE_NAME, g_SystemUriClassName, g_SystemRuntimeAsmName, VER_ASSEMBLYVERSION_STR, FX_PLATFORM_KEY); + DEFINE_ASM_QUAL_TYPE_NAME(URI_ASM_QUAL_TYPE_NAME, g_SystemUriClassName, g_SystemRuntimeAsmName, VER_ASSEMBLYVERSION_STR, g_FXKeyToken); DEFINE_ASM_QUAL_TYPE_NAME(NCCEVENTARGS_ASM_QUAL_TYPE_NAME, g_NotifyCollectionChangedEventArgsName, g_SystemAsmName, VER_ASSEMBLYVERSION_STR, FX_PLATFORM_KEY); DEFINE_ASM_QUAL_TYPE_NAME(NCCEVENTARGS_MARSHALER_ASM_QUAL_TYPE_NAME, g_NotifyCollectionChangedEventArgsMarshalerName, g_SystemAsmName, VER_ASSEMBLYVERSION_STR, FX_PLATFORM_KEY); |