From 876458c5552384f1b2a9677cfa7b1cce5905994e Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Fri, 14 Jul 2017 22:09:17 -0700 Subject: [PATCH] Fix resources lookup to use satellite assembly resouce lookup inside AppX when the assembly is Private.Corelib (#12830) --- src/mscorlib/src/System/Resources/ResourceManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mscorlib/src/System/Resources/ResourceManager.cs b/src/mscorlib/src/System/Resources/ResourceManager.cs index 92b935d..724dd9f 100644 --- a/src/mscorlib/src/System/Resources/ResourceManager.cs +++ b/src/mscorlib/src/System/Resources/ResourceManager.cs @@ -889,7 +889,7 @@ namespace System.Resources // contains the PRI resources. private bool ShouldUseSatelliteAssemblyResourceLookupUnderAppX(RuntimeAssembly resourcesAssembly) { - bool fUseSatelliteAssemblyResourceLookupUnderAppX = true; // TODO: https://github.com/dotnet/coreclr/issues/12178 once we fix our uap testhost + bool fUseSatelliteAssemblyResourceLookupUnderAppX = typeof(Object).Assembly == resourcesAssembly; if (!fUseSatelliteAssemblyResourceLookupUnderAppX) { -- 2.7.4