Skip to content

Commit 1a0f669

Browse files
committed
Fix test
1 parent fab6746 commit 1a0f669

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/coreclr/dlls/mscorrc/mscorrc.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ END
702702
STRINGTABLE DISCARDABLE
703703
BEGIN
704704
IDS_HOST_ASSEMBLY_RESOLVER_ASSEMBLY_ALREADY_LOADED_IN_CONTEXT "Assembly with same name is already loaded"
705-
IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED "Dynamically emitted assemblies are unsupported during host-based resolution."
705+
IDS_HOST_ASSEMBLY_RESOLVER_DYNAMICALLY_EMITTED_ASSEMBLIES_UNSUPPORTED "Dynamically emitted assemblies are unsupported for AssemblyLoadContext resolution."
706706
END
707707

708708
STRINGTABLE DISCARDABLE

src/libraries/System.Runtime.Loader/tests/AssemblyLoadContextTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ class RefEmitLoadContext : AssemblyLoadContext
244244
}
245245

246246
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsReflectionEmitSupported))]
247+
[ActiveIssue("https://github.com/dotnet/runtime/issues/31804", TestRuntimes.Mono)]
247248
public static void LoadRefEmitAssembly()
248249
{
249250
AssemblyLoadContext alc = new RefEmitLoadContext();
250-
Assembly asm = alc.LoadFromAssemblyName(new AssemblyName("MyAssembly"));
251-
Assert.Equal(AssemblyLoadContext.Default, AssemblyLoadContext.GetLoadContext(asm));
251+
Assert.Throws<InvalidOperationException>(() => alc.LoadFromAssemblyName(new AssemblyName("MyAssembly")));
252252
}
253253
}
254254
}

0 commit comments

Comments
 (0)