diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-12 10:54:14 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:55:37 -0800 |
| commit | c9850c6172e09fe824e02a6f2e7eb6c4863952d5 (patch) | |
| tree | e6feb8c6af216cbfebf3fb64eca1d482ab51977c /src/dlls/mscorrc | |
| parent | 9c93286cb13d9f50f1f25cdcbcbc3719a178b374 (diff) | |
| download | coreclr-c9850c6172e09fe824e02a6f2e7eb6c4863952d5.tar.gz coreclr-c9850c6172e09fe824e02a6f2e7eb6c4863952d5.tar.bz2 coreclr-c9850c6172e09fe824e02a6f2e7eb6c4863952d5.zip | |
Remove always defined FEATURE_HOST_ASSEMBLY_RESOLVER
Diffstat (limited to 'src/dlls/mscorrc')
| -rw-r--r-- | src/dlls/mscorrc/mscorrc.rc | 2 | ||||
| -rw-r--r-- | src/dlls/mscorrc/resource.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc index 3489cd9ccf..bb2a9ee0fb 100644 --- a/src/dlls/mscorrc/mscorrc.rc +++ b/src/dlls/mscorrc/mscorrc.rc @@ -2103,7 +2103,6 @@ BEGIN IDS_EE_ERROR_IDISPATCH "IDispatch and IDispatchEx are not supported" END -#ifdef FEATURE_HOST_ASSEMBLY_RESOLVER STRINGTABLE DISCARDABLE BEGIN IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT "Assembly with same name is already loaded" @@ -2111,7 +2110,6 @@ BEGIN IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_BINDING_CONTEXT "Assembly is already bound to an incompatible binding context." IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_TPA_BINDING_CONTEXT "Default binding context is already attached to managed load context." END -#endif // FEATURE_HOST_ASSEMBLY_RESOLVER STRINGTABLE DISCARDABLE BEGIN diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h index 3b87d1e9cb..6153246bb4 100644 --- a/src/dlls/mscorrc/resource.h +++ b/src/dlls/mscorrc/resource.h @@ -927,12 +927,10 @@ #define IDS_EE_BADMARSHAL_TYPE_IDISPATCH 0x2634 #define IDS_EE_ERROR_IDISPATCH 0x2635 -#ifdef FEATURE_HOST_ASSEMBLY_RESOLVER #define IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT 0x2636 #define IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED 0x2637 #define IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_BINDING_CONTEXT 0x2638 #define IDS_HOST_ASSEMBLY_RESOLVER_INCOMPATIBLE_TPA_BINDING_CONTEXT 0x2639 -#endif // FEATURE_HOST_ASSEMBLY_RESOLVER #define IDS_NATIVE_IMAGE_CANNOT_BE_LOADED_MULTIPLE_TIMES 0x263a |