Fix resources lookup to use satellite assembly resouce lookup inside AppX when the...
authorSantiago Fernandez Madero <safern@microsoft.com>
Sat, 15 Jul 2017 05:09:17 +0000 (22:09 -0700)
committerJan Kotas <jkotas@microsoft.com>
Sat, 15 Jul 2017 05:09:17 +0000 (07:09 +0200)
src/mscorlib/src/System/Resources/ResourceManager.cs

index 92b935d..724dd9f 100644 (file)
@@ -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)
             {