diff options
| author | Yi Zhang <yzha@microsoft.com> | 2015-04-11 11:39:55 -0700 |
|---|---|---|
| committer | Yi Zhang <yzha@microsoft.com> | 2015-04-11 11:39:55 -0700 |
| commit | db2a7f6f4ef6bfc4d4b78209f9fe28b633e592a1 (patch) | |
| tree | 9428056c7be67076c2654405206d057c34fa0c4d /src/vm | |
| parent | f4f1e8c7b588c125629286bb5782d209be9583be (diff) | |
| download | coreclr-db2a7f6f4ef6bfc4d4b78209f9fe28b633e592a1.tar.gz coreclr-db2a7f6f4ef6bfc4d4b78209f9fe28b633e592a1.tar.bz2 coreclr-db2a7f6f4ef6bfc4d4b78209f9fe28b633e592a1.zip | |
When marshaling System.URI we to and from WinRT we use need to access System.URI members(get_OriginalString, ctor). We currently use TypeName::GetTypeFromAsmQualifiedName to load the type and specify System.dll. The change is to simply use System.Runtime instead.
[tfs-changeset: 1451164]
Diffstat (limited to 'src/vm')
| -rw-r--r-- | src/vm/classnames.h | 1 | ||||
| -rw-r--r-- | src/vm/mlinfo.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/vm/classnames.h b/src/vm/classnames.h index 1b06ea26e8..fe75f7aa52 100644 --- a/src/vm/classnames.h +++ b/src/vm/classnames.h @@ -29,6 +29,7 @@ #define g_FXKeyToken "b03f5f7f11d50a3a" // The FX key used by other framework assemblies: System.Web, System.Drawing, etc. #define g_CoreClrKeyToken "7CEC85D7BEA7798E" // The silverlight platform key used by CoreClr framework assemblies: mscorlib, system, etc #define g_SystemAsmName "System" +#define g_SystemRuntimeAsmName "System.Runtime" #define g_DrawingAsmName "System.Drawing" #define g_ColorClassName "System.Drawing.Color" #define g_ColorTranslatorClassName "System.Drawing.ColorTranslator" diff --git a/src/vm/mlinfo.cpp b/src/vm/mlinfo.cpp index 78bc3e0a54..ca16e3b8e8 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_SystemAsmName, VER_ASSEMBLYVERSION_STR, FX_PLATFORM_KEY); + 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(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); |