diff --git a/src/coreclr/dlls/mscorrc/mscorrc.rc b/src/coreclr/dlls/mscorrc/mscorrc.rc index 24c9505471b98..6374d2b8ba6d3 100644 --- a/src/coreclr/dlls/mscorrc/mscorrc.rc +++ b/src/coreclr/dlls/mscorrc/mscorrc.rc @@ -120,7 +120,7 @@ BEGIN FUSION_E_SIGNATURE_CHECK_FAILED "Strong name signature verification failed for assembly '%1'. The assembly may have been tampered with, or it was delay signed but not fully signed with the correct private key." COR_E_MODULE_HASH_CHECK_FAILED "The check of the module's hash failed for file '%1'." FUSION_E_PRIVATE_ASM_DISALLOWED "Assembly '%1' is required to be strongly named." - FUSION_E_INVALID_NAME "The given assembly name or codebase, '%1', was invalid." + FUSION_E_INVALID_NAME "The given assembly name, '%1', was invalid." FUSION_E_ASM_MODULE_MISSING "A module specified in the manifest of assembly '%1' could not be found." FUSION_E_CODE_DOWNLOAD_DISABLED "HTTP download of assemblies has been disabled for this appdomain." FUSION_E_HOST_GAC_ASM_MISMATCH "The assembly returned from the host store has a different strong name signature than the corresponding one in GAC. Assembly: '%1'" diff --git a/src/coreclr/inc/corerror.xml b/src/coreclr/inc/corerror.xml index d8cb9b5275067..61ff7a272a82a 100644 --- a/src/coreclr/inc/corerror.xml +++ b/src/coreclr/inc/corerror.xml @@ -246,8 +246,8 @@ FUSION_E_INVALID_NAME - "The given assembly name or codebase was invalid." - The given assembly name or codebase was invalid. + "The given assembly name was invalid." + The given assembly name was invalid. diff --git a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc index 7014b585938a5..6b399646215ce 100644 --- a/src/coreclr/pal/prebuilt/corerror/mscorurt.rc +++ b/src/coreclr/pal/prebuilt/corerror/mscorurt.rc @@ -26,7 +26,7 @@ BEGIN MSG_FOR_URT_HR(FUSION_E_ASM_MODULE_MISSING) "A module specified in the manifest was not found." MSG_FOR_URT_HR(FUSION_E_PRIVATE_ASM_DISALLOWED) "A strongly-named assembly is required." MSG_FOR_URT_HR(FUSION_E_SIGNATURE_CHECK_FAILED) "Strong name signature could not be verified. The assembly may have been tampered with, or it was delay signed but not fully signed with the correct private key." - MSG_FOR_URT_HR(FUSION_E_INVALID_NAME) "The given assembly name or codebase was invalid." + MSG_FOR_URT_HR(FUSION_E_INVALID_NAME) "The given assembly name was invalid." MSG_FOR_URT_HR(FUSION_E_CODE_DOWNLOAD_DISABLED) "HTTP download of assemblies has been disabled for this appdomain." MSG_FOR_URT_HR(FUSION_E_HOST_GAC_ASM_MISMATCH) "Assembly in host store has a different signature than assembly in GAC." MSG_FOR_URT_HR(FUSION_E_LOADFROM_BLOCKED) "LoadFrom(), LoadFile(), Load(byte[]) and LoadModule() have been disabled by the host." diff --git a/src/installer/tests/HostActivation.Tests/StartupHooks.cs b/src/installer/tests/HostActivation.Tests/StartupHooks.cs index 00f209cc01b22..5e4a922674216 100644 --- a/src/installer/tests/HostActivation.Tests/StartupHooks.cs +++ b/src/installer/tests/HostActivation.Tests/StartupHooks.cs @@ -341,7 +341,7 @@ public void Muxer_activation_of_StartupHook_With_Invalid_Simple_Name_Fails() .Execute(fExpectedToFail: true) .Should().Fail() .And.HaveStdErrContaining(string.Format(expectedError, startupHookVar)) - .And.HaveStdErrContaining("---> System.IO.FileLoadException: The given assembly name or codebase was invalid."); + .And.HaveStdErrContaining("---> System.IO.FileLoadException: The given assembly name was invalid."); // Relative path error is caught before any hooks run startupHookVar = startupHookDll + Path.PathSeparator + relativeAssemblyPath; diff --git a/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx b/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx index 65f7d81c06eeb..69f0f8d1d4ae2 100644 --- a/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx +++ b/src/libraries/System.Private.CoreLib/src/Resources/Strings.resx @@ -1102,7 +1102,7 @@ Target array type is not compatible with the type of items in the collection. - The given assembly name or codebase was invalid. + The given assembly name was invalid. Not a valid calendar for the given culture.