implemented conditional OuterLoopAttribute

src/Microsoft.DotNet.XUnitExtensions/src/Attributes/OuterLoopAttribute.cs

@@ -13,7 +13,19 @@ namespace Xunit
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
     public class OuterLoopAttribute : Attribute, ITraitAttribute
     {
+        public Type CalleeType { get; private set; }
+        public string[] ConditionMemberNames { get; private set; }
+
         public OuterLoopAttribute() { }
         public OuterLoopAttribute(string reason) { }
+        public OuterLoopAttribute(string reason, TestPlatforms platforms) { }
+        public OuterLoopAttribute(string reason, TargetFrameworkMonikers framework) { }
+        public OuterLoopAttribute(string reason, TestRuntimes runtimes) { }
+        public OuterLoopAttribute(string reason, TestPlatforms platforms = TestPlatforms.Any, TargetFrameworkMonikers framework = TargetFrameworkMonikers.Any, TestRuntimes runtimes = TestRuntimes.Any) { }
+        public OuterLoopAttribute(string reason, Type calleeType, params string[] conditionMemberNames)
+        {
+            CalleeType = calleeType;
+            ConditionMemberNames = conditionMemberNames;
+        }
     }
 }

src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using Xunit;
 
@@ -59,5 +58,54 @@ internal static bool Evaluate(Type calleeType, string[] conditionMemberNames)
 
             return true;
         }
+
+        internal static IEnumerable<KeyValuePair<string, string>> EvaluateArguments(IEnumerable<object> ctorArgs,string category, int skipFirst=1)
+        {
+            Debug.Assert(ctorArgs.Count() >= 2);
+
+            TestPlatforms platforms = TestPlatforms.Any;
+            TargetFrameworkMonikers frameworks = TargetFrameworkMonikers.Any;
+            TestRuntimes runtimes = TestRuntimes.Any;
+            Type calleeType = null;
+            string[] conditionMemberNames = null;
+
+            foreach (object arg in ctorArgs.Skip(skipFirst)) // First argument is the issue number or reason.
+            {
+                if (arg is TestPlatforms)
+                {
+                    platforms = (TestPlatforms)arg;
+                }
+                else if (arg is TargetFrameworkMonikers)
+                {
+                    frameworks = (TargetFrameworkMonikers)arg;
+                }
+                else if (arg is TestRuntimes)
+                {
+                    runtimes = (TestRuntimes)arg;
+                }
+                else if (arg is Type)
+                {
+                    calleeType = (Type)arg;
+                }
+                else if (arg is string[])
+                {
+                    conditionMemberNames = (string[])arg;
+                }
+            }
+
+            if (calleeType != null && conditionMemberNames != null)
+            {
+                if (DiscovererHelpers.Evaluate(calleeType, conditionMemberNames))
+                {
+                    yield return new KeyValuePair<string, string>(XunitConstants.Category, category);
+                }
+            }
+            else if (DiscovererHelpers.TestPlatformApplies(platforms) &&
+                DiscovererHelpers.TestRuntimeApplies(runtimes) &&
+                DiscovererHelpers.TestFrameworkApplies(frameworks))
+            {
+                yield return new KeyValuePair<string, string>(XunitConstants.Category, category);
+            }
+        }        
     }
 }

src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/ActiveIssueDiscoverer.cs

@@ -1,11 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -25,52 +21,7 @@ public class ActiveIssueDiscoverer : ITraitDiscoverer
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
             IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments();
-            Debug.Assert(ctorArgs.Count() >= 2);
-
-            string issue = ctorArgs.First().ToString();
-            TestPlatforms platforms = TestPlatforms.Any;
-            TargetFrameworkMonikers frameworks = TargetFrameworkMonikers.Any;
-            TestRuntimes runtimes = TestRuntimes.Any;
-            Type calleeType = null;
-            string[] conditionMemberNames = null;
-
-            foreach (object arg in ctorArgs.Skip(1)) // First argument is the issue number.
-            {
-                if (arg is TestPlatforms)
-                {
-                    platforms = (TestPlatforms)arg;
-                }
-                else if (arg is TargetFrameworkMonikers)
-                {
-                    frameworks = (TargetFrameworkMonikers)arg;
-                }
-                else if (arg is TestRuntimes)
-                {
-                    runtimes = (TestRuntimes)arg;
-                }
-                else if (arg is Type)
-                {
-                    calleeType = (Type)arg;
-                }
-                else if (arg is string[])
-                {
-                    conditionMemberNames = (string[])arg;
-                }
-            }
-
-            if (calleeType != null && conditionMemberNames != null)
-            {
-                if (DiscovererHelpers.Evaluate(calleeType, conditionMemberNames))
-                {
-                    yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
-                }
-            }
-            else if (DiscovererHelpers.TestPlatformApplies(platforms) &&
-                DiscovererHelpers.TestRuntimeApplies(runtimes) &&
-                DiscovererHelpers.TestFrameworkApplies(frameworks))
-            {
-                yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.Failing);
-            }
+            return DiscovererHelpers.EvaluateArguments(ctorArgs, XunitConstants.Failing);
         }
     }
 }

src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/OuterLoopTestsDiscoverer.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
+using System.Linq;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -20,7 +21,12 @@ public class OuterLoopTestsDiscoverer : ITraitDiscoverer
         /// <returns>The trait values.</returns>
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
-            yield return new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.OuterLoop);
+            IEnumerable<object> ctorArgs = traitAttribute.GetConstructorArguments();
+            if (ctorArgs.Count() < 2)
+            {
+                return new[] { new KeyValuePair<string, string>(XunitConstants.Category, XunitConstants.OuterLoop) };
+            }
+            return DiscovererHelpers.EvaluateArguments(ctorArgs, XunitConstants.OuterLoop);
         }
     }
 }

src/Microsoft.DotNet.XUnitExtensions/tests/ConditionalAttributeTests.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Xunit;
+using Xunit.Sdk;
 
 namespace Microsoft.DotNet.XUnitExtensions.Tests
 {
@@ -24,6 +25,38 @@ public void ConditionalAttributeA()
             s_conditionalFactExecuted = true;
         }
 
+        [Fact]
+        [OuterLoop("never outer loop", TestPlatforms.Any & ~TestPlatforms.Any)]
+        public void NeverConditionalOuterLoopAttribute()
+        {
+            var method = System.Reflection.MethodBase.GetCurrentMethod();
+            var res = TraitHelper.GetTraits(method);
+
+            Assert.Empty(res);
+        }
+
+        [Fact]
+        [OuterLoop("always outer loop", TestPlatforms.Any)]
+        public void AlwaysConditionalOuterLoopAttribute()
+        {
+            var method = System.Reflection.MethodBase.GetCurrentMethod();
+            var res = TraitHelper.GetTraits(method);
+
+            Assert.Single(res);
+            Assert.Equal("outerloop", res[0].Value);
+        }
+
+        [Fact]
+        [OuterLoop("always outer loop")]
+        public void AlwaysOuterLoopAttribute()
+        {
+            var method = System.Reflection.MethodBase.GetCurrentMethod();
+            var res = TraitHelper.GetTraits(method);
+
+            Assert.Single(res);
+            Assert.Equal("outerloop", res[0].Value);
+        }
+
         [ConditionalTheory(nameof(AlwaysTrue))]
         [InlineData(1)]
         [InlineData(2)]