diff --git a/src/coreclr/inc/corerror.xml b/src/coreclr/inc/corerror.xml
index 7bb188b654cbef..1d4129305fa680 100644
--- a/src/coreclr/inc/corerror.xml
+++ b/src/coreclr/inc/corerror.xml
@@ -2067,42 +2067,6 @@
CLDB_E_INTERNALERROR
-
- CLR_E_BIND_ASSEMBLY_VERSION_TOO_LOW
- "The bound assembly has a version that is lower than that of the request."
- For AppX binder, indicates that bound assembly has a version lower than that requested, and we will refuse version rollback.
-
-
-
- CLR_E_BIND_ASSEMBLY_PUBLIC_KEY_MISMATCH
- "The assembly version has a public key token that does not match that of the request."
- For AppX binder, indicates that bound assembly's public key token doesn't match the key in the assembly name.
-
-
-
- CLR_E_BIND_IMAGE_UNAVAILABLE
- "The requested image was not found or is unavailable."
- Occurs if a request for a native image is made on an BINDER_SPACE::Assembly interface when one is not available.
-
-
-
- CLR_E_BIND_UNRECOGNIZED_IDENTITY_FORMAT
- "The provided identity format is not recognized."
- If a binder is provided an identity format that it cannot parse, it returns this error.
-
-
-
- CLR_E_BIND_ASSEMBLY_NOT_FOUND
- "A binding for the specified assembly name was not found."
- Returned by binders that bind based on assembly identity.
-
-
-
- CLR_E_BIND_TYPE_NOT_FOUND
- "A binding for the specified type name was not found."
- Returned by binders that bind based on type identity.
-
-
CLR_E_BIND_ARCHITECTURE_MISMATCH
"The assembly architecture is not compatible with the current process architecture."
diff --git a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc
index 1e6b477bda157c..67c5f9d48fec1d 100644
--- a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc
+++ b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc
@@ -291,12 +291,6 @@ BEGIN
MSG_FOR_URT_HR(CORDBG_E_ASSEMBLY_UPDATES_APPLIED) "The operation is not supported because assembly updates have been applied."
MSG_FOR_URT_HR(PEFMT_E_64BIT) "File is PE32+."
MSG_FOR_URT_HR(PEFMT_E_32BIT) "File is PE32"
- MSG_FOR_URT_HR(CLR_E_BIND_ASSEMBLY_VERSION_TOO_LOW) "The bound assembly has a version that is lower than that of the request."
- MSG_FOR_URT_HR(CLR_E_BIND_ASSEMBLY_PUBLIC_KEY_MISMATCH) "The assembly version has a public key token that does not match that of the request."
- MSG_FOR_URT_HR(CLR_E_BIND_IMAGE_UNAVAILABLE) "The requested image was not found or is unavailable."
- MSG_FOR_URT_HR(CLR_E_BIND_UNRECOGNIZED_IDENTITY_FORMAT) "The provided identity format is not recognized."
- MSG_FOR_URT_HR(CLR_E_BIND_ASSEMBLY_NOT_FOUND) "A binding for the specified assembly name was not found."
- MSG_FOR_URT_HR(CLR_E_BIND_TYPE_NOT_FOUND) "A binding for the specified type name was not found."
MSG_FOR_URT_HR(CLR_E_BIND_ARCHITECTURE_MISMATCH) "The assembly architecture is not compatible with the current process architecture."
MSG_FOR_URT_HR(CLR_E_GC_OOM) "Failfast due to an OOM during a GC"
MSG_FOR_URT_HR(CLR_E_GC_BAD_AFFINITY_CONFIG) "GCHeapAffinitizeMask or GCHeapAffinitizeRanges didn't specify any CPUs the current process is affinitized to."
diff --git a/src/coreclr/pal/prebuilt/inc/corerror.h b/src/coreclr/pal/prebuilt/inc/corerror.h
index 10a79ee42bcf9b..994648cb25ea7b 100644
--- a/src/coreclr/pal/prebuilt/inc/corerror.h
+++ b/src/coreclr/pal/prebuilt/inc/corerror.h
@@ -363,12 +363,6 @@
#define PEFMT_E_64BIT EMAKEHR(0x1d02)
#define PEFMT_E_32BIT EMAKEHR(0x1d0b)
#define CLDB_E_INTERNALERROR EMAKEHR(0x1fff)
-#define CLR_E_BIND_ASSEMBLY_VERSION_TOO_LOW EMAKEHR(0x2000)
-#define CLR_E_BIND_ASSEMBLY_PUBLIC_KEY_MISMATCH EMAKEHR(0x2001)
-#define CLR_E_BIND_IMAGE_UNAVAILABLE EMAKEHR(0x2002)
-#define CLR_E_BIND_UNRECOGNIZED_IDENTITY_FORMAT EMAKEHR(0x2003)
-#define CLR_E_BIND_ASSEMBLY_NOT_FOUND EMAKEHR(0x2004)
-#define CLR_E_BIND_TYPE_NOT_FOUND EMAKEHR(0x2005)
#define CLR_E_BIND_ARCHITECTURE_MISMATCH EMAKEHR(0x2006)
#define CLR_E_GC_OOM EMAKEHR(0x2009)
#define CLR_E_GC_BAD_AFFINITY_CONFIG EMAKEHR(0x200a)
diff --git a/src/coreclr/vm/assembly.cpp b/src/coreclr/vm/assembly.cpp
index d196eee3fd9504..7da608d5e17a55 100644
--- a/src/coreclr/vm/assembly.cpp
+++ b/src/coreclr/vm/assembly.cpp
@@ -1634,11 +1634,14 @@ OBJECTREF Assembly::GetExposedObject()
BOOL Assembly::FileNotFound(HRESULT hr)
{
LIMITED_METHOD_CONTRACT;
- return IsHRESULTForExceptionKind(hr, kFileNotFoundException) ||
+ if (IsHRESULTForExceptionKind(hr, kFileNotFoundException))
+ return TRUE;
+
#ifdef FEATURE_COMINTEROP
- (hr == RO_E_METADATA_NAME_NOT_FOUND) ||
+ return hr == RO_E_METADATA_NAME_NOT_FOUND;
+#else
+ return FALSE;
#endif //FEATURE_COMINTEROP
- (hr == CLR_E_BIND_TYPE_NOT_FOUND);
}
diff --git a/src/coreclr/vm/excep.cpp b/src/coreclr/vm/excep.cpp
index 1c22e7f182a5a9..c7f085a03b3fb3 100644
--- a/src/coreclr/vm/excep.cpp
+++ b/src/coreclr/vm/excep.cpp
@@ -5778,6 +5778,7 @@ extern "C" void QCALLTYPE FileLoadException_GetMessageForHR(UINT32 hresult, QCal
case COR_E_BADIMAGEFORMAT:
case COR_E_NEWER_RUNTIME:
case COR_E_ASSEMBLYEXPECTED:
+ case CLR_E_BIND_ARCHITECTURE_MISMATCH:
bNoGeekStuff = TRUE;
break;
}
diff --git a/src/coreclr/vm/rexcep.h b/src/coreclr/vm/rexcep.h
index bf424b7135b7d9..3f2c1cee117ae3 100644
--- a/src/coreclr/vm/rexcep.h
+++ b/src/coreclr/vm/rexcep.h
@@ -95,7 +95,7 @@ DEFINE_EXCEPTION(g_SystemNS, ApplicationException, false, C
DEFINE_EXCEPTION(g_SystemNS, ArithmeticException, false, COR_E_ARITHMETIC)
DEFINE_EXCEPTION(g_SystemNS, ArgumentException, false,
- COR_E_ARGUMENT, STD_CTL_SCODE(449), STD_CTL_SCODE(450), CLR_E_BIND_UNRECOGNIZED_IDENTITY_FORMAT)
+ COR_E_ARGUMENT, STD_CTL_SCODE(449), STD_CTL_SCODE(450))
DEFINE_EXCEPTION(g_SystemNS, ArgumentOutOfRangeException, false, COR_E_ARGUMENTOUTOFRANGE, HRESULT_FROM_WIN32(ERROR_NO_UNICODE_TRANSLATION))
DEFINE_EXCEPTION(g_SystemNS, ArrayTypeMismatchException, false, COR_E_ARRAYTYPEMISMATCH)
@@ -144,7 +144,7 @@ DEFINE_EXCEPTION(g_SystemNS, FieldAccessException, false, C
DEFINE_EXCEPTION(g_IONS, FileLoadException, true,
COR_E_FILELOAD,
FUSION_E_INVALID_NAME,
- FUSION_E_PRIVATE_ASM_DISALLOWED,
+ FUSION_E_PRIVATE_ASM_DISALLOWED,
FUSION_E_REF_DEF_MISMATCH,
HRESULT_FROM_WIN32(ERROR_TOO_MANY_OPEN_FILES),
HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), HRESULT_FROM_WIN32(ERROR_LOCK_VIOLATION),
@@ -162,9 +162,7 @@ DEFINE_EXCEPTION(g_IONS, FileNotFoundException, true,
HRESULT_FROM_WIN32(ERROR_WRONG_TARGET_NAME), INET_E_UNKNOWN_PROTOCOL,
INET_E_CONNECTION_TIMEOUT, INET_E_CANNOT_CONNECT, INET_E_RESOURCE_NOT_FOUND,
INET_E_OBJECT_NOT_FOUND, INET_E_DOWNLOAD_FAILURE, INET_E_DATA_NOT_AVAILABLE,
- HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND),
- CLR_E_BIND_ASSEMBLY_VERSION_TOO_LOW, CLR_E_BIND_ASSEMBLY_PUBLIC_KEY_MISMATCH,
- CLR_E_BIND_ASSEMBLY_NOT_FOUND)
+ HRESULT_FROM_WIN32(ERROR_DLL_NOT_FOUND))
DEFINE_EXCEPTION(g_SystemNS, FormatException, false, COR_E_FORMAT)
@@ -250,7 +248,7 @@ DEFINE_EXCEPTION(g_SystemNS, TypeInitializationException, false, C
#ifdef FEATURE_COMINTEROP
DEFINE_EXCEPTION(g_SystemNS, TypeLoadException, false, COR_E_TYPELOAD,
- RO_E_METADATA_NAME_NOT_FOUND, CLR_E_BIND_TYPE_NOT_FOUND)
+ RO_E_METADATA_NAME_NOT_FOUND)
#else
DEFINE_EXCEPTION(g_SystemNS, TypeLoadException, false, COR_E_TYPELOAD)
#endif