1 files changed, 6 insertions, 32 deletions
diff --git a/src/ilasm/assembler.cpp b/src/ilasm/assembler.cpp
index 49d4ee9712..957b0bd22b 100644
--- a/src/ilasm/assembler.cpp
+++ b/src/ilasm/assembler.cpp
@@ -99,17 +99,6 @@ mdToken Assembler::ResolveClassRef(mdToken tkResScope, __in __nullterminated con
     mdToken *ptkSpecial = NULL;
 
     if(pszFullClassName == NULL) return mdTokenNil;
-#if (0)
-    if (m_fInitialisedMetaData == FALSE)
-    {
-        if (FAILED(InitMetaData())) // impl. see WRITER.CPP
-        {
-            _ASSERTE(0);
-            if(ppClass) *ppClass = NULL;
-            return mdTokenNil;
-        }
-    }
-#endif
 
     switch(strlen(pszFullClassName))
     {
@@ -287,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");
 }
 
@@ -2213,26 +2207,6 @@ void Assembler::EmitBytes(BYTE *p, unsigned len)
 BinStr* Assembler::EncodeSecAttr(__in __nullterminated char* szReflName, BinStr* pbsSecAttrBlob, unsigned nProps)
 {
     unsigned cnt;
-#if (0)
-    // Emit MemberRef for .ctor
-    mdToken tkMscorlib = m_fIsMscorlib ? 1 : GetAsmRef("mscorlib");
-    char buffer[64];
-    BinStr  *pbsSig = new BinStr();
-
-    strcpy(buffer,"System.Security.Permissions.SecurityAction");
-    mdToken tkSecAction = ResolveClassRef(tkMscorlib,buffer, NULL);
-
-    pbsSig->appendInt8(IMAGE_CEE_CS_CALLCONV_HASTHIS);
-    pbsSig->appendInt8(1); //corEmitInt(pbsSig,1);
-    pbsSig->appendInt8(ELEMENT_TYPE_VOID);
-    pbsSig->appendInt8(ELEMENT_TYPE_VALUETYPE);
-    cnt = CorSigCompressToken(tkSecAction, pbsSig->getBuff(5));
-    pbsSig->remove(5 - cnt);
-    
-    char* szName = new char[16];
-    strcpy(szName,".ctor");
-    MakeMemberRef(tkSecAttr,szName,pbsSig);
-#endif
 
     // build the blob As BinStr
     unsigned L = (unsigned) strlen(szReflName);