From b9f9433d302447ef2c33561ffd708e087ebf2d08 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 14 Jul 2020 13:34:29 -0400 Subject: [PATCH 1/3] [wasm] Condition Finalizer_CollectibleWithNoAssemblyLoaded with precise gc supported --- .../tests/CollectibleAssemblyLoadContextTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime.Loader/tests/CollectibleAssemblyLoadContextTest.cs b/src/libraries/System.Runtime.Loader/tests/CollectibleAssemblyLoadContextTest.cs index f5bcccb6d91fb..90527c3d0be9d 100644 --- a/src/libraries/System.Runtime.Loader/tests/CollectibleAssemblyLoadContextTest.cs +++ b/src/libraries/System.Runtime.Loader/tests/CollectibleAssemblyLoadContextTest.cs @@ -39,7 +39,7 @@ public static void Unload_CollectibleWithNoAssemblyLoaded() checker.GcAndCheck(); } - [Fact] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPreciseGcSupported))] public static void Finalizer_CollectibleWithNoAssemblyLoaded() { // Use a collectible ALC, let the finalizer call Unload From 4bd844b21ee8a0a78a0adca65e39f37bac482190 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 14 Jul 2020 13:36:15 -0400 Subject: [PATCH 2/3] [wasm] Modify SatelliteAssemblies member data and condition on NonInvariantGlobalization --- .../tests/SatelliteAssemblies.cs | 177 ++++++++++-------- 1 file changed, 100 insertions(+), 77 deletions(-) diff --git a/src/libraries/System.Runtime.Loader/tests/SatelliteAssemblies.cs b/src/libraries/System.Runtime.Loader/tests/SatelliteAssemblies.cs index a4401ca973c17..b82c314a815f8 100644 --- a/src/libraries/System.Runtime.Loader/tests/SatelliteAssemblies.cs +++ b/src/libraries/System.Runtime.Loader/tests/SatelliteAssemblies.cs @@ -18,19 +18,22 @@ public class SatelliteAssembliesTestsFixture public SatelliteAssembliesTestsFixture() { AssemblyLoadContext satelliteAssembliesTests = new AssemblyLoadContext("SatelliteAssembliesTests"); - satelliteAssembliesTests.LoadFromAssemblyPath(typeof(SatelliteAssembliesTests).Assembly.Location); + var satelliteAssembliesTestsPath = (PlatformDetection.IsBrowser ? "/" : "") + typeof(SatelliteAssembliesTests).Assembly.Location; + satelliteAssembliesTests.LoadFromAssemblyPath(satelliteAssembliesTestsPath); AssemblyLoadContext referencedClassLib = new AssemblyLoadContext("ReferencedClassLib"); - referencedClassLib.LoadFromAssemblyPath(typeof(ReferencedClassLib.Program).Assembly.Location); + var referencedClassLibPath = (PlatformDetection.IsBrowser ? "/" : "") + typeof(ReferencedClassLib.Program).Assembly.Location; + referencedClassLib.LoadFromAssemblyPath(referencedClassLibPath); AssemblyLoadContext referencedClassLibNeutralIsSatellite = new AssemblyLoadContext("ReferencedClassLibNeutralIsSatellite"); - referencedClassLibNeutralIsSatellite.LoadFromAssemblyPath(typeof(ReferencedClassLibNeutralIsSatellite.Program).Assembly.Location); + var referencedClassLibNeutralIsSatellitePath = (PlatformDetection.IsBrowser ? "/" : "") + typeof(ReferencedClassLibNeutralIsSatellite.Program).Assembly.Location; + referencedClassLibNeutralIsSatellite.LoadFromAssemblyPath(referencedClassLibNeutralIsSatellitePath); new AssemblyLoadContext("Empty"); try { - Assembly assembly = Assembly.LoadFile(typeof(SatelliteAssembliesTests).Assembly.Location); + Assembly assembly = Assembly.LoadFile(satelliteAssembliesTestsPath); contexts["LoadFile"] = AssemblyLoadContext.GetLoadContext(assembly); } catch (Exception e) @@ -55,14 +58,24 @@ public SatelliteAssembliesTests(SatelliteAssembliesTestsFixture fixture) } #region DescribeTests + + public static IEnumerable MainResources_TestData() + { + yield return new object[] { "", "Neutral language Main description 1.0.0" }; + + if (PlatformDetection.IsNotInvariantGlobalization) + { + yield return new object[] { "en", "English language Main description 1.0.0" }; + yield return new object[] { "en-US", "English language Main description 1.0.0" }; + yield return new object[] { "es", "Neutral language Main description 1.0.0" }; + yield return new object[] { "es-MX", "Spanish (Mexico) language Main description 1.0.0" }; + yield return new object[] { "fr", "Neutral language Main description 1.0.0" }; + yield return new object[] { "fr-FR", "Neutral language Main description 1.0.0" }; + } + } + [Theory] - [InlineData("", "Neutral language Main description 1.0.0")] - [InlineData("en", "English language Main description 1.0.0")] - [InlineData("en-US", "English language Main description 1.0.0")] - [InlineData("es", "Neutral language Main description 1.0.0")] - [InlineData("es-MX", "Spanish (Mexico) language Main description 1.0.0")] - [InlineData("fr", "Neutral language Main description 1.0.0")] - [InlineData("fr-FR", "Neutral language Main description 1.0.0")] + [MemberData(nameof(MainResources_TestData))] public static void mainResources(string lang, string expected) { Assert.Equal(expected, Describe(lang)); @@ -77,44 +90,49 @@ public static string Describe(string lang) return rm.GetString("Describe", ci); } - [Theory] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")] - [InlineData("Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0")] - [InlineData("Default", "ReferencedClassLib.Program, ReferencedClassLib", "", "Neutral language ReferencedClassLib description 1.0.0")] - [InlineData("Default", "ReferencedClassLib.Program, ReferencedClassLib", "en", "English language ReferencedClassLib description 1.0.0")] - [InlineData("Default", "ReferencedClassLib.Program, ReferencedClassLib", "en-US", "English language ReferencedClassLib description 1.0.0")] - [InlineData("Default", "ReferencedClassLib.Program, ReferencedClassLib", "es", "Neutral language ReferencedClassLib description 1.0.0")] - [InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "", "Neutral language ReferencedClassLib description 1.0.0")] - [InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en", "English language ReferencedClassLib description 1.0.0")] - [InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en-US", "English language ReferencedClassLib description 1.0.0")] - [InlineData("ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "es", "Neutral language ReferencedClassLib description 1.0.0")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0")] + public static IEnumerable DescribeLib_TestData() + { + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "", "Neutral language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en", "English language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "en-US", "English language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es", "Neutral language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "es-MX", "Spanish (Mexico) language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr", "Neutral language Main description 1.0.0" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests.SatelliteAssembliesTests", "fr-FR", "Neutral language Main description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLib.Program, ReferencedClassLib", "", "Neutral language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLib.Program, ReferencedClassLib", "en", "English language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLib.Program, ReferencedClassLib", "en-US", "English language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLib.Program, ReferencedClassLib", "es", "Neutral language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "Default", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "", "Neutral language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en", "English language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "en-US", "English language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLib.Program, ReferencedClassLib", "es", "Neutral language ReferencedClassLib description 1.0.0" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "en-US", "English language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite.Program, ReferencedClassLibNeutralIsSatellite", "es", "Neutral (es) language ReferencedClassLibNeutralIsSatellite description 1.0.0" }; + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))] + [MemberData(nameof(DescribeLib_TestData))] public void describeLib(string alc, string type, string culture, string expected) { string result = "Oops"; @@ -138,34 +156,39 @@ public void describeLib(string alc, string type, string culture, string expected } #endregion - [Theory] - [InlineData("Default", "System.Runtime.Loader.Tests", "en")] - [InlineData("Default", "System.Runtime.Loader.Tests", "es-MX")] - [InlineData("Empty", "System.Runtime.Loader.Tests", "en")] - [InlineData("Empty", "System.Runtime.Loader.Tests", "es-MX")] - [InlineData("ReferencedClassLib", "System.Runtime.Loader.Tests", "en")] - [InlineData("ReferencedClassLib", "System.Runtime.Loader.Tests", "es-MX")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "en")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "es-MX")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "en")] - [InlineData("SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "es-MX")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests", "en")] - [InlineData("LoadFile", "System.Runtime.Loader.Tests", "es-MX")] - [InlineData("Default", "ReferencedClassLib", "en")] - [InlineData("Default", "ReferencedClassLibNeutralIsSatellite", "en")] - [InlineData("Default", "ReferencedClassLibNeutralIsSatellite", "es")] - [InlineData("Empty", "ReferencedClassLib", "en")] - [InlineData("Empty", "ReferencedClassLibNeutralIsSatellite", "en")] - [InlineData("Empty", "ReferencedClassLibNeutralIsSatellite", "es")] - [InlineData("LoadFile", "ReferencedClassLib", "en")] - [InlineData("LoadFile", "ReferencedClassLibNeutralIsSatellite", "en")] - [InlineData("LoadFile", "ReferencedClassLibNeutralIsSatellite", "es")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLib", "en")] - [InlineData("ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "en")] - [InlineData("ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "es")] - [InlineData("ReferencedClassLib", "ReferencedClassLib", "en")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "en")] - [InlineData("ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "es")] + public static IEnumerable SatelliteLoadsCorrectly_TestData() + { + yield return new object[] { "Default", "System.Runtime.Loader.Tests", "en" }; + yield return new object[] { "Default", "System.Runtime.Loader.Tests", "es-MX" }; + yield return new object[] { "Empty", "System.Runtime.Loader.Tests", "en" }; + yield return new object[] { "Empty", "System.Runtime.Loader.Tests", "es-MX" }; + yield return new object[] { "ReferencedClassLib", "System.Runtime.Loader.Tests", "en" }; + yield return new object[] { "ReferencedClassLib", "System.Runtime.Loader.Tests", "es-MX" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "en" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "System.Runtime.Loader.Tests", "es-MX" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "en" }; + yield return new object[] { "SatelliteAssembliesTests", "System.Runtime.Loader.Tests", "es-MX" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests", "en" }; + yield return new object[] { "LoadFile", "System.Runtime.Loader.Tests", "es-MX" }; + yield return new object[] { "Default", "ReferencedClassLib", "en" }; + yield return new object[] { "Default", "ReferencedClassLibNeutralIsSatellite", "en" }; + yield return new object[] { "Default", "ReferencedClassLibNeutralIsSatellite", "es" }; + yield return new object[] { "Empty", "ReferencedClassLib", "en" }; + yield return new object[] { "Empty", "ReferencedClassLibNeutralIsSatellite", "en" }; + yield return new object[] { "Empty", "ReferencedClassLibNeutralIsSatellite", "es" }; + yield return new object[] { "LoadFile", "ReferencedClassLib", "en" }; + yield return new object[] { "LoadFile", "ReferencedClassLibNeutralIsSatellite", "en" }; + yield return new object[] { "LoadFile", "ReferencedClassLibNeutralIsSatellite", "es" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLib", "en" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "en" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLibNeutralIsSatellite", "es" }; + yield return new object[] { "ReferencedClassLib", "ReferencedClassLib", "en" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "en" }; + yield return new object[] { "ReferencedClassLibNeutralIsSatellite", "ReferencedClassLibNeutralIsSatellite", "es" }; + } + + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))] + [MemberData(nameof(SatelliteLoadsCorrectly_TestData))] public void SatelliteLoadsCorrectly(string alc, string assemblyName, string culture) { AssemblyName satelliteAssemblyName = new AssemblyName(assemblyName + ".resources"); From 309470d60a48f4601594747fe8d5edd2fd9a2722 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 14 Jul 2020 13:38:23 -0400 Subject: [PATCH 3/3] [libraries] Remove System.Runtime.Loader project from exclusions --- src/libraries/tests.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 26793eb0334ba..7888cb116e9aa 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -58,7 +58,6 @@ -