Merge pull request dotnet/extensions#2246 from dotnet-maestro-bot/merge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from fb7fdf5550

src/Testing/src/xunit/ConditionalFactDiscoverer.cs

@@ -4,6 +4,7 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
+// Do not change this namespace without changing the usage in ConditionalFactAttribute
 namespace Microsoft.AspNetCore.Testing
 {
     internal class ConditionalFactDiscoverer : FactDiscoverer

src/Testing/src/xunit/ConditionalTheoryDiscoverer.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
+// Do not change this namespace without changing the usage in ConditionalTheoryAttribute
 namespace Microsoft.AspNetCore.Testing
 {
     internal class ConditionalTheoryDiscoverer : TheoryDiscoverer

src/Testing/src/xunit/FlakyAttribute.cs

@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Testing
     /// to <c>xunit.console.exe</c>. Similarly, it can run only flaky tests using <c>-trait "Flaky:AzP:OS:all=true" -trait "Flaky:AzP:OS:Darwin=true"</c>
     /// </para>
     /// </example>
-    [TraitDiscoverer("Microsoft.AspNetCore.Testing.xunit.FlakyTestDiscoverer", "Microsoft.AspNetCore.Testing")]
+    [TraitDiscoverer("Microsoft.AspNetCore.Testing." + nameof(FlakyTestDiscoverer), "Microsoft.AspNetCore.Testing")]
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
     public sealed class FlakyAttribute : Attribute, ITraitAttribute
     {

src/Testing/src/xunit/FlakyTestDiscoverer.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
+// Do not change this namespace without changing the usage in FlakyAttribute
 namespace Microsoft.AspNetCore.Testing
 {
     public class FlakyTestDiscoverer : ITraitDiscoverer