From 79845160dbca7d3805ef5f9c27f5e296d92fe8e4 Mon Sep 17 00:00:00 2001 From: Glen Date: Thu, 15 Oct 2026 20:28:22 +0200 Subject: [PATCH] Update dev and test packages, including xUnit v3 4.0 and Aspire 13.6 --- .../CookieCrumble.Xunit3.csproj | 4 +- .../CookieCrumble.Tests.csproj | 6 +- src/Directory.Packages.props | 70 +++++++++---------- src/GreenDonut/test/Directory.Test.props | 3 +- .../Adapters/test/Directory.Test.props | 3 +- .../test/Directory.Test.props | 3 +- .../k6/Catalog.AppHost/aspire.config.json | 5 ++ .../eShop.Catalog.AppHost.csproj | 3 +- .../AspNetCore/test/Directory.Test.props | 3 +- .../AzureFunctions/test/Directory.Test.props | 3 +- .../Caching/test/Directory.Test.props | 3 +- .../Core/test/Directory.Test.props | 3 +- .../CostAnalysis/test/Directory.Test.props | 3 +- .../Data/test/Directory.Test.props | 3 +- .../Diagnostics/test/Directory.Test.props | 3 +- .../Fusion/test/Directory.Test.props | 3 +- .../Json/test/Directory.Test.props | 3 +- .../Language/test/Directory.Test.props | 3 +- .../Marten/test/Directory.Test.props | 3 +- .../MongoDb/test/Directory.Test.props | 3 +- .../Mutable/test/Directory.Test.props | 3 +- .../test/Directory.Test.props | 3 +- .../Primitives/test/Directory.Test.props | 3 +- .../Raven/test/Directory.Test.props | 3 +- .../Spatial/test/Directory.Test.props | 3 +- .../Utilities/test/Directory.Test.props | 3 +- src/Mocha/benchmarks/Directory.Packages.props | 8 +-- .../AzureServiceBusTransport.AppHost.csproj | 3 +- .../Directory.Packages.props | 34 ++++----- .../aspire.config.json | 2 +- .../Demo/Demo.AppHost/Demo.AppHost.csproj | 3 +- .../Demo/Demo.AppHost/aspire.config.json | 5 ++ .../examples/Demo/Directory.Packages.props | 34 ++++----- .../Directory.Packages.props | 26 +++---- .../PostgresTransport.AppHost.csproj | 3 +- .../PostgresTransport/aspire.config.json | 5 ++ src/Mocha/test/Directory.Test.props | 3 +- .../CommandLine/test/Directory.Test.props | 3 +- src/Nitro/Common/test/Directory.Test.props | 3 +- .../Client/test/Directory.Test.props | 3 +- .../CodeGeneration/test/Directory.Test.props | 3 +- .../Tooling/test/Directory.Test.props | 3 +- 42 files changed, 142 insertions(+), 150 deletions(-) create mode 100644 src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/aspire.config.json create mode 100644 src/Mocha/examples/Demo/Demo.AppHost/aspire.config.json create mode 100644 src/Mocha/examples/PostgresTransport/aspire.config.json diff --git a/src/CookieCrumble/src/CookieCrumble.Xunit3/CookieCrumble.Xunit3.csproj b/src/CookieCrumble/src/CookieCrumble.Xunit3/CookieCrumble.Xunit3.csproj index cf9a8f52bac..d80d30e6ddd 100644 --- a/src/CookieCrumble/src/CookieCrumble.Xunit3/CookieCrumble.Xunit3.csproj +++ b/src/CookieCrumble/src/CookieCrumble.Xunit3/CookieCrumble.Xunit3.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/CookieCrumble/test/CookieCrumble.Tests/CookieCrumble.Tests.csproj b/src/CookieCrumble/test/CookieCrumble.Tests/CookieCrumble.Tests.csproj index 3904b9fb238..3c10476dea6 100644 --- a/src/CookieCrumble/test/CookieCrumble.Tests/CookieCrumble.Tests.csproj +++ b/src/CookieCrumble/test/CookieCrumble.Tests/CookieCrumble.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 85f1a953837..39d66005a0f 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -3,9 +3,9 @@ true - + - + @@ -20,7 +20,7 @@ - + @@ -38,17 +38,17 @@ - + - + - - + + - + @@ -77,24 +77,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + @@ -128,11 +128,11 @@ - - + + - + @@ -159,11 +159,11 @@ - - + + - + @@ -190,10 +190,10 @@ - - + + - + @@ -229,8 +229,8 @@ - - - + + + diff --git a/src/GreenDonut/test/Directory.Test.props b/src/GreenDonut/test/Directory.Test.props index 5c27ed64a17..56dd459ba5d 100644 --- a/src/GreenDonut/test/Directory.Test.props +++ b/src/GreenDonut/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/HotChocolate/Adapters/test/Directory.Test.props b/src/HotChocolate/Adapters/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/Adapters/test/Directory.Test.props +++ b/src/HotChocolate/Adapters/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/ApolloFederation/test/Directory.Test.props b/src/HotChocolate/ApolloFederation/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/ApolloFederation/test/Directory.Test.props +++ b/src/HotChocolate/ApolloFederation/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/aspire.config.json b/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/aspire.config.json new file mode 100644 index 00000000000..92b6daacb7e --- /dev/null +++ b/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/aspire.config.json @@ -0,0 +1,5 @@ +{ + "appHost": { + "path": "eShop.Catalog.AppHost.csproj" + } +} diff --git a/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/eShop.Catalog.AppHost.csproj b/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/eShop.Catalog.AppHost.csproj index 1e893f51e5b..b6c7b58d4b2 100644 --- a/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/eShop.Catalog.AppHost.csproj +++ b/src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/eShop.Catalog.AppHost.csproj @@ -1,8 +1,9 @@ - + + true Exe enable enable diff --git a/src/HotChocolate/AspNetCore/test/Directory.Test.props b/src/HotChocolate/AspNetCore/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/AspNetCore/test/Directory.Test.props +++ b/src/HotChocolate/AspNetCore/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/AzureFunctions/test/Directory.Test.props b/src/HotChocolate/AzureFunctions/test/Directory.Test.props index cc41cfc8a21..9bc1e36fa3c 100644 --- a/src/HotChocolate/AzureFunctions/test/Directory.Test.props +++ b/src/HotChocolate/AzureFunctions/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -12,7 +11,7 @@ - + diff --git a/src/HotChocolate/Caching/test/Directory.Test.props b/src/HotChocolate/Caching/test/Directory.Test.props index 9df020bbd28..2c7c731ac54 100644 --- a/src/HotChocolate/Caching/test/Directory.Test.props +++ b/src/HotChocolate/Caching/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -21,7 +20,7 @@ - + diff --git a/src/HotChocolate/Core/test/Directory.Test.props b/src/HotChocolate/Core/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/Core/test/Directory.Test.props +++ b/src/HotChocolate/Core/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/CostAnalysis/test/Directory.Test.props b/src/HotChocolate/CostAnalysis/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/CostAnalysis/test/Directory.Test.props +++ b/src/HotChocolate/CostAnalysis/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Data/test/Directory.Test.props b/src/HotChocolate/Data/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/Data/test/Directory.Test.props +++ b/src/HotChocolate/Data/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Diagnostics/test/Directory.Test.props b/src/HotChocolate/Diagnostics/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/HotChocolate/Diagnostics/test/Directory.Test.props +++ b/src/HotChocolate/Diagnostics/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/HotChocolate/Fusion/test/Directory.Test.props b/src/HotChocolate/Fusion/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/Fusion/test/Directory.Test.props +++ b/src/HotChocolate/Fusion/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Json/test/Directory.Test.props b/src/HotChocolate/Json/test/Directory.Test.props index cc41cfc8a21..9bc1e36fa3c 100644 --- a/src/HotChocolate/Json/test/Directory.Test.props +++ b/src/HotChocolate/Json/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -12,7 +11,7 @@ - + diff --git a/src/HotChocolate/Language/test/Directory.Test.props b/src/HotChocolate/Language/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/HotChocolate/Language/test/Directory.Test.props +++ b/src/HotChocolate/Language/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/HotChocolate/Marten/test/Directory.Test.props b/src/HotChocolate/Marten/test/Directory.Test.props index 9df020bbd28..2c7c731ac54 100644 --- a/src/HotChocolate/Marten/test/Directory.Test.props +++ b/src/HotChocolate/Marten/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -21,7 +20,7 @@ - + diff --git a/src/HotChocolate/MongoDb/test/Directory.Test.props b/src/HotChocolate/MongoDb/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/MongoDb/test/Directory.Test.props +++ b/src/HotChocolate/MongoDb/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Mutable/test/Directory.Test.props b/src/HotChocolate/Mutable/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/HotChocolate/Mutable/test/Directory.Test.props +++ b/src/HotChocolate/Mutable/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/HotChocolate/PersistedOperations/test/Directory.Test.props b/src/HotChocolate/PersistedOperations/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/PersistedOperations/test/Directory.Test.props +++ b/src/HotChocolate/PersistedOperations/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Primitives/test/Directory.Test.props b/src/HotChocolate/Primitives/test/Directory.Test.props index cc41cfc8a21..9bc1e36fa3c 100644 --- a/src/HotChocolate/Primitives/test/Directory.Test.props +++ b/src/HotChocolate/Primitives/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -12,7 +11,7 @@ - + diff --git a/src/HotChocolate/Raven/test/Directory.Test.props b/src/HotChocolate/Raven/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/Raven/test/Directory.Test.props +++ b/src/HotChocolate/Raven/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Spatial/test/Directory.Test.props b/src/HotChocolate/Spatial/test/Directory.Test.props index 20e97a877f2..441b83ff286 100644 --- a/src/HotChocolate/Spatial/test/Directory.Test.props +++ b/src/HotChocolate/Spatial/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -22,7 +21,7 @@ - + diff --git a/src/HotChocolate/Utilities/test/Directory.Test.props b/src/HotChocolate/Utilities/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/HotChocolate/Utilities/test/Directory.Test.props +++ b/src/HotChocolate/Utilities/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/Mocha/benchmarks/Directory.Packages.props b/src/Mocha/benchmarks/Directory.Packages.props index ca7fdc002d7..443eb1eb1b6 100644 --- a/src/Mocha/benchmarks/Directory.Packages.props +++ b/src/Mocha/benchmarks/Directory.Packages.props @@ -6,9 +6,9 @@ - - - - + + + + diff --git a/src/Mocha/examples/AzureServiceBusTransport/AzureServiceBusTransport.AppHost/AzureServiceBusTransport.AppHost.csproj b/src/Mocha/examples/AzureServiceBusTransport/AzureServiceBusTransport.AppHost/AzureServiceBusTransport.AppHost.csproj index 02c6d3a93d0..83403558a4e 100644 --- a/src/Mocha/examples/AzureServiceBusTransport/AzureServiceBusTransport.AppHost/AzureServiceBusTransport.AppHost.csproj +++ b/src/Mocha/examples/AzureServiceBusTransport/AzureServiceBusTransport.AppHost/AzureServiceBusTransport.AppHost.csproj @@ -1,6 +1,7 @@ - + + true Exe AzureServiceBusTransport.AppHost enable diff --git a/src/Mocha/examples/AzureServiceBusTransport/Directory.Packages.props b/src/Mocha/examples/AzureServiceBusTransport/Directory.Packages.props index dd820356e1e..1c0f7815a4e 100644 --- a/src/Mocha/examples/AzureServiceBusTransport/Directory.Packages.props +++ b/src/Mocha/examples/AzureServiceBusTransport/Directory.Packages.props @@ -3,24 +3,24 @@ true - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + diff --git a/src/Mocha/examples/AzureServiceBusTransport/aspire.config.json b/src/Mocha/examples/AzureServiceBusTransport/aspire.config.json index 2b8d44c9c50..ca3092aa396 100644 --- a/src/Mocha/examples/AzureServiceBusTransport/aspire.config.json +++ b/src/Mocha/examples/AzureServiceBusTransport/aspire.config.json @@ -2,4 +2,4 @@ "appHost": { "path": "AzureServiceBusTransport.AppHost/AzureServiceBusTransport.AppHost.csproj" } -} \ No newline at end of file +} diff --git a/src/Mocha/examples/Demo/Demo.AppHost/Demo.AppHost.csproj b/src/Mocha/examples/Demo/Demo.AppHost/Demo.AppHost.csproj index e40d75862d6..b2c35322be0 100644 --- a/src/Mocha/examples/Demo/Demo.AppHost/Demo.AppHost.csproj +++ b/src/Mocha/examples/Demo/Demo.AppHost/Demo.AppHost.csproj @@ -1,6 +1,7 @@ - + + true Exe HotChocolate.Demo.AppHost HotChocolate.Demo.AppHost diff --git a/src/Mocha/examples/Demo/Demo.AppHost/aspire.config.json b/src/Mocha/examples/Demo/Demo.AppHost/aspire.config.json new file mode 100644 index 00000000000..644f1467a52 --- /dev/null +++ b/src/Mocha/examples/Demo/Demo.AppHost/aspire.config.json @@ -0,0 +1,5 @@ +{ + "appHost": { + "path": "Demo.AppHost.csproj" + } +} diff --git a/src/Mocha/examples/Demo/Directory.Packages.props b/src/Mocha/examples/Demo/Directory.Packages.props index 66d735ba217..64dafffd18f 100644 --- a/src/Mocha/examples/Demo/Directory.Packages.props +++ b/src/Mocha/examples/Demo/Directory.Packages.props @@ -3,29 +3,29 @@ true - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - + + + + diff --git a/src/Mocha/examples/PostgresTransport/Directory.Packages.props b/src/Mocha/examples/PostgresTransport/Directory.Packages.props index f8ebe690708..55d04ac6c42 100644 --- a/src/Mocha/examples/PostgresTransport/Directory.Packages.props +++ b/src/Mocha/examples/PostgresTransport/Directory.Packages.props @@ -3,20 +3,20 @@ true - - - - - - - - - + + + + + + + + + - - - - + + + + diff --git a/src/Mocha/examples/PostgresTransport/PostgresTransport.AppHost/PostgresTransport.AppHost.csproj b/src/Mocha/examples/PostgresTransport/PostgresTransport.AppHost/PostgresTransport.AppHost.csproj index 85920fb30e9..6deb049ae68 100644 --- a/src/Mocha/examples/PostgresTransport/PostgresTransport.AppHost/PostgresTransport.AppHost.csproj +++ b/src/Mocha/examples/PostgresTransport/PostgresTransport.AppHost/PostgresTransport.AppHost.csproj @@ -1,6 +1,7 @@ - + + true Exe PostgresTransport.AppHost diff --git a/src/Mocha/examples/PostgresTransport/aspire.config.json b/src/Mocha/examples/PostgresTransport/aspire.config.json new file mode 100644 index 00000000000..45ae5977e4d --- /dev/null +++ b/src/Mocha/examples/PostgresTransport/aspire.config.json @@ -0,0 +1,5 @@ +{ + "appHost": { + "path": "PostgresTransport.AppHost/PostgresTransport.AppHost.csproj" + } +} diff --git a/src/Mocha/test/Directory.Test.props b/src/Mocha/test/Directory.Test.props index cc41cfc8a21..9bc1e36fa3c 100644 --- a/src/Mocha/test/Directory.Test.props +++ b/src/Mocha/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -12,7 +11,7 @@ - + diff --git a/src/Nitro/CommandLine/test/Directory.Test.props b/src/Nitro/CommandLine/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/Nitro/CommandLine/test/Directory.Test.props +++ b/src/Nitro/CommandLine/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/Nitro/Common/test/Directory.Test.props b/src/Nitro/Common/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/Nitro/Common/test/Directory.Test.props +++ b/src/Nitro/Common/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/StrawberryShake/Client/test/Directory.Test.props b/src/StrawberryShake/Client/test/Directory.Test.props index 31632960e04..71dfa03d822 100644 --- a/src/StrawberryShake/Client/test/Directory.Test.props +++ b/src/StrawberryShake/Client/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -20,7 +19,7 @@ - + diff --git a/src/StrawberryShake/CodeGeneration/test/Directory.Test.props b/src/StrawberryShake/CodeGeneration/test/Directory.Test.props index 8444e2ce8f0..51aea5a4066 100644 --- a/src/StrawberryShake/CodeGeneration/test/Directory.Test.props +++ b/src/StrawberryShake/CodeGeneration/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - + diff --git a/src/StrawberryShake/Tooling/test/Directory.Test.props b/src/StrawberryShake/Tooling/test/Directory.Test.props index e80475a69db..86664210cbf 100644 --- a/src/StrawberryShake/Tooling/test/Directory.Test.props +++ b/src/StrawberryShake/Tooling/test/Directory.Test.props @@ -2,7 +2,6 @@ Exe - true @@ -19,7 +18,7 @@ - +