[pull] main from nunit:main

src/NUnitFramework/framework/Attributes/CombiningStrategyAttribute.cs

@@ -9,6 +9,7 @@ namespace NUnit.Framework
     using Interfaces;
     using Internal;
     using Internal.Builders;
+    using NUnit.Framework.Internal.Extensions;
 
     /// <summary>
     /// Marks a test as using a particular CombiningStrategy to join any supplied parameter data.
@@ -61,11 +62,14 @@ public IEnumerable<TestMethod> BuildFrom(IMethodInfo method, Test? suite)
 
             if (parameters.Length > 0)
             {
-                IEnumerable[] sources = new IEnumerable[parameters.Length];
+                int parametersToSupply = parameters.LastParameterAcceptsCancellationToken() ?
+                    parameters.Length - 1 : parameters.Length;
+
+                IEnumerable[] sources = new IEnumerable[parametersToSupply];
 
                 try
                 {
-                    for (int i = 0; i < parameters.Length; i++)
+                    for (int i = 0; i < parametersToSupply; i++)
                         sources[i] = _dataProvider.GetDataFor(parameters[i]);
                 }
                 catch (InvalidDataSourceException ex)

src/NUnitFramework/tests/Attributes/CancelAfterTests.cs

@@ -311,6 +311,44 @@ public void TestWithCancelAfterAttributeAndTestCaseSourceHasCancellationToken(in
             Assert.That(cancellationToken, Is.EqualTo(TestContext.CurrentContext.CancellationToken));
         }
 
+        [Test]
+        [CancelAfter(500)]
+        public void TestWithCancelAfterAttributeAndValueAttributeHasCancellationToken([Values] bool value, CancellationToken cancellationToken)
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(value, Is.True.Or.False);
+                Assert.That(cancellationToken, Is.Not.EqualTo(CancellationToken.None));
+            });
+            Assert.That(cancellationToken, Is.EqualTo(TestContext.CurrentContext.CancellationToken));
+        }
+
+        [Test]
+        [CancelAfter(500)]
+        [Sequential]
+        public void TestWithCancelAfterAttributeAndMultipleValueAttributesSequentialHasCancellationToken([Values] bool a, [Values] bool b, CancellationToken cancellationToken)
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(a, Is.EqualTo(b));
+                Assert.That(cancellationToken, Is.Not.EqualTo(CancellationToken.None));
+            });
+            Assert.That(cancellationToken, Is.EqualTo(TestContext.CurrentContext.CancellationToken));
+        }
+
+        [Test]
+        [CancelAfter(500)]
+        [Pairwise]
+        public void TestWithCancelAfterAttributeAndMultipleValueAttributesPairwiseHasCancellationToken([Values] bool a, [Values] bool b, CancellationToken cancellationToken)
+        {
+            Assert.Multiple(() =>
+            {
+                Assert.That(a, Is.EqualTo(b).Or.Not.EqualTo(b));
+                Assert.That(cancellationToken, Is.Not.EqualTo(CancellationToken.None));
+            });
+            Assert.That(cancellationToken, Is.EqualTo(TestContext.CurrentContext.CancellationToken));
+        }
+
         private static readonly int[] Arguments = { 1 };
 
         [CancelAfter(500)]