diff --git a/.github/actions/setup-runtimes-caching/action.yml b/.github/actions/setup-runtimes-caching/action.yml
index b2ed0d1b2..bde28ae68 100644
--- a/.github/actions/setup-runtimes-caching/action.yml
+++ b/.github/actions/setup-runtimes-caching/action.yml
@@ -20,8 +20,6 @@ runs:
uses: actions/setup-dotnet@v6
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Resolve Aspire version
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index b595814b1..1eae1df89 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -67,8 +67,6 @@ jobs:
uses: actions/setup-dotnet@v6
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
index 5b68db5e8..0f90451fa 100644
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -25,8 +25,6 @@ jobs:
uses: actions/setup-dotnet@v6
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Resolve Aspire version
diff --git a/.github/workflows/generate-api-diffs.yml b/.github/workflows/generate-api-diffs.yml
index 324fac81b..1a4f58acb 100644
--- a/.github/workflows/generate-api-diffs.yml
+++ b/.github/workflows/generate-api-diffs.yml
@@ -19,8 +19,6 @@ jobs:
- uses: actions/setup-dotnet@v6
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Restore and build
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 13e089c94..5ab358e31 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -22,8 +22,6 @@ jobs:
uses: actions/setup-dotnet@v6
with:
dotnet-version: |
- 8.0.x
- 9.0.x
10.0.x
- name: Get git tag
diff --git a/Directory.Build.props b/Directory.Build.props
index ea4de6063..60d67fcd6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,7 @@
net10.0
$(DefaultTargetFramework)
- $(DefaultTargetFramework);net8.0;net9.0
+ $(DefaultTargetFramework)
latest
enable
@@ -18,7 +18,6 @@
9.0.0
10.0.12
4.14.0
- 10.6.0
10.0.0
false
4.20.72
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 86c3738e2..c2cafc893 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,6 @@
-
@@ -26,7 +25,6 @@
-
@@ -34,60 +32,54 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -95,72 +87,59 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/docs/setup.md b/docs/setup.md
index 5548c2ed2..cca2344a1 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -14,7 +14,7 @@ If an AppHost endpoint is not reachable from the host machine, use VS Code's [po
If you prefer not to use `devcontainer`, you can manually set up your development environment by installing the following tools:
-- [.NET 8](https://dotnet.microsoft.com/download/dotnet/8.0), [.NET 9](https://dotnet.microsoft.com/download/dotnet/9.0), and [.NET 10](https://dotnet.microsoft.com/download/dotnet/10.0)
+- [.NET 10](https://dotnet.microsoft.com/download/dotnet/10.0)
- [Node.js LTS](https://nodejs.org/en/)
- [Yarn 2](https://yarnpkg.com/getting-started/install)
- [pnpm](https://pnpm.io/)
diff --git a/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj b/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj
index 3f591e792..5ea3ffbb3 100644
--- a/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj
+++ b/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj
@@ -10,7 +10,6 @@
-
diff --git a/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer.csproj b/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer.csproj
index 7e5b50d42..0b1c9d6fe 100644
--- a/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer.csproj
+++ b/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer/CommunityToolkit.Aspire.Hosting.McpInspector.McpServer.csproj
@@ -1,6 +1,5 @@
-
diff --git a/examples/python/streamlit-api/README.md b/examples/python/streamlit-api/README.md
index 04b5d7c87..ee9d35603 100644
--- a/examples/python/streamlit-api/README.md
+++ b/examples/python/streamlit-api/README.md
@@ -5,7 +5,7 @@ This is a simple Streamlit application that demonstrates how to run Streamlit ap
## Prerequisites
- Python 3.12 or later
-- .NET 8.0 or later
+- .NET 10.0 or later
- Streamlit package
## Setup
diff --git a/src/CommunityToolkit.Aspire.Hosting.Azure.Dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.csproj b/src/CommunityToolkit.Aspire.Hosting.Azure.Dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.csproj
index e86be3840..23900aa50 100644
--- a/src/CommunityToolkit.Aspire.Hosting.Azure.Dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.csproj
+++ b/src/CommunityToolkit.Aspire.Hosting.Azure.Dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.csproj
@@ -13,7 +13,6 @@
-
diff --git a/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md b/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md
index 10b9f7232..91a587261 100644
--- a/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md
+++ b/src/CommunityToolkit.Aspire.Hosting.Flagd/README.md
@@ -6,7 +6,7 @@ An Aspire hosting integration for [flagd](https://flagd.dev), a feature flag eva
### Prerequisites
-- .NET 8.0 or later
+- .NET 10.0 or later
- Docker (for running the flagd container)
### Installation
diff --git a/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md b/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md
index 8d3624b09..a92fcde18 100644
--- a/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md
+++ b/src/CommunityToolkit.Aspire.Hosting.Flyway/README.md
@@ -9,7 +9,7 @@ An Aspire hosting integration for [Flyway](https://flywaydb.org/), a database mi
### Prerequisites
-- .NET 8.0 or later
+- .NET 10.0 or later
- Docker (for running the Flyway and database containers)
### Installation
diff --git a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj
index 1c369db03..1d362f9c8 100644
--- a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj
+++ b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj
@@ -8,18 +8,10 @@
-
-
-
- all
-
-
-
-
diff --git a/src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj b/src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj
index 9756a25ef..d57a5e34c 100644
--- a/src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj
+++ b/src/CommunityToolkit.Aspire.Hosting.Meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.csproj
@@ -12,7 +12,6 @@
-
diff --git a/src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj b/src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj
index c4ea5ccdb..22ddad293 100644
--- a/src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj
+++ b/src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj
@@ -8,8 +8,6 @@
-
-
diff --git a/src/CommunityToolkit.Aspire.Hosting.PowerShell/CommunityToolkit.Aspire.Hosting.PowerShell.csproj b/src/CommunityToolkit.Aspire.Hosting.PowerShell/CommunityToolkit.Aspire.Hosting.PowerShell.csproj
index ef7135982..e7aa499ec 100644
--- a/src/CommunityToolkit.Aspire.Hosting.PowerShell/CommunityToolkit.Aspire.Hosting.PowerShell.csproj
+++ b/src/CommunityToolkit.Aspire.Hosting.PowerShell/CommunityToolkit.Aspire.Hosting.PowerShell.csproj
@@ -7,10 +7,8 @@
-
+
-
-
diff --git a/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj b/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj
index c9164e06f..1dd480238 100644
--- a/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj
+++ b/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj
@@ -15,11 +15,4 @@
-
-
-
- all
-
-
-
diff --git a/src/CommunityToolkit.Aspire.Meilisearch/CommunityToolkit.Aspire.Meilisearch.csproj b/src/CommunityToolkit.Aspire.Meilisearch/CommunityToolkit.Aspire.Meilisearch.csproj
index 37ac3fb37..77fc17828 100644
--- a/src/CommunityToolkit.Aspire.Meilisearch/CommunityToolkit.Aspire.Meilisearch.csproj
+++ b/src/CommunityToolkit.Aspire.Meilisearch/CommunityToolkit.Aspire.Meilisearch.csproj
@@ -11,7 +11,6 @@
-
diff --git a/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj b/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj
index 33ca47e77..e8ad751ba 100644
--- a/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj
+++ b/src/CommunityToolkit.Aspire.Microsoft.Data.Sqlite/CommunityToolkit.Aspire.Microsoft.Data.Sqlite.csproj
@@ -5,27 +5,12 @@
An Aspire client integration for the Microsoft.Data.Sqlite.Core package.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj b/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj
index 020b43889..10cbd477c 100644
--- a/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj
+++ b/src/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite/CommunityToolkit.Aspire.Microsoft.EntityFrameworkCore.Sqlite.csproj
@@ -6,33 +6,12 @@
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/Shared/EntityFrameworkUtils.cs b/src/Shared/EntityFrameworkUtils.cs
index fcbafc982..be4ffa99a 100644
--- a/src/Shared/EntityFrameworkUtils.cs
+++ b/src/Shared/EntityFrameworkUtils.cs
@@ -35,8 +35,8 @@ public static ServiceDescriptor CheckDbContextRegistered(this IHostApp
where TContext : DbContext
{
// Resolving DbContext will resolve DbContextOptions.
- // We need to replace the DbContextOptions service descriptor to inject more logic. This won't be necessary once
- // Aspire targets .NET 9 as EF will respect the calls to services.ConfigureDbContext(). c.f. https://github.com/dotnet/efcore/pull/32518
+ // We need to replace the DbContextOptions service descriptor to inject more logic. EF Core 9 and later respects
+ // calls to services.ConfigureDbContext(). c.f. https://github.com/dotnet/efcore/pull/32518
var oldDbContextOptionsDescriptor = builder.Services.FirstOrDefault(sd => sd.ServiceType == typeof(DbContextOptions));
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Java.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.Java.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Java.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Java.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sInProcessPortForwarderTests.cs b/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sInProcessPortForwarderTests.cs
index 3671905bd..eeab6affb 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sInProcessPortForwarderTests.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sInProcessPortForwarderTests.cs
@@ -47,7 +47,7 @@ private static Mock BuildMockK8s(
.Setup(c => c.ListNamespacedPodWithHttpMessagesAsync(
It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(),
It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(),
- It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(),
+ It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(),
It.IsAny>>(), It.IsAny()))
.ReturnsAsync(() =>
{
diff --git a/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sReadinessHealthCheckTests.cs b/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sReadinessHealthCheckTests.cs
index 2a6e65743..3b2603d48 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sReadinessHealthCheckTests.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.K3s.Tests/K3sReadinessHealthCheckTests.cs
@@ -353,7 +353,7 @@ private static (K3sReadinessHealthCheck check, string dir, Mock moc
.Setup(c => c.ListNodeWithHttpMessagesAsync(
It.IsAny(), It.IsAny(), It.IsAny(),
It.IsAny(), It.IsAny(), It.IsAny(),
- It.IsAny(), It.IsAny(), It.IsAny(),
+ It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(),
It.IsAny(), It.IsAny(),
It.IsAny>>(),
It.IsAny()))
@@ -375,7 +375,7 @@ private static (K3sReadinessHealthCheck check, string dir, Mock moc
.Setup(c => c.ListNodeWithHttpMessagesAsync(
It.IsAny(), It.IsAny(), It.IsAny(),
It.IsAny(), It.IsAny(), It.IsAny(),
- It.IsAny(), It.IsAny(), It.IsAny(),
+ It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(),
It.IsAny(), It.IsAny(),
It.IsAny>>(),
It.IsAny()))
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Kind.Tests/FakeCrdClient.cs b/tests/CommunityToolkit.Aspire.Hosting.Kind.Tests/FakeCrdClient.cs
index 4d2eacfa0..a563dd5ef 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Kind.Tests/FakeCrdClient.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Kind.Tests/FakeCrdClient.cs
@@ -35,7 +35,7 @@ public FakeCrdClient(Func _operations.Invocations.Count;
public IReadOnlyList ReadNames => _operations.Invocations
- .Select(invocation => (string)invocation.Arguments[0]).ToList();
+ .Select(invocation => Assert.IsType(invocation.Arguments[0])).ToList();
public int DisposeCount => _client.Invocations.Count(invocation => invocation.Method.Name == nameof(IDisposable.Dispose));
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Python.Extensions.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.Python.Extensions.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Python.Extensions.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Python.Extensions.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Sftp.Tests/CollectionBehavior.cs b/tests/CommunityToolkit.Aspire.Hosting.Sftp.Tests/CollectionBehavior.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Sftp.Tests/CollectionBehavior.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Sftp.Tests/CollectionBehavior.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.SurrealDb.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.SurrealDb.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.SurrealDb.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.SurrealDb.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Zitadel.Tests/AssemblyInfo.cs b/tests/CommunityToolkit.Aspire.Hosting.Zitadel.Tests/AssemblyInfo.cs
index 41a898e37..cb54439a5 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Zitadel.Tests/AssemblyInfo.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Zitadel.Tests/AssemblyInfo.cs
@@ -1,3 +1,4 @@
-using Xunit;
+using Xunit.Sdk;
+using Xunit.v3;
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
\ No newline at end of file
+[assembly: Parallelization(Mode = ParallelMode.None)]
\ No newline at end of file
diff --git a/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj b/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj
index 72ed754f7..fabc6da45 100644
--- a/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj
+++ b/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj
@@ -9,11 +9,4 @@
-
-
-
- all
-
-
-
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 330e59f68..3cc2794b5 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -16,7 +16,10 @@
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+