projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df58be8
)
Added netstandard corelib into ilasm reference resolver
author
Roman Artemev
<rartemev@microsoft.com>
Fri, 7 Apr 2017 23:07:14 +0000
(16:07 -0700)
committer
Roman Artemev
<rartemev@microsoft.com>
Mon, 10 Apr 2017 19:46:15 +0000
(12:46 -0700)
Commit migrated from https://github.com/dotnet/coreclr/commit/
a1cde62225c0a7d5c889bff6e21660e2e170299a
src/coreclr/src/ilasm/assembler.cpp
patch
|
blob
|
history
diff --git
a/src/coreclr/src/ilasm/assembler.cpp
b/src/coreclr/src/ilasm/assembler.cpp
index
92fd681
..
957b0bd
100644
(file)
--- a/
src/coreclr/src/ilasm/assembler.cpp
+++ b/
src/coreclr/src/ilasm/assembler.cpp
@@
-276,11
+276,16
@@
mdToken Assembler::GetAsmRef(__in __nullterminated const char* szName)
mdToken Assembler::GetBaseAsmRef()
{
- if(RidFromToken(m_pManifest->GetAsmRefTokByName("System.Runtime")) != 0)
+ if
(RidFromToken(m_pManifest->GetAsmRefTokByName("System.Runtime")) != 0)
{
return GetAsmRef("System.Runtime");
}
+ if (RidFromToken(m_pManifest->GetAsmRefTokByName("netstandard")) != 0)
+ {
+ return GetAsmRef("netstandard");
+ }
+
return GetAsmRef("mscorlib");
}