Merge in 'release/5.0' changes

dotnet-bot · dotnet-bot · commit eae88cc11bcd · 2021-01-22T10:18:33.000Z
diff --git a/src/libraries/System.Threading/tests/ThreadLocalTests.cs b/src/libraries/System.Threading/tests/ThreadLocalTests.cs
@@ -224,6 +224,7 @@ public static void RunThreadLocalTest7_WeakReference()
         }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/43981", TestRuntimes.Mono)]
         public static void RunThreadLocalTest8_Values()
         {
             // Test adding values and updating values

Original file line number	Diff line number	Diff line change
`@@ -224,6 +224,7 @@ public static void RunThreadLocalTest7_WeakReference()`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]`
	`227`	`+ [ActiveIssue("https://github.com/dotnet/runtime/issues/43981", TestRuntimes.Mono)]`
`227`	`228`	`public static void RunThreadLocalTest8_Values()`
`228`	`229`	`{`
`229`	`230`	`// Test adding values and updating values`