#8488 Fixed warning xunit1051 Part 1

tests\Aspire.Azure.AI.OpenAI.Tests
tests\Aspire.Components.Common.Tests
tests\Aspire.Confluent.Kafka.Tests
tests\Aspire.Dashboard.Components.Tests
tests\Aspire.Elastic.Clients.Elasticsearch.Tests
tests\Aspire.Hosting.Analyzers.Tests
tests\Aspire.Hosting.Kubernetes.Tests
tests\Aspire.Hosting.Python.Tests
Fixed in next projects
tests\Aspire.Hosting.Redis.Tests
tests\Aspire.Hosting.Seq.Tests
tests\Aspire.Hosting.SqlServer.Tests
tests\Aspire.Hosting.Testing.Tests
tests\Aspire.Hosting.Valkey.Tests
tests\Aspire.Milvus.Client.Tests
tests\Aspire.MongoDB.Driver.Tests
tests\Aspire.NATS.Net.Tests
tests\Aspire.OpenAI.Tests
tests\Aspire.Playground.Tests
tests\Aspire.Qdrant.Client.Tests
tests\Aspire.RabbitMQ.Client.Tests
tests\Aspire.StackExchange.Redis.Tests
tests\Aspire.Templates.Tests
tests\Microsoft.Extensions.ServiceDiscovery.Tests

Author: Illia Mazuriak

Directory.Build.props

@@ -34,11 +34,6 @@
     <DashboardPublishedArtifactsOutputDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'DashboardArtifacts', '$(Configuration)'))</DashboardPublishedArtifactsOutputDir>
     <WorkloadsPackageSource>$(ArtifactsShippingPackagesDir)</WorkloadsPackageSource>
 
-    <!-- Issue: https://github.com/dotnet/aspire/issues/8488 -->
-    <!-- xUnit2031: Do not use Where clause with Assert.Single -->
-    <!-- xUnit1051: Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken to allow test cancellation to be more responsive. -->
-    <!-- TODO: Re-enable and remove this. -->
-    <NoWarn>$(NoWarn);xUnit2031;xUnit1051</NoWarn>
   </PropertyGroup>
 
   <!-- OS/Architecture properties for local development resources -->

tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderChatClientExtensionsTests.cs

@@ -214,7 +214,7 @@ public async Task CanConfigurePipelineAsync(bool useKeyed)
             host.Services.GetRequiredKeyedService<IChatClient>("openai_chatclient") :
             host.Services.GetRequiredService<IChatClient>();
 
-        var completion = await client.GetResponseAsync("Whatever");
+        var completion = await client.GetResponseAsync("Whatever", cancellationToken: TestContext.Current.CancellationToken);
         Assert.Equal("Hello from middleware", completion.Text);
 
         static Task<ChatResponse> TestMiddleware(IEnumerable<ChatMessage> list, ChatOptions? options, IChatClient client, CancellationToken token)

tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs

@@ -214,7 +214,7 @@ public async Task CanConfigurePipelineAsync(bool useKeyed)
             host.Services.GetRequiredKeyedService<IEmbeddingGenerator<string, Embedding<float>>>("openai_embeddinggenerator") :
             host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();
 
-        var vector = await generator.GenerateEmbeddingVectorAsync("Hello");
+        var vector = await generator.GenerateEmbeddingVectorAsync("Hello", cancellationToken: TestContext.Current.CancellationToken);
         Assert.Equal(1.23f, vector.ToArray().Single());
     }
 

tests/Aspire.Cli.Tests/Aspire.Cli.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
@@ -9,6 +9,7 @@
     <!-- Do not run tests in Helix at all -->
     <RunOnAzdoHelixWindows>false</RunOnAzdoHelixWindows>
     <RunOnAzdoHelixLinux>false</RunOnAzdoHelixLinux>
+    <NoWarn>$(NoWarn);xUnit1051</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

tests/Aspire.Components.Common.Tests/ConformanceTests.cs

@@ -135,7 +135,8 @@ await healthCheckService.CheckHealthAsync(healthCheckRegistration =>
         {
             registeredNames.Add(healthCheckRegistration.Name);
             return false;
-        }).ConfigureAwait(false);
+        },
+        TestContext.Current.CancellationToken).ConfigureAwait(false);
 #pragma warning restore xUnit1030 // Do not call ConfigureAwait(false) in test method
 
         Assert.Equal(2, registeredNames.Count);
@@ -320,7 +321,7 @@ public async Task HealthCheckReportsExpectedStatus(string? key)
         HealthCheckService healthCheckService = host.Services.GetRequiredService<HealthCheckService>();
 
 #pragma warning disable xUnit1030 // Do not call ConfigureAwait(false) in test method
-        HealthReport healthReport = await healthCheckService.CheckHealthAsync().ConfigureAwait(false);
+        HealthReport healthReport = await healthCheckService.CheckHealthAsync(TestContext.Current.CancellationToken).ConfigureAwait(false);
 #pragma warning restore xUnit1030 // Do not call ConfigureAwait(false) in test method
 
         HealthStatus expected = CanConnectToServer ? HealthStatus.Healthy : HealthStatus.Unhealthy;

tests/Aspire.Confluent.Kafka.Tests/Aspire8MetricsTests.cs

@@ -38,7 +38,7 @@ public async Task ExposesStatisticsAsCountersAndGauge_InitializeCounters(TestVar
         }
 
         using var host = builder.Build();
-        await host.StartAsync();
+        await host.StartAsync(TestContext.Current.CancellationToken);
 
         var metricsChannel = host.Services.GetRequiredService(ReflectionHelpers.MetricsChannelType.Value);
         var writer = GetMetricsChannelWriter(metricsChannel)!;
@@ -61,14 +61,14 @@ public async Task ExposesStatisticsAsCountersAndGauge_InitializeCounters(TestVar
         }
 
         await Task.WhenAll(
-            collectorNetworkTx.WaitForMeasurementsAsync(statistics.Count),
-            collectorNetworkTransmitted.WaitForMeasurementsAsync(statistics.Count),
-            collectorNetworkRx.WaitForMeasurementsAsync(statistics.Count),
-            collectorNetworkReceived.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageTx.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageTransmitted.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageRx.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageReceived.WaitForMeasurementsAsync(statistics.Count)
+            collectorNetworkTx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorNetworkTransmitted.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorNetworkRx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorNetworkReceived.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageTx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageTransmitted.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageRx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageReceived.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken)
         );
 
         collectorConsumerQueueMessageCount.RecordObservableInstruments();
@@ -153,7 +153,7 @@ public async Task ExposesStatisticsAsCountersAndGauge_AggregateCountersByName(Te
         }
 
         using var host = builder.Build();
-        await host.StartAsync();
+        await host.StartAsync(TestContext.Current.CancellationToken);
 
         var metricsChannel = host.Services.GetRequiredService(ReflectionHelpers.MetricsChannelType.Value);
         var writer = GetMetricsChannelWriter(metricsChannel)!;
@@ -176,14 +176,14 @@ public async Task ExposesStatisticsAsCountersAndGauge_AggregateCountersByName(Te
         }
 
         await Task.WhenAll(
-            collectorNetworkTx.WaitForMeasurementsAsync(statistics.Count),
-            collectorNetworkTransmitted.WaitForMeasurementsAsync(statistics.Count),
-            collectorNetworkRx.WaitForMeasurementsAsync(statistics.Count),
-            collectorNetworkReceived.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageTx.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageTransmitted.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageRx.WaitForMeasurementsAsync(statistics.Count),
-            collectorMessageReceived.WaitForMeasurementsAsync(statistics.Count)
+            collectorNetworkTx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorNetworkTransmitted.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorNetworkRx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorNetworkReceived.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageTx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageTransmitted.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageRx.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken),
+            collectorMessageReceived.WaitForMeasurementsAsync(statistics.Count, TestContext.Current.CancellationToken)
         );
 
         collectorConsumerQueueMessageCount.RecordObservableInstruments();

tests/Aspire.Confluent.Kafka.Tests/OtelMetricsTests.cs

@@ -60,7 +60,7 @@ public async Task EnsureMetricsAreProducedAsync(bool useKeyed)
         builder.Services.AddOpenTelemetry().WithMetrics(meterProvider => meterProvider.AddInMemoryExporter(metrics));
 
         using var host = builder.Build();
-        await host.StartAsync();
+        await host.StartAsync(TestContext.Current.CancellationToken);
         IGrouping<string, Metric>[] groups;
 
         string topic = $"otel-topic-{Guid.NewGuid()}";
@@ -90,7 +90,7 @@ public async Task EnsureMetricsAreProducedAsync(bool useKeyed)
             int j = 0;
             while (true)
             {
-                var consumerResult = consumer.Consume();
+                var consumerResult = consumer.Consume(TestContext.Current.CancellationToken);
                 if (consumerResult == null)
                 {
                     continue;
@@ -108,7 +108,7 @@ public async Task EnsureMetricsAreProducedAsync(bool useKeyed)
 
         host.Services.GetRequiredService<MeterProvider>().EnsureMetricsAreFlushed();
 
-        await host.StopAsync();
+        await host.StopAsync(TestContext.Current.CancellationToken);
 
         groups = metrics.Where(x => x.MeterName == "OpenTelemetry.Instrumentation.ConfluentKafka")
             .GroupBy(x => x.Name).ToArray();

tests/Aspire.Confluent.Kafka.Tests/OtelTracesTests.cs

@@ -62,7 +62,7 @@ public async Task EnsureTracesAreProducedAsync(bool useKeyed)
         builder.Services.AddOpenTelemetry().WithTracing(traceProviderBuilder => traceProviderBuilder.AddInMemoryExporter(activities));
 
         using var host = builder.Build();
-        await host.StartAsync();
+        await host.StartAsync(TestContext.Current.CancellationToken);
 
         string topic = $"otel-topic-{Guid.NewGuid()}";
         using (var producer = useKeyed
@@ -95,7 +95,7 @@ public async Task EnsureTracesAreProducedAsync(bool useKeyed)
             int j = 0;
             while (true)
             {
-                var consumerResult = consumer.Consume();
+                var consumerResult = consumer.Consume(TestContext.Current.CancellationToken);
                 if (consumerResult == null)
                 {
                     continue;
@@ -113,6 +113,6 @@ public async Task EnsureTracesAreProducedAsync(bool useKeyed)
 
         Assert.Equal(5, activities.Where(x => x.OperationName == $"{topic} receive").Count());
 
-        await host.StopAsync();
+        await host.StopAsync(TestContext.Current.CancellationToken);
     }
 }

tests/Aspire.Dashboard.Components.Tests/Layout/MainLayoutTests.cs

@@ -16,7 +16,8 @@
 using Microsoft.FluentUI.AspNetCore.Components;
 using Microsoft.FluentUI.AspNetCore.Components.Components.Tooltip;
 using Xunit;
-
+using TestContext = Xunit.TestContext;
+        
 namespace Aspire.Dashboard.Components.Tests.Layout;
 
 [UseCulture("en-US")]
@@ -72,13 +73,13 @@ public async Task OnInitialize_UnsecuredOtlp_NotDismissed_DisplayMessageBar()
         });
 
         // Assert
-        await messageShownTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+        await messageShownTcs.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
         Assert.NotNull(message);
 
         message.Close();
 
-        Assert.True(await dismissedSettingSetTcs.Task.WaitAsync(TimeSpan.FromSeconds(5)));
+        Assert.True(await dismissedSettingSetTcs.Task.WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken));
     }
 
     [Fact]
@@ -116,8 +117,8 @@ public async Task OnInitialize_UnsecuredOtlp_Dismissed_NoMessageBar()
         });
 
         // Assert
-        var timeoutTask = Task.Delay(100);
-        var completedTask = await Task.WhenAny(messageShownTcs.Task, timeoutTask).WaitAsync(TimeSpan.FromSeconds(5));
+        var timeoutTask = Task.Delay(100, TestContext.Current.CancellationToken);
+        var completedTask = await Task.WhenAny(messageShownTcs.Task, timeoutTask).WaitAsync(TimeSpan.FromSeconds(5), TestContext.Current.CancellationToken);
 
         // It's hard to test something not happening.
         // In this case of checking for a message, apply a small display and then double check that no message was displayed.

tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs

@@ -24,6 +24,7 @@
 using Microsoft.Extensions.Options;
 using Microsoft.FluentUI.AspNetCore.Components;
 using Xunit;
+using TestContext = Xunit.TestContext;
 
 namespace Aspire.Dashboard.Components.Tests.Pages;
 
@@ -90,7 +91,7 @@ public async Task ResourceName_SubscribeOnLoadAndChange_SubscribeConsoleLogsOnce
         logger.LogInformation("Waiting for finish message.");
         cut.WaitForState(() => instance.PageViewModel.Status == loc[nameof(Resources.ConsoleLogs.ConsoleLogsFinishedWatchingLogs)]);
 
-        var subscribedResourceName1 = await subscribedResourceNamesChannel.Reader.ReadAsync().DefaultTimeout();
+        var subscribedResourceName1 = await subscribedResourceNamesChannel.Reader.ReadAsync(TestContext.Current.CancellationToken).DefaultTimeout();
         Assert.Equal("test-resource", subscribedResourceName1);
 
         navigationManager.LocationChanged += (sender, e) =>
@@ -116,11 +117,11 @@ public async Task ResourceName_SubscribeOnLoadAndChange_SubscribeConsoleLogsOnce
         cut.WaitForState(() => instance.PageViewModel.SelectedResource == testResource2);
         cut.WaitForState(() => instance.PageViewModel.Status == loc[nameof(Resources.ConsoleLogs.ConsoleLogsWatchingLogs)]);
 
-        var subscribedResourceName2 = await subscribedResourceNamesChannel.Reader.ReadAsync().DefaultTimeout();
+        var subscribedResourceName2 = await subscribedResourceNamesChannel.Reader.ReadAsync(TestContext.Current.CancellationToken).DefaultTimeout();
         Assert.Equal("test-resource2", subscribedResourceName2);
 
         subscribedResourceNamesChannel.Writer.Complete();
-        Assert.False(await subscribedResourceNamesChannel.Reader.WaitToReadAsync().DefaultTimeout());
+        Assert.False(await subscribedResourceNamesChannel.Reader.WaitToReadAsync(TestContext.Current.CancellationToken).DefaultTimeout());
     }
 
     [Fact]

tests/Aspire.Dashboard.Tests/Aspire.Dashboard.Tests.csproj

@@ -5,7 +5,14 @@
     <!--
       CS8002: Referenced assembly does not have a strong name
     -->
-    <NoWarn>$(NoWarn);CS8002</NoWarn>
+    <!--
+      FIXME: https://github.com/dotnet/aspire/issues/8488
+      xUnit1051: Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken  to allow test cancellation to be more responsive
+
+      This is being disabled here in addition to any central location, because this project
+      gets built independently on helix.
+    -->
+    <NoWarn>$(NoWarn);CS8002;xUnit1051</NoWarn>
 
     <InstallBrowsersForPlaywright Condition="'$(InstallBrowsersForPlaywright)' == '' and '$(CODESPACES)' == 'true'">true</InstallBrowsersForPlaywright>
     <InstallBrowsersForPlaywright Condition="'$(InstallBrowsersForPlaywright)' == '' and '$(ContinuousIntegrationBuild)' == 'true'">true</InstallBrowsersForPlaywright>

tests/Aspire.Elastic.Clients.Elasticsearch.Tests/AspireElasticClientExtensionsTest.cs

@@ -57,7 +57,7 @@ public async Task AddElasticsearchClient_HealthCheckShouldBeRegisteredWhenEnable
 
         var healthCheckService = host.Services.GetRequiredService<HealthCheckService>();
 
-        var healthCheckReport = await healthCheckService.CheckHealthAsync();
+        var healthCheckReport = await healthCheckService.CheckHealthAsync(TestContext.Current.CancellationToken);
 
         var healthCheckName = useKeyed ? $"Elastic.Clients.Elasticsearch_{key}" : "Elastic.Clients.Elasticsearch";
 

tests/Aspire.Hosting.Analyzers.Tests/CombinationsAnalyzerTests.cs

@@ -41,7 +41,7 @@ public static void AddMultiple(this IDistributedApplicationBuilder builder, [Res
                 CompilerError(diagnostic.Id).WithLocation(8, 5).WithMessage(message2)
             ]);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -74,6 +74,6 @@ public static void AddMultiple(this IDistributedApplicationBuilder builder, [Res
                 CompilerError(diagnostic.Id).WithLocation(6, 21).WithMessage(message2)
             ]);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 }

tests/Aspire.Hosting.Analyzers.Tests/EndpointNameAnalyzerTests.cs

@@ -27,7 +27,7 @@ public async Task EndpointNameInvalid(string endpointName)
             """,
             [CompilerError(diagnostic.Id).WithLocation(6, 37).WithMessage(message)]);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -66,7 +66,7 @@ public static IResourceBuilder<ContainerResource> WithEndpoints(
                 CompilerError(diagnostic.Id).WithLocation(9, 9).WithMessage(message2)
             ]);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -82,7 +82,7 @@ public async Task EndpointNameValid(string endpointName)
                 .WithEndpoint(port: 1234, name: "{{endpointName}}");
             """, []);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -112,6 +112,6 @@ public static IResourceBuilder<ContainerResource> WithEndpoints(
             }
             """, []);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 }

tests/Aspire.Hosting.Analyzers.Tests/ResourceNameAnalyzerTests.cs

@@ -26,7 +26,7 @@ public async Task ResourceNameInvalid(string resourceName)
             """,
             [CompilerError(diagnostic.Id).WithLocation(5, 22).WithMessage(message)]);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -61,7 +61,7 @@ public static void AddMultipleParameters(this IDistributedApplicationBuilder bui
                 CompilerError(diagnostic.Id).WithLocation(8, 5).WithMessage(message2)
             ]);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -76,7 +76,7 @@ public async Task ResourceNameValid(string resourceName)
             builder.AddParameter("{{resourceName}}");
             """, []);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 
     [Theory]
@@ -102,6 +102,6 @@ public static void AddMultipleParameters(this IDistributedApplicationBuilder bui
             }
             """, []);
 
-        await test.RunAsync();
+        await test.RunAsync(TestContext.Current.CancellationToken);
     }
 }

tests/Aspire.Hosting.Azure.Tests/Aspire.Hosting.Azure.Tests.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
+    <NoWarn>$(NoWarn);xUnit1051</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

tests/Aspire.Hosting.Containers.Tests/Aspire.Hosting.Containers.Tests.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
+    <NoWarn>$(NoWarn);xUnit1051</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

tests/Aspire.Hosting.Docker.Tests/Aspire.Hosting.Docker.Tests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
-    <NoWarn>$(NoWarn);ASPIREHOSTINGPYTHON001;</NoWarn>
+    <NoWarn>$(NoWarn);ASPIREHOSTINGPYTHON001;xUnit1051</NoWarn>
 
     <!--
       Do not run tests in Helix at all

tests/Aspire.Hosting.Elasticsearch.Tests/Aspire.Hosting.Elasticsearch.Tests.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DefaultTargetFramework)</TargetFramework>
+    <NoWarn>$(NoWarn);xUnit1051</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>