diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-04-27 17:08:26 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-04-27 17:08:26 -0700 |
commit | 01372d2578f8c265bd5368a20e416a5798b8534a (patch) | |
tree | 9181246dfd3227193e424f51ccc05f75943945a4 /src/dlls | |
parent | b030d38df2af63a491c3783165b2f40040be6db3 (diff) | |
download | coreclr-01372d2578f8c265bd5368a20e416a5798b8534a.tar.gz coreclr-01372d2578f8c265bd5368a20e416a5798b8534a.tar.bz2 coreclr-01372d2578f8c265bd5368a20e416a5798b8534a.zip |
Fix FileLoadException message for CoreCLR (#4624)
Fix FileLoadException message for CoreCLR
Diffstat (limited to 'src/dlls')
-rw-r--r-- | src/dlls/mscorrc/mscorrc.rc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc index a1d4de1c7d..be9fb1cfa6 100644 --- a/src/dlls/mscorrc/mscorrc.rc +++ b/src/dlls/mscorrc/mscorrc.rc @@ -994,7 +994,12 @@ BEGIN IDS_EE_LOAD_BAD_MAIN_SIG "Main method for type '%1' has invalid signature." IDS_EE_LOAD_CIRCULAR_DEPENDENCY "A circular dependency was detected when loading file or assembly '%1'." +#ifdef FEATURE_CORECLR + IDS_EE_FILE_NOT_FOUND "File or assembly name '%1' was not found." +#else IDS_EE_FILE_NOT_FOUND "File or assembly name '%1', or one of its dependencies, was not found." +#endif + IDS_EE_TOO_MANY_OPEN_FILES "The system cannot open file '%1'. There may be too many open files." IDS_EE_SHARING_VIOLATION "Cannot access file '%1' because it is being used by another process." IDS_EE_LOCK_VIOLATION "Cannot access file '%1' because another process has locked a portion of the file." @@ -1367,8 +1372,12 @@ BEGIN IDS_EE_IJWLOAD_MULTIRUNTIME_DISALLOWED "Mixed mode assembly cannot be loaded into version '%1' of the runtime because it is already loaded into version '%2'." IDS_EE_CANNOT_HAVE_ASSEMBLY_SPEC "Unexpected assembly-qualifier in a typename." IDS_EE_NEEDS_ASSEMBLY_SPEC "Typename needs an assembly qualifier." - IDS_EE_FILELOAD_ERROR_GENERIC "Could not load file or assembly '%1' or one of its dependencies. %2" +#ifdef FEATURE_CORECLR + IDS_EE_FILELOAD_ERROR_GENERIC "Could not load file or assembly '%1'. %2" +#else + IDS_EE_FILELOAD_ERROR_GENERIC "Could not load file or assembly '%1' or one of its dependencies. %2" +#endif IDS_EE_CRYPTO_UNKNOWN_OPERATION "Unknown import key operation specified." |