diff options
author | Ryan Byington <ryanbyi@microsoft.com> | 2015-04-21 16:15:59 -0700 |
---|---|---|
committer | Ryan Byington <ryanbyi@microsoft.com> | 2015-04-21 16:15:59 -0700 |
commit | 103680193d2f61308103a113bd2dac97e0206c99 (patch) | |
tree | ca728f37a53c91d4d6cf7626bb9f6f2a8ea977c3 /src/md | |
parent | 55cbbaf98515d13ae6c08a28da1eb9196093e1dc (diff) | |
download | coreclr-103680193d2f61308103a113bd2dac97e0206c99.tar.gz coreclr-103680193d2f61308103a113bd2dac97e0206c99.tar.bz2 coreclr-103680193d2f61308103a113bd2dac97e0206c99.zip |
Update framework assembly for System.Uri WinRT projection from System.dll to Internal.Uri.dll
For NetCore for CoreCLR System.Uri was moved from System.dll to Internal.Uri.dll. This change updates the WinRT projection for this change.
This is a temporary workaround while we investigate a complete fix and will break phone and .NET 4.6 scenarios.
[tfs-changeset: 1457678]
Diffstat (limited to 'src/md')
-rw-r--r-- | src/md/winmd/adapter.cpp | 2 | ||||
-rw-r--r-- | src/md/winmd/inc/adapter.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/md/winmd/adapter.cpp b/src/md/winmd/adapter.cpp index 0a93f88d58..64cc25ce49 100644 --- a/src/md/winmd/adapter.cpp +++ b/src/md/winmd/adapter.cpp @@ -1134,7 +1134,7 @@ void WinMDAdapter::GetExtraAssemblyRefProps(FrameworkAssemblyIndex index, else #endif { - if (index == FrameworkAssembly_SystemNumericsVectors) + if (index == FrameworkAssembly_SystemNumericsVectors || index == FrameworkAssembly_InternalUri) { *ppPublicKeytoken = s_pbContractPublicKeyToken; *pTokenLength = sizeof(s_pbContractPublicKeyToken); diff --git a/src/md/winmd/inc/adapter.h b/src/md/winmd/inc/adapter.h index 8b1be4cfb9..14a26b56b1 100644 --- a/src/md/winmd/inc/adapter.h +++ b/src/md/winmd/inc/adapter.h @@ -87,6 +87,7 @@ public: FrameworkAssembly_SystemRuntimeWindowsRuntime, FrameworkAssembly_SystemRuntimeWindowsRuntimeUIXaml, FrameworkAssembly_SystemNumericsVectors, + FrameworkAssembly_InternalUri, FrameworkAssembly_Count, }; @@ -633,6 +634,8 @@ public: return "System.Runtime.WindowsRuntime.UI.Xaml"; case FrameworkAssembly_SystemNumericsVectors: return "System.Numerics.Vectors"; + case FrameworkAssembly_InternalUri: + return "Internal.Uri"; default: _ASSERTE(!"Invalid AssemblyRef token!"); return NULL; |