Remove Assembly.EscapeCodeBase property from CoreCLR

diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml
index 1eb6ccb..294e940 100644 (file)
--- a/src/mscorlib/model.xml
+++ b/src/mscorlib/model.xml
@@ -3577,7 +3577,6 @@
       <Member Name="CreateInstance(System.String)" />
       <Member Name="CreateInstance(System.String,System.Boolean)" />
       <Member Name="CreateQualifiedName(System.String,System.String)" />
-      <Member Name="get_EscapedCodeBase" />
       <Member Name="GetReferencedAssemblies" />          
       <Member Name="get_EntryPoint" Condition="FEATURE_LEGACYNETCF" />
       <Member Name="get_FullName" />

diff --git a/src/vm/assemblyname.cpp b/src/vm/assemblyname.cpp
index 5513f1c..d7689e8 100644 (file)
--- a/src/vm/assemblyname.cpp
+++ b/src/vm/assemblyname.cpp
@@ -168,6 +168,7 @@ FCIMPL1(Object*, AssemblyNameNative::GetPublicKeyToken, Object* refThisUNSAFE)
 }
 FCIMPLEND
 
+#ifndef FEATURE_CORECLR
 FCIMPL1(Object*, AssemblyNameNative::EscapeCodeBase, StringObject* filenameUNSAFE)
 {
     FCALL_CONTRACT;
@@ -176,10 +177,6 @@ FCIMPL1(Object*, AssemblyNameNative::EscapeCodeBase, StringObject* filenameUNSAF
     STRINGREF filename  = (STRINGREF) filenameUNSAFE;
     HELPER_METHOD_FRAME_BEGIN_RET_1(filename);
 
-#ifdef FEATURE_PAL
-    // UNIXTODO: UrlEscape not implemented
-    COMPlusThrow(kPlatformNotSupportedException);
-#else
     LPWSTR pCodeBase = NULL;
     DWORD  dwCodeBase = 0;
     CQuickBytes qb;
@@ -211,12 +208,12 @@ FCIMPL1(Object*, AssemblyNameNative::EscapeCodeBase, StringObject* filenameUNSAF
         else
             COMPlusThrowHR(hr);
     }
-#endif
 
     HELPER_METHOD_FRAME_END();
     return OBJECTREFToObject(rv);
 }
 FCIMPLEND
+#endif // !FEATURE_CORECLR
 
 FCIMPL4(void, AssemblyNameNative::Init, Object * refThisUNSAFE, OBJECTREF * pAssemblyRef, CLR_BOOL fForIntrospection, CLR_BOOL fRaiseResolveEvent)
 {

diff --git a/src/vm/ecalllist.h b/src/vm/ecalllist.h
index 5078f3a..e38a026 100644 (file)
--- a/src/vm/ecalllist.h
+++ b/src/vm/ecalllist.h
@@ -1184,7 +1184,9 @@ FCFuncStart(gAssemblyNameFuncs)
 #endif // FEATURE_CORECLR
     FCFuncElement("nToString", AssemblyNameNative::ToString)
     FCFuncElement("nGetPublicKeyToken", AssemblyNameNative::GetPublicKeyToken)
+#ifndef FEATURE_CORECLR
     FCFuncElement("EscapeCodeBase", AssemblyNameNative::EscapeCodeBase)
+#endif // !FEATURE_CORECLR 
     FCFuncElement("nInit", AssemblyNameNative::Init)
     FCFuncElement("ReferenceMatchesDefinitionInternal", AssemblyNameNative::ReferenceMatchesDefinition)
 FCFuncEnd()