diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5c5b23a22ee..13db6682ddb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -58,12 +58,17 @@ jobs: exit 1 } + # Adding .dotnet to GITHUB_PATH as this ensures that the tests running + # from the repo always use restored dotnet. For tests run from outside + # the repo we install system dotnet earlier in the build + - name: Setup vars (Linux) if: ${{ inputs.os == 'ubuntu-latest' || inputs.os == 'macos-latest' }} run: | echo "DOTNET_SCRIPT=./dotnet.sh" >> $GITHUB_ENV echo "BUILD_SCRIPT=./build.sh" >> $GITHUB_ENV echo "TEST_RUN_PATH=${{ github.workspace }}/run-tests" >> $GITHUB_ENV + echo ${{ github.workspace }}/.dotnet >> $GITHUB_PATH - name: Setup vars (Windows) if: ${{ inputs.os == 'windows-latest' }} @@ -71,6 +76,7 @@ jobs: echo "DOTNET_SCRIPT=.\dotnet.cmd" >> $env:GITHUB_ENV echo "BUILD_SCRIPT=.\build.cmd" >> $env:GITHUB_ENV echo "TEST_RUN_PATH=${{ github.workspace }}\run-tests" >> $env:GITHUB_ENV + echo ${{ github.workspace }}\.dotnet >> $env:GITHUB_PATH - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets index 2f7c074170a..a6416a8be91 100644 --- a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets +++ b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets @@ -47,12 +47,18 @@ namespace Projects%3B #pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language. +/// +/// Metadata for the ]]>%(ClassName) [global::System.CodeDom.Compiler.GeneratedCode("Aspire.Hosting", null)] [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage(Justification = "Generated code.")] [global::System.Diagnostics.DebuggerDisplay("Type = {GetType().Name,nq}, ProjectPath = {ProjectPath}")] ]]>$(AspireGeneratedClassesVisibility)%(ClassName) + /// The path to the ]]>%(ClassName) public string ProjectPath => """]]>%(ProjectPath) @@ -89,6 +95,9 @@ namespace Projects%3B namespace Projects%3B #pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language. +/// +/// Metadata for the Aspire Host project. +/// [global::System.CodeDom.Compiler.GeneratedCode("Aspire.Hosting", null)] [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage(Justification = "Generated code.")] [global::System.Diagnostics.DebuggerDisplay("Type = {GetType().Name,nq}, ProjectPath = {ProjectPath}")] @@ -96,6 +105,10 @@ namespace Projects%3B #pragma warning restore CS8981 { private ]]>%(ClassName) + /// The path to the Aspire Host project. + /// public static string ProjectPath => """]]>%(ProjectPath) diff --git a/tests/Aspire.Cli.Tests/Certificates/CertificateServiceTests.cs b/tests/Aspire.Cli.Tests/Certificates/CertificateServiceTests.cs index 1c59604955a..7d5ceea720b 100644 --- a/tests/Aspire.Cli.Tests/Certificates/CertificateServiceTests.cs +++ b/tests/Aspire.Cli.Tests/Certificates/CertificateServiceTests.cs @@ -5,7 +5,6 @@ using Aspire.Cli.Tests.TestServices; using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Cli.Tests.Certificates; diff --git a/tests/Aspire.Cli.Tests/CliSmokeTests.cs b/tests/Aspire.Cli.Tests/CliSmokeTests.cs index 033da5a293e..033492d163d 100644 --- a/tests/Aspire.Cli.Tests/CliSmokeTests.cs +++ b/tests/Aspire.Cli.Tests/CliSmokeTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.DotNet.RemoteExecutor; -using Xunit; namespace Aspire.Cli.Tests; diff --git a/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs index 957e57493d1..80b90358533 100644 --- a/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs @@ -6,7 +6,6 @@ using Aspire.Cli.Tests.TestServices; using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; using NuGetPackage = Aspire.Shared.NuGetPackageCli; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/ConfigCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/ConfigCommandTests.cs index d9d337c485b..077ed1665e3 100644 --- a/tests/Aspire.Cli.Tests/Commands/ConfigCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/ConfigCommandTests.cs @@ -5,7 +5,6 @@ using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; using System.Text.Json.Nodes; -using Xunit; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs index a9f94990168..09d7428ee4a 100644 --- a/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/DeployCommandTests.cs @@ -6,7 +6,6 @@ using Aspire.Cli.Tests.Utils; using Aspire.Cli.Tests.TestServices; using Microsoft.Extensions.DependencyInjection; -using Xunit; using Aspire.Cli.Utils; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/ExecCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/ExecCommandTests.cs index 6304e86e937..e908d2e6920 100644 --- a/tests/Aspire.Cli.Tests/Commands/ExecCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/ExecCommandTests.cs @@ -5,7 +5,6 @@ using Aspire.Cli.Tests.TestServices; using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs index 1506fe7d4b1..74719c08cd2 100644 --- a/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs @@ -8,7 +8,6 @@ using Aspire.Cli.Tests.TestServices; using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; using NuGetPackage = Aspire.Shared.NuGetPackageCli; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/PublishCommandPromptingIntegrationTests.cs b/tests/Aspire.Cli.Tests/Commands/PublishCommandPromptingIntegrationTests.cs index 373afe0e973..608192380f3 100644 --- a/tests/Aspire.Cli.Tests/Commands/PublishCommandPromptingIntegrationTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/PublishCommandPromptingIntegrationTests.cs @@ -13,7 +13,6 @@ using Spectre.Console; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using Xunit; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs index aa5a99cd812..d995adb6532 100644 --- a/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/PublishCommandTests.cs @@ -7,7 +7,6 @@ using Aspire.Cli.Tests.TestServices; using Aspire.TestUtilities; using Microsoft.Extensions.DependencyInjection; -using Xunit; using Aspire.Cli.Utils; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/RootCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/RootCommandTests.cs index 24c417da79f..9b2d7abd4c5 100644 --- a/tests/Aspire.Cli.Tests/Commands/RootCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/RootCommandTests.cs @@ -4,7 +4,6 @@ using Aspire.Cli.Commands; using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs b/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs index b400de60f0d..dc438f56257 100644 --- a/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs +++ b/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs @@ -10,7 +10,6 @@ using Aspire.Cli.Utils; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Cli.Tests.Commands; diff --git a/tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.cs b/tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.cs index 3bda4eee6db..28b2712c34f 100644 --- a/tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.cs +++ b/tests/Aspire.Cli.Tests/DotNet/DotNetCliRunnerTests.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Cli.Tests.DotNet; diff --git a/tests/Aspire.Cli.Tests/E2E/ExecTests.cs b/tests/Aspire.Cli.Tests/E2E/ExecTests.cs index 871f48fccf2..6a5a9d7faa3 100644 --- a/tests/Aspire.Cli.Tests/E2E/ExecTests.cs +++ b/tests/Aspire.Cli.Tests/E2E/ExecTests.cs @@ -12,7 +12,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Projects; -using Xunit; namespace Aspire.Cli.Tests.E2E; diff --git a/tests/Aspire.Cli.Tests/Hosting/CliOrphanDetectorTests.cs b/tests/Aspire.Cli.Tests/Hosting/CliOrphanDetectorTests.cs index bff5126bbc4..7764fc597d4 100644 --- a/tests/Aspire.Cli.Tests/Hosting/CliOrphanDetectorTests.cs +++ b/tests/Aspire.Cli.Tests/Hosting/CliOrphanDetectorTests.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Time.Testing; -using Xunit; namespace Aspire.Cli.Tests; diff --git a/tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs b/tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs index 386310d3c92..06b24893f22 100644 --- a/tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs +++ b/tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs @@ -3,7 +3,6 @@ using Aspire.Cli.Interaction; using Spectre.Console; -using Xunit; namespace Aspire.Cli.Tests.Interaction; diff --git a/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs b/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs index 3d185f30bda..ea03033b9f9 100644 --- a/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs +++ b/tests/Aspire.Cli.Tests/NuGet/NuGetPackageCacheTests.cs @@ -5,7 +5,6 @@ using Aspire.Cli.Tests.TestServices; using Aspire.Cli.Tests.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; using NuGetPackage = Aspire.Shared.NuGetPackageCli; namespace Aspire.Cli.Tests.NuGet; diff --git a/tests/Aspire.Cli.Tests/Projects/ProjectLocatorTests.cs b/tests/Aspire.Cli.Tests/Projects/ProjectLocatorTests.cs index bef712425e7..44e0e653b35 100644 --- a/tests/Aspire.Cli.Tests/Projects/ProjectLocatorTests.cs +++ b/tests/Aspire.Cli.Tests/Projects/ProjectLocatorTests.cs @@ -12,7 +12,6 @@ using Aspire.TestUtilities; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Aspire.Cli.Tests.Projects; diff --git a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs index c6796944f03..5e0c66be6e1 100644 --- a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs +++ b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs @@ -16,7 +16,6 @@ using Microsoft.Extensions.Logging; using Spectre.Console; using Aspire.Cli.Configuration; -using Xunit; using Aspire.Cli.Utils; using Microsoft.Extensions.Logging.Abstractions; diff --git a/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs b/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs index ce9ab54eb5c..48f61fb8970 100644 --- a/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs +++ b/tests/Aspire.Cli.Tests/Utils/CliUpdateNotificationServiceTests.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Semver; -using Xunit; using NuGetPackage = Aspire.Shared.NuGetPackageCli; namespace Aspire.Cli.Tests.Utils; diff --git a/tests/Aspire.Cli.Tests/Utils/TemporaryRepo.cs b/tests/Aspire.Cli.Tests/Utils/TemporaryRepo.cs index ffe7c0d9352..a3fa04481fa 100644 --- a/tests/Aspire.Cli.Tests/Utils/TemporaryRepo.cs +++ b/tests/Aspire.Cli.Tests/Utils/TemporaryRepo.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; -using Xunit; namespace Aspire.Cli.Tests.Utils; diff --git a/tests/Aspire.Hosting.Containers.Tests/ContainerImageAnnotationTests.cs b/tests/Aspire.Hosting.Containers.Tests/ContainerImageAnnotationTests.cs index 9c3daae7708..b9fb6314f7a 100644 --- a/tests/Aspire.Hosting.Containers.Tests/ContainerImageAnnotationTests.cs +++ b/tests/Aspire.Hosting.Containers.Tests/ContainerImageAnnotationTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.ApplicationModel; -using Xunit; namespace Aspire.Hosting.Containers.Tests; diff --git a/tests/Aspire.Hosting.Containers.Tests/ContainerMountAnnotationTests.cs b/tests/Aspire.Hosting.Containers.Tests/ContainerMountAnnotationTests.cs index 987659d40cc..6f87cffff4f 100644 --- a/tests/Aspire.Hosting.Containers.Tests/ContainerMountAnnotationTests.cs +++ b/tests/Aspire.Hosting.Containers.Tests/ContainerMountAnnotationTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.ApplicationModel; -using Xunit; namespace Aspire.Hosting.Containers.Tests; diff --git a/tests/Aspire.Hosting.Containers.Tests/ContainerResourceBuilderTests.cs b/tests/Aspire.Hosting.Containers.Tests/ContainerResourceBuilderTests.cs index 6b9b555dcc9..14536f0edca 100644 --- a/tests/Aspire.Hosting.Containers.Tests/ContainerResourceBuilderTests.cs +++ b/tests/Aspire.Hosting.Containers.Tests/ContainerResourceBuilderTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Containers.Tests; diff --git a/tests/Aspire.Hosting.Containers.Tests/ContainerResourceTests.cs b/tests/Aspire.Hosting.Containers.Tests/ContainerResourceTests.cs index caefa1f4dca..9564797513e 100644 --- a/tests/Aspire.Hosting.Containers.Tests/ContainerResourceTests.cs +++ b/tests/Aspire.Hosting.Containers.Tests/ContainerResourceTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Containers.Tests; diff --git a/tests/Aspire.Hosting.Containers.Tests/DockerSocketBindMountTests.cs b/tests/Aspire.Hosting.Containers.Tests/DockerSocketBindMountTests.cs index 0098b3ac1b5..5ab443f8fc1 100644 --- a/tests/Aspire.Hosting.Containers.Tests/DockerSocketBindMountTests.cs +++ b/tests/Aspire.Hosting.Containers.Tests/DockerSocketBindMountTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; using Aspire.TestUtilities; -using Xunit; namespace Aspire.Hosting.Containers.Tests; diff --git a/tests/Aspire.Hosting.Containers.Tests/WithDockerfileTests.cs b/tests/Aspire.Hosting.Containers.Tests/WithDockerfileTests.cs index ea12b338c33..b666475763c 100644 --- a/tests/Aspire.Hosting.Containers.Tests/WithDockerfileTests.cs +++ b/tests/Aspire.Hosting.Containers.Tests/WithDockerfileTests.cs @@ -10,7 +10,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Hosting.Containers.Tests; diff --git a/tests/Aspire.Hosting.Garnet.Tests/AddGarnetTests.cs b/tests/Aspire.Hosting.Garnet.Tests/AddGarnetTests.cs index 16d20518643..d844cdb7fc1 100644 --- a/tests/Aspire.Hosting.Garnet.Tests/AddGarnetTests.cs +++ b/tests/Aspire.Hosting.Garnet.Tests/AddGarnetTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Garnet.Tests; diff --git a/tests/Aspire.Hosting.Garnet.Tests/GarnetFunctionalTests.cs b/tests/Aspire.Hosting.Garnet.Tests/GarnetFunctionalTests.cs index 275e21b24e7..be8bf769356 100644 --- a/tests/Aspire.Hosting.Garnet.Tests/GarnetFunctionalTests.cs +++ b/tests/Aspire.Hosting.Garnet.Tests/GarnetFunctionalTests.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Hosting; using Polly; using StackExchange.Redis; -using Xunit; namespace Aspire.Hosting.Garnet.Tests; diff --git a/tests/Aspire.Hosting.Garnet.Tests/GarnetPublicApiTests.cs b/tests/Aspire.Hosting.Garnet.Tests/GarnetPublicApiTests.cs index 160671a44df..e1f68ed242c 100644 --- a/tests/Aspire.Hosting.Garnet.Tests/GarnetPublicApiTests.cs +++ b/tests/Aspire.Hosting.Garnet.Tests/GarnetPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Garnet.Tests; diff --git a/tests/Aspire.Hosting.GitHub.Models.Tests/GitHubModelsExtensionTests.cs b/tests/Aspire.Hosting.GitHub.Models.Tests/GitHubModelsExtensionTests.cs index 60e1bbb595b..5fd56f65870 100644 --- a/tests/Aspire.Hosting.GitHub.Models.Tests/GitHubModelsExtensionTests.cs +++ b/tests/Aspire.Hosting.GitHub.Models.Tests/GitHubModelsExtensionTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.GitHub.Models.Tests; diff --git a/tests/Aspire.Hosting.Kafka.Tests/AddKafkaTests.cs b/tests/Aspire.Hosting.Kafka.Tests/AddKafkaTests.cs index f0f55e9e930..08f5b42e103 100644 --- a/tests/Aspire.Hosting.Kafka.Tests/AddKafkaTests.cs +++ b/tests/Aspire.Hosting.Kafka.Tests/AddKafkaTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Kafka.Tests; diff --git a/tests/Aspire.Hosting.Kafka.Tests/KafkaFunctionalTests.cs b/tests/Aspire.Hosting.Kafka.Tests/KafkaFunctionalTests.cs index 59c828bd130..c9260caef3f 100644 --- a/tests/Aspire.Hosting.Kafka.Tests/KafkaFunctionalTests.cs +++ b/tests/Aspire.Hosting.Kafka.Tests/KafkaFunctionalTests.cs @@ -11,7 +11,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Hosting; using Polly; -using Xunit; namespace Aspire.Hosting.Kafka.Tests; diff --git a/tests/Aspire.Hosting.Kafka.Tests/KafkaPublicApiTests.cs b/tests/Aspire.Hosting.Kafka.Tests/KafkaPublicApiTests.cs index ba8c252c1c4..f209c329974 100644 --- a/tests/Aspire.Hosting.Kafka.Tests/KafkaPublicApiTests.cs +++ b/tests/Aspire.Hosting.Kafka.Tests/KafkaPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Kafka.Tests; diff --git a/tests/Aspire.Hosting.Keycloak.Tests/KeycloakPublicApiTests.cs b/tests/Aspire.Hosting.Keycloak.Tests/KeycloakPublicApiTests.cs index 56fd18024c8..f92536b6ef5 100644 --- a/tests/Aspire.Hosting.Keycloak.Tests/KeycloakPublicApiTests.cs +++ b/tests/Aspire.Hosting.Keycloak.Tests/KeycloakPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Keycloak.Tests; diff --git a/tests/Aspire.Hosting.Keycloak.Tests/KeycloakResourceBuilderTests.cs b/tests/Aspire.Hosting.Keycloak.Tests/KeycloakResourceBuilderTests.cs index e75dcf9d67c..dbfb36c28b4 100644 --- a/tests/Aspire.Hosting.Keycloak.Tests/KeycloakResourceBuilderTests.cs +++ b/tests/Aspire.Hosting.Keycloak.Tests/KeycloakResourceBuilderTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Utils; using System.Net.Sockets; using Microsoft.Extensions.DependencyInjection; -using Xunit; using Aspire.Hosting.ApplicationModel; namespace Aspire.Hosting.Keycloak.Tests; diff --git a/tests/Aspire.Hosting.Milvus.Tests/AddMilvusTests.cs b/tests/Aspire.Hosting.Milvus.Tests/AddMilvusTests.cs index e81ff6adbe4..15f462d86bd 100644 --- a/tests/Aspire.Hosting.Milvus.Tests/AddMilvusTests.cs +++ b/tests/Aspire.Hosting.Milvus.Tests/AddMilvusTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Milvus.Tests; public class AddMilvusTests diff --git a/tests/Aspire.Hosting.Milvus.Tests/MilvusFunctionalTests.cs b/tests/Aspire.Hosting.Milvus.Tests/MilvusFunctionalTests.cs index 63c77d1ce3a..a0dafe89d35 100644 --- a/tests/Aspire.Hosting.Milvus.Tests/MilvusFunctionalTests.cs +++ b/tests/Aspire.Hosting.Milvus.Tests/MilvusFunctionalTests.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Milvus.Client; -using Xunit; namespace Aspire.Hosting.Milvus.Tests; diff --git a/tests/Aspire.Hosting.Milvus.Tests/MilvusPublicApiTests.cs b/tests/Aspire.Hosting.Milvus.Tests/MilvusPublicApiTests.cs index e3c37345e88..eb06200e7bc 100644 --- a/tests/Aspire.Hosting.Milvus.Tests/MilvusPublicApiTests.cs +++ b/tests/Aspire.Hosting.Milvus.Tests/MilvusPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Milvus.Tests; diff --git a/tests/Aspire.Hosting.MongoDB.Tests/AddMongoDBTests.cs b/tests/Aspire.Hosting.MongoDB.Tests/AddMongoDBTests.cs index d0ec695b3ab..35ce89d6982 100644 --- a/tests/Aspire.Hosting.MongoDB.Tests/AddMongoDBTests.cs +++ b/tests/Aspire.Hosting.MongoDB.Tests/AddMongoDBTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.MongoDB.Tests; diff --git a/tests/Aspire.Hosting.MongoDB.Tests/MongoDBPublicApiTests.cs b/tests/Aspire.Hosting.MongoDB.Tests/MongoDBPublicApiTests.cs index 0bbd9a71058..44bf69b2d74 100644 --- a/tests/Aspire.Hosting.MongoDB.Tests/MongoDBPublicApiTests.cs +++ b/tests/Aspire.Hosting.MongoDB.Tests/MongoDBPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.MongoDB.Tests; diff --git a/tests/Aspire.Hosting.MongoDB.Tests/MongoDbFunctionalTests.cs b/tests/Aspire.Hosting.MongoDB.Tests/MongoDbFunctionalTests.cs index 2fc93e501ba..053ea1689e1 100644 --- a/tests/Aspire.Hosting.MongoDB.Tests/MongoDbFunctionalTests.cs +++ b/tests/Aspire.Hosting.MongoDB.Tests/MongoDbFunctionalTests.cs @@ -8,7 +8,6 @@ using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson; using MongoDB.Driver; -using Xunit; using Polly; using Aspire.Hosting.ApplicationModel; using Microsoft.Extensions.Diagnostics.HealthChecks; diff --git a/tests/Aspire.Hosting.MySql.Tests/AddMySqlTests.cs b/tests/Aspire.Hosting.MySql.Tests/AddMySqlTests.cs index cda1d645229..51b53ad931b 100644 --- a/tests/Aspire.Hosting.MySql.Tests/AddMySqlTests.cs +++ b/tests/Aspire.Hosting.MySql.Tests/AddMySqlTests.cs @@ -7,7 +7,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.MySql.Tests; diff --git a/tests/Aspire.Hosting.MySql.Tests/MySqlFunctionalTests.cs b/tests/Aspire.Hosting.MySql.Tests/MySqlFunctionalTests.cs index 3cd98abb29c..a1f906b2d80 100644 --- a/tests/Aspire.Hosting.MySql.Tests/MySqlFunctionalTests.cs +++ b/tests/Aspire.Hosting.MySql.Tests/MySqlFunctionalTests.cs @@ -16,7 +16,6 @@ using Microsoft.Extensions.Hosting; using MySqlConnector; using Polly; -using Xunit; namespace Aspire.Hosting.MySql.Tests; diff --git a/tests/Aspire.Hosting.MySql.Tests/MySqlPublicApiTests.cs b/tests/Aspire.Hosting.MySql.Tests/MySqlPublicApiTests.cs index 02bf59a8ebd..474b0d2b020 100644 --- a/tests/Aspire.Hosting.MySql.Tests/MySqlPublicApiTests.cs +++ b/tests/Aspire.Hosting.MySql.Tests/MySqlPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.MySql.Tests; diff --git a/tests/Aspire.Hosting.Nats.Tests/AddNatsTests.cs b/tests/Aspire.Hosting.Nats.Tests/AddNatsTests.cs index 5972e539222..5dbf1c81632 100644 --- a/tests/Aspire.Hosting.Nats.Tests/AddNatsTests.cs +++ b/tests/Aspire.Hosting.Nats.Tests/AddNatsTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Nats.Tests; diff --git a/tests/Aspire.Hosting.Nats.Tests/NatsFunctionalTests.cs b/tests/Aspire.Hosting.Nats.Tests/NatsFunctionalTests.cs index 4e11558dfba..60d1ede93f4 100644 --- a/tests/Aspire.Hosting.Nats.Tests/NatsFunctionalTests.cs +++ b/tests/Aspire.Hosting.Nats.Tests/NatsFunctionalTests.cs @@ -3,7 +3,6 @@ using Aspire.TestUtilities; using Aspire.Hosting.Utils; -using Xunit; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.DependencyInjection; using NATS.Client.Core; diff --git a/tests/Aspire.Hosting.Nats.Tests/NatsPublicApiTests.cs b/tests/Aspire.Hosting.Nats.Tests/NatsPublicApiTests.cs index 537c3575d6e..74a444939e6 100644 --- a/tests/Aspire.Hosting.Nats.Tests/NatsPublicApiTests.cs +++ b/tests/Aspire.Hosting.Nats.Tests/NatsPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Nats.Tests; diff --git a/tests/Aspire.Hosting.NodeJs.Tests/AddNodeAppTests.cs b/tests/Aspire.Hosting.NodeJs.Tests/AddNodeAppTests.cs index 0b72f882cfc..cf02e3b9edb 100644 --- a/tests/Aspire.Hosting.NodeJs.Tests/AddNodeAppTests.cs +++ b/tests/Aspire.Hosting.NodeJs.Tests/AddNodeAppTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.NodeJs.Tests; diff --git a/tests/Aspire.Hosting.NodeJs.Tests/NodeAppFixture.cs b/tests/Aspire.Hosting.NodeJs.Tests/NodeAppFixture.cs index c3f681c6cad..76d5cb94674 100644 --- a/tests/Aspire.Hosting.NodeJs.Tests/NodeAppFixture.cs +++ b/tests/Aspire.Hosting.NodeJs.Tests/NodeAppFixture.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Testing; using Aspire.Hosting.Utils; -using Xunit; using Xunit.Sdk; namespace Aspire.Hosting.NodeJs.Tests; diff --git a/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs b/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs index cbc5c6c358b..20a360268ac 100644 --- a/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs +++ b/tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs @@ -3,7 +3,6 @@ using Aspire.TestUtilities; using Aspire.Hosting.Testing; -using Xunit; using Microsoft.AspNetCore.InternalTesting; namespace Aspire.Hosting.NodeJs.Tests; diff --git a/tests/Aspire.Hosting.NodeJs.Tests/NodeJsPublicApiTests.cs b/tests/Aspire.Hosting.NodeJs.Tests/NodeJsPublicApiTests.cs index 91acc3afefe..8d8952ebd8c 100644 --- a/tests/Aspire.Hosting.NodeJs.Tests/NodeJsPublicApiTests.cs +++ b/tests/Aspire.Hosting.NodeJs.Tests/NodeJsPublicApiTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.NodeJs.Tests; diff --git a/tests/Aspire.Hosting.Oracle.Tests/AddOracleTests.cs b/tests/Aspire.Hosting.Oracle.Tests/AddOracleTests.cs index 6334f567c58..739ba591257 100644 --- a/tests/Aspire.Hosting.Oracle.Tests/AddOracleTests.cs +++ b/tests/Aspire.Hosting.Oracle.Tests/AddOracleTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Oracle.Tests; diff --git a/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs b/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs index 3a534764f5f..829c6343644 100644 --- a/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs +++ b/tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs @@ -10,7 +10,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Hosting; using Polly; -using Xunit; namespace Aspire.Hosting.Oracle.Tests; diff --git a/tests/Aspire.Hosting.Oracle.Tests/OraclePublicApiTests.cs b/tests/Aspire.Hosting.Oracle.Tests/OraclePublicApiTests.cs index 4ae94f6c1ba..7366a5e3669 100644 --- a/tests/Aspire.Hosting.Oracle.Tests/OraclePublicApiTests.cs +++ b/tests/Aspire.Hosting.Oracle.Tests/OraclePublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Oracle.Tests; diff --git a/tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs b/tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs index 13dd4dba2c1..e90edbdd46b 100644 --- a/tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs +++ b/tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs @@ -8,7 +8,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.PostgreSQL.Tests; diff --git a/tests/Aspire.Hosting.PostgreSQL.Tests/PostgrePublicApiTests.cs b/tests/Aspire.Hosting.PostgreSQL.Tests/PostgrePublicApiTests.cs index be64476ff7b..ea3bc631ae1 100644 --- a/tests/Aspire.Hosting.PostgreSQL.Tests/PostgrePublicApiTests.cs +++ b/tests/Aspire.Hosting.PostgreSQL.Tests/PostgrePublicApiTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Postgres; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.PostgreSQL.Tests; diff --git a/tests/Aspire.Hosting.PostgreSQL.Tests/PostgresFunctionalTests.cs b/tests/Aspire.Hosting.PostgreSQL.Tests/PostgresFunctionalTests.cs index b6fb2e6dbe2..23e70a32d9e 100644 --- a/tests/Aspire.Hosting.PostgreSQL.Tests/PostgresFunctionalTests.cs +++ b/tests/Aspire.Hosting.PostgreSQL.Tests/PostgresFunctionalTests.cs @@ -16,7 +16,6 @@ using Microsoft.Extensions.Hosting; using Npgsql; using Polly; -using Xunit; namespace Aspire.Hosting.PostgreSQL.Tests; diff --git a/tests/Aspire.Hosting.Python.Tests/AddPythonAppTests.cs b/tests/Aspire.Hosting.Python.Tests/AddPythonAppTests.cs index e0c04ba7a81..5adc160d84e 100644 --- a/tests/Aspire.Hosting.Python.Tests/AddPythonAppTests.cs +++ b/tests/Aspire.Hosting.Python.Tests/AddPythonAppTests.cs @@ -3,7 +3,6 @@ #pragma warning disable CS0612 -using Xunit; using Microsoft.Extensions.DependencyInjection; using Aspire.Hosting.Utils; using Aspire.Hosting.Tests.Utils; diff --git a/tests/Aspire.Hosting.Python.Tests/PythonPublicApiTests.cs b/tests/Aspire.Hosting.Python.Tests/PythonPublicApiTests.cs index 97af7245035..c51c93d21e6 100644 --- a/tests/Aspire.Hosting.Python.Tests/PythonPublicApiTests.cs +++ b/tests/Aspire.Hosting.Python.Tests/PythonPublicApiTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Python.Tests; diff --git a/tests/Aspire.Hosting.Qdrant.Tests/AddQdrantTests.cs b/tests/Aspire.Hosting.Qdrant.Tests/AddQdrantTests.cs index cef698ed109..4e3bc8e5de0 100644 --- a/tests/Aspire.Hosting.Qdrant.Tests/AddQdrantTests.cs +++ b/tests/Aspire.Hosting.Qdrant.Tests/AddQdrantTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Qdrant.Tests; diff --git a/tests/Aspire.Hosting.Qdrant.Tests/QdrantFunctionalTests.cs b/tests/Aspire.Hosting.Qdrant.Tests/QdrantFunctionalTests.cs index 0cc11bce4b7..61d0cb16213 100644 --- a/tests/Aspire.Hosting.Qdrant.Tests/QdrantFunctionalTests.cs +++ b/tests/Aspire.Hosting.Qdrant.Tests/QdrantFunctionalTests.cs @@ -12,7 +12,6 @@ using Polly; using Qdrant.Client; using Qdrant.Client.Grpc; -using Xunit; namespace Aspire.Hosting.Qdrant.Tests; diff --git a/tests/Aspire.Hosting.Qdrant.Tests/QdrantPublicApiTests.cs b/tests/Aspire.Hosting.Qdrant.Tests/QdrantPublicApiTests.cs index fcfcfab7f5f..fa5db1940a0 100644 --- a/tests/Aspire.Hosting.Qdrant.Tests/QdrantPublicApiTests.cs +++ b/tests/Aspire.Hosting.Qdrant.Tests/QdrantPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Qdrant.Tests; diff --git a/tests/Aspire.Hosting.RabbitMQ.Tests/AddRabbitMQTests.cs b/tests/Aspire.Hosting.RabbitMQ.Tests/AddRabbitMQTests.cs index 6823a9fcab5..c707d7f606c 100644 --- a/tests/Aspire.Hosting.RabbitMQ.Tests/AddRabbitMQTests.cs +++ b/tests/Aspire.Hosting.RabbitMQ.Tests/AddRabbitMQTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; using System.Net.Sockets; -using Xunit; namespace Aspire.Hosting.RabbitMQ.Tests; diff --git a/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQFunctionalTests.cs b/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQFunctionalTests.cs index 0375944788f..2d02f943aa5 100644 --- a/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQFunctionalTests.cs +++ b/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQFunctionalTests.cs @@ -12,7 +12,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using RabbitMQ.Client; -using Xunit; namespace Aspire.Hosting.RabbitMQ.Tests; diff --git a/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQPublicApiTests.cs b/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQPublicApiTests.cs index 02cbdfff52d..a123076be4c 100644 --- a/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQPublicApiTests.cs +++ b/tests/Aspire.Hosting.RabbitMQ.Tests/RabbitMQPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.RabbitMQ.Tests; diff --git a/tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs b/tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs index cf1a0d93836..740082bd2b6 100644 --- a/tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs +++ b/tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Redis.Tests; diff --git a/tests/Aspire.Hosting.Redis.Tests/RedisFunctionalTests.cs b/tests/Aspire.Hosting.Redis.Tests/RedisFunctionalTests.cs index beb3616c2d5..08343a118be 100644 --- a/tests/Aspire.Hosting.Redis.Tests/RedisFunctionalTests.cs +++ b/tests/Aspire.Hosting.Redis.Tests/RedisFunctionalTests.cs @@ -13,7 +13,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Hosting; using StackExchange.Redis; -using Xunit; using System.Text.Json.Nodes; using Aspire.Hosting; using Polly; diff --git a/tests/Aspire.Hosting.Redis.Tests/RedisPublicApiTests.cs b/tests/Aspire.Hosting.Redis.Tests/RedisPublicApiTests.cs index 4241bf31001..9b57e1d5982 100644 --- a/tests/Aspire.Hosting.Redis.Tests/RedisPublicApiTests.cs +++ b/tests/Aspire.Hosting.Redis.Tests/RedisPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Redis.Tests; diff --git a/tests/Aspire.Hosting.Seq.Tests/AddSeqTests.cs b/tests/Aspire.Hosting.Seq.Tests/AddSeqTests.cs index 116d602af14..c317f3d0cba 100644 --- a/tests/Aspire.Hosting.Seq.Tests/AddSeqTests.cs +++ b/tests/Aspire.Hosting.Seq.Tests/AddSeqTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Seq.Tests; diff --git a/tests/Aspire.Hosting.Seq.Tests/SeqFunctionalTests.cs b/tests/Aspire.Hosting.Seq.Tests/SeqFunctionalTests.cs index 702ef9412ee..03752852f01 100644 --- a/tests/Aspire.Hosting.Seq.Tests/SeqFunctionalTests.cs +++ b/tests/Aspire.Hosting.Seq.Tests/SeqFunctionalTests.cs @@ -6,7 +6,6 @@ using Aspire.TestUtilities; using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Seq.Tests; diff --git a/tests/Aspire.Hosting.Seq.Tests/SeqPublicApiTests.cs b/tests/Aspire.Hosting.Seq.Tests/SeqPublicApiTests.cs index 031e8de6e5a..e9a65571b67 100644 --- a/tests/Aspire.Hosting.Seq.Tests/SeqPublicApiTests.cs +++ b/tests/Aspire.Hosting.Seq.Tests/SeqPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Seq.Tests; diff --git a/tests/Aspire.Hosting.SqlServer.Tests/AddSqlServerTests.cs b/tests/Aspire.Hosting.SqlServer.Tests/AddSqlServerTests.cs index 673cc2d2638..b1a8549f3b5 100644 --- a/tests/Aspire.Hosting.SqlServer.Tests/AddSqlServerTests.cs +++ b/tests/Aspire.Hosting.SqlServer.Tests/AddSqlServerTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; using System.Net.Sockets; -using Xunit; namespace Aspire.Hosting.SqlServer.Tests; diff --git a/tests/Aspire.Hosting.SqlServer.Tests/SqlServerFunctionalTests.cs b/tests/Aspire.Hosting.SqlServer.Tests/SqlServerFunctionalTests.cs index 1d3039532e4..49840528aa1 100644 --- a/tests/Aspire.Hosting.SqlServer.Tests/SqlServerFunctionalTests.cs +++ b/tests/Aspire.Hosting.SqlServer.Tests/SqlServerFunctionalTests.cs @@ -12,7 +12,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Hosting; using Polly; -using Xunit; namespace Aspire.Hosting.SqlServer.Tests; diff --git a/tests/Aspire.Hosting.SqlServer.Tests/SqlServerGoStatementTests.cs b/tests/Aspire.Hosting.SqlServer.Tests/SqlServerGoStatementTests.cs index 5fa38a7d3c3..0bed22262dd 100644 --- a/tests/Aspire.Hosting.SqlServer.Tests/SqlServerGoStatementTests.cs +++ b/tests/Aspire.Hosting.SqlServer.Tests/SqlServerGoStatementTests.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - namespace Aspire.Hosting.SqlServer.Tests; public class SqlServerGoStatementTests diff --git a/tests/Aspire.Hosting.SqlServer.Tests/SqlServerPublicApiTests.cs b/tests/Aspire.Hosting.SqlServer.Tests/SqlServerPublicApiTests.cs index a1b5a0d5395..cca0654694e 100644 --- a/tests/Aspire.Hosting.SqlServer.Tests/SqlServerPublicApiTests.cs +++ b/tests/Aspire.Hosting.SqlServer.Tests/SqlServerPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.SqlServer.Tests; diff --git a/tests/Aspire.Hosting.Tests/AddParameterTests.cs b/tests/Aspire.Hosting.Tests/AddParameterTests.cs index 9d41478fbb2..529232ba189 100644 --- a/tests/Aspire.Hosting.Tests/AddParameterTests.cs +++ b/tests/Aspire.Hosting.Tests/AddParameterTests.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/AsHttp2ServiceTests.cs b/tests/Aspire.Hosting.Tests/AsHttp2ServiceTests.cs index 26b0289c884..b838eacebba 100644 --- a/tests/Aspire.Hosting.Tests/AsHttp2ServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/AsHttp2ServiceTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Publishing; using Aspire.Hosting.Tests.Helpers; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/Aspire.Hosting.Tests.csproj b/tests/Aspire.Hosting.Tests/Aspire.Hosting.Tests.csproj index 72020d319f3..c51cdafb45d 100644 --- a/tests/Aspire.Hosting.Tests/Aspire.Hosting.Tests.csproj +++ b/tests/Aspire.Hosting.Tests/Aspire.Hosting.Tests.csproj @@ -27,6 +27,7 @@ + @@ -35,6 +36,7 @@ + diff --git a/tests/Aspire.Hosting.Tests/AspireStoreTests.cs b/tests/Aspire.Hosting.Tests/AspireStoreTests.cs index a01f7127d05..fa130efbe04 100644 --- a/tests/Aspire.Hosting.Tests/AspireStoreTests.cs +++ b/tests/Aspire.Hosting.Tests/AspireStoreTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/Backchannel/AppHostBackchannelTests.cs b/tests/Aspire.Hosting.Tests/Backchannel/AppHostBackchannelTests.cs index daf241bfb29..beb81c52e4d 100644 --- a/tests/Aspire.Hosting.Tests/Backchannel/AppHostBackchannelTests.cs +++ b/tests/Aspire.Hosting.Tests/Backchannel/AppHostBackchannelTests.cs @@ -9,7 +9,6 @@ using Aspire.Hosting.Utils; using Microsoft.VisualStudio.Threading; using StreamJsonRpc; -using Xunit; namespace Aspire.Hosting.Backchannel; diff --git a/tests/Aspire.Hosting.Tests/Codespaces/CodespacesUrlRewriterTests.cs b/tests/Aspire.Hosting.Tests/Codespaces/CodespacesUrlRewriterTests.cs index 40c657c0b7a..435644a7212 100644 --- a/tests/Aspire.Hosting.Tests/Codespaces/CodespacesUrlRewriterTests.cs +++ b/tests/Aspire.Hosting.Tests/Codespaces/CodespacesUrlRewriterTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Hosting.Tests.Codespaces; diff --git a/tests/Aspire.Hosting.Tests/Dashboard/DashboardLifecycleHookTests.cs b/tests/Aspire.Hosting.Tests/Dashboard/DashboardLifecycleHookTests.cs index 28d76c8ff7e..e55c5b7e826 100644 --- a/tests/Aspire.Hosting.Tests/Dashboard/DashboardLifecycleHookTests.cs +++ b/tests/Aspire.Hosting.Tests/Dashboard/DashboardLifecycleHookTests.cs @@ -18,7 +18,6 @@ using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Options; -using Xunit; namespace Aspire.Hosting.Tests.Dashboard; diff --git a/tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs b/tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs index d2db6b1e055..f62a7eee7fb 100644 --- a/tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs +++ b/tests/Aspire.Hosting.Tests/Dashboard/DashboardResourceTests.cs @@ -11,7 +11,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; using Xunit.Sdk; namespace Aspire.Hosting.Tests.Dashboard; diff --git a/tests/Aspire.Hosting.Tests/Dashboard/DashboardServiceTests.cs b/tests/Aspire.Hosting.Tests/Dashboard/DashboardServiceTests.cs index a0fd2fe0960..7fb78a5e9c6 100644 --- a/tests/Aspire.Hosting.Tests/Dashboard/DashboardServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/Dashboard/DashboardServiceTests.cs @@ -16,7 +16,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; using DashboardServiceImpl = Aspire.Hosting.Dashboard.DashboardService; using Resource = Aspire.Hosting.ApplicationModel.Resource; diff --git a/tests/Aspire.Hosting.Tests/Dashboard/ResourcePublisherTests.cs b/tests/Aspire.Hosting.Tests/Dashboard/ResourcePublisherTests.cs index 51d1126c574..edaa108117a 100644 --- a/tests/Aspire.Hosting.Tests/Dashboard/ResourcePublisherTests.cs +++ b/tests/Aspire.Hosting.Tests/Dashboard/ResourcePublisherTests.cs @@ -4,7 +4,6 @@ using Aspire.Dashboard.Model; using Aspire.Hosting.Dashboard; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests.Dashboard; diff --git a/tests/Aspire.Hosting.Tests/Dashboard/TransportOptionsValidatorTests.cs b/tests/Aspire.Hosting.Tests/Dashboard/TransportOptionsValidatorTests.cs index 95a65a60b2c..5e7b6016296 100644 --- a/tests/Aspire.Hosting.Tests/Dashboard/TransportOptionsValidatorTests.cs +++ b/tests/Aspire.Hosting.Tests/Dashboard/TransportOptionsValidatorTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Dashboard; using Microsoft.Extensions.Configuration; -using Xunit; namespace Aspire.Hosting.Tests.Dashboard; diff --git a/tests/Aspire.Hosting.Tests/Dcp/DcpCliArgsTests.cs b/tests/Aspire.Hosting.Tests/Dcp/DcpCliArgsTests.cs index da7155417a2..eb34f958236 100644 --- a/tests/Aspire.Hosting.Tests/Dcp/DcpCliArgsTests.cs +++ b/tests/Aspire.Hosting.Tests/Dcp/DcpCliArgsTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Dcp; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Xunit; namespace Aspire.Hosting.Tests.Dcp; diff --git a/tests/Aspire.Hosting.Tests/Dcp/DcpExecutorTests.cs b/tests/Aspire.Hosting.Tests/Dcp/DcpExecutorTests.cs index faead8af0da..38fc366a76b 100644 --- a/tests/Aspire.Hosting.Tests/Dcp/DcpExecutorTests.cs +++ b/tests/Aspire.Hosting.Tests/Dcp/DcpExecutorTests.cs @@ -18,7 +18,6 @@ using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Polly; -using Xunit; namespace Aspire.Hosting.Tests.Dcp; diff --git a/tests/Aspire.Hosting.Tests/DcpVisibilityTests.cs b/tests/Aspire.Hosting.Tests/DcpVisibilityTests.cs index 191bb7e9c12..e27f974ca07 100644 --- a/tests/Aspire.Hosting.Tests/DcpVisibilityTests.cs +++ b/tests/Aspire.Hosting.Tests/DcpVisibilityTests.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - namespace Aspire.Hosting.Tests; public class DcpVisibilityTests { diff --git a/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderExtensionsTests.cs b/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderExtensionsTests.cs index fc9275448b6..b82edf791d7 100644 --- a/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderExtensionsTests.cs +++ b/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderExtensionsTests.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - namespace Aspire.Hosting.Tests; public class DistributedApplicationBuilderExtensionsTests diff --git a/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderTests.cs b/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderTests.cs index cfaa3038294..a66056e3d59 100644 --- a/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderTests.cs +++ b/tests/Aspire.Hosting.Tests/DistributedApplicationBuilderTests.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/DistributedApplicationModelExtensionsTests.cs b/tests/Aspire.Hosting.Tests/DistributedApplicationModelExtensionsTests.cs index 324dda9cbcb..fdaf55adcf1 100644 --- a/tests/Aspire.Hosting.Tests/DistributedApplicationModelExtensionsTests.cs +++ b/tests/Aspire.Hosting.Tests/DistributedApplicationModelExtensionsTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/DistributedApplicationRunnerTests.cs b/tests/Aspire.Hosting.Tests/DistributedApplicationRunnerTests.cs index 2bd1ed43956..597117649b5 100644 --- a/tests/Aspire.Hosting.Tests/DistributedApplicationRunnerTests.cs +++ b/tests/Aspire.Hosting.Tests/DistributedApplicationRunnerTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Publishing; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs b/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs index e5010d3626f..e07d96f400f 100644 --- a/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs +++ b/tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs @@ -23,7 +23,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Xunit; using Xunit.Sdk; using TestConstants = Microsoft.AspNetCore.InternalTesting.TestConstants; diff --git a/tests/Aspire.Hosting.Tests/Eventing/DistributedApplicationBuilderEventingTests.cs b/tests/Aspire.Hosting.Tests/Eventing/DistributedApplicationBuilderEventingTests.cs index bb5dbf2f59e..d2e7ea6c043 100644 --- a/tests/Aspire.Hosting.Tests/Eventing/DistributedApplicationBuilderEventingTests.cs +++ b/tests/Aspire.Hosting.Tests/Eventing/DistributedApplicationBuilderEventingTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests.Eventing; diff --git a/tests/Aspire.Hosting.Tests/ExecutableResourceTests.cs b/tests/Aspire.Hosting.Tests/ExecutableResourceTests.cs index 409e2f49349..968045d74ff 100644 --- a/tests/Aspire.Hosting.Tests/ExecutableResourceTests.cs +++ b/tests/Aspire.Hosting.Tests/ExecutableResourceTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ExpressionResolverTests.cs b/tests/Aspire.Hosting.Tests/ExpressionResolverTests.cs index 2c7c868a732..112892e46ff 100644 --- a/tests/Aspire.Hosting.Tests/ExpressionResolverTests.cs +++ b/tests/Aspire.Hosting.Tests/ExpressionResolverTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Tests.Utils; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ExternalServiceTests.cs b/tests/Aspire.Hosting.Tests/ExternalServiceTests.cs index 8bd3dade85b..36f5546dc0d 100644 --- a/tests/Aspire.Hosting.Tests/ExternalServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/ExternalServiceTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/Health/HealthStatusTests.cs b/tests/Aspire.Hosting.Tests/Health/HealthStatusTests.cs index b358968ca08..8192b30d2fb 100644 --- a/tests/Aspire.Hosting.Tests/Health/HealthStatusTests.cs +++ b/tests/Aspire.Hosting.Tests/Health/HealthStatusTests.cs @@ -1,9 +1,8 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Immutable; using Microsoft.Extensions.Diagnostics.HealthChecks; -using Xunit; namespace Aspire.Hosting.Tests.Health; diff --git a/tests/Aspire.Hosting.Tests/Health/ResourceHealthCheckServiceTests.cs b/tests/Aspire.Hosting.Tests/Health/ResourceHealthCheckServiceTests.cs index b99d9d06272..641b5e52b3f 100644 --- a/tests/Aspire.Hosting.Tests/Health/ResourceHealthCheckServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/Health/ResourceHealthCheckServiceTests.cs @@ -10,7 +10,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Microsoft.Extensions.Time.Testing; -using Xunit; namespace Aspire.Hosting.Tests.Health; diff --git a/tests/Aspire.Hosting.Tests/HealthCheckTests.cs b/tests/Aspire.Hosting.Tests/HealthCheckTests.cs index d35fe851aa5..953470f2ed5 100644 --- a/tests/Aspire.Hosting.Tests/HealthCheckTests.cs +++ b/tests/Aspire.Hosting.Tests/HealthCheckTests.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/InteractionServiceTests.cs b/tests/Aspire.Hosting.Tests/InteractionServiceTests.cs index a13545267a4..80e407901f0 100644 --- a/tests/Aspire.Hosting.Tests/InteractionServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/InteractionServiceTests.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/KestrelConfigTests.cs b/tests/Aspire.Hosting.Tests/KestrelConfigTests.cs index 5419dd6e0bb..ef25c5683a7 100644 --- a/tests/Aspire.Hosting.Tests/KestrelConfigTests.cs +++ b/tests/Aspire.Hosting.Tests/KestrelConfigTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/LaunchSettingsSerializerContextTests.cs b/tests/Aspire.Hosting.Tests/LaunchSettingsSerializerContextTests.cs index 77bde83e15e..6d23cc87065 100644 --- a/tests/Aspire.Hosting.Tests/LaunchSettingsSerializerContextTests.cs +++ b/tests/Aspire.Hosting.Tests/LaunchSettingsSerializerContextTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Text.Json; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/MSBuildTests.cs b/tests/Aspire.Hosting.Tests/MSBuildTests.cs index 1db4e9347eb..c1501234b68 100644 --- a/tests/Aspire.Hosting.Tests/MSBuildTests.cs +++ b/tests/Aspire.Hosting.Tests/MSBuildTests.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.Text; -using Xunit; namespace Aspire.Hosting.Tests; @@ -13,94 +12,212 @@ public class MSBuildTests /// Tests that when an AppHost has a ProjectReference to a library project, a warning is emitted. /// [Fact] - [ActiveIssue("https://github.com/dotnet/aspire/issues/8467")] public void EnsureWarningsAreEmittedWhenProjectReferencingLibraries() { var repoRoot = MSBuildUtils.GetRepoRoot(); using var tempDirectory = new TempDirectory(); - var libraryDirectory = Path.Combine(tempDirectory.Path, "Library"); - Directory.CreateDirectory(libraryDirectory); + CreateLibraryProject(tempDirectory.Path, "Library"); - File.WriteAllText(Path.Combine(libraryDirectory, "Library.csproj"), """ - + var appHostDirectory = Path.Combine(tempDirectory.Path, "AppHost"); + Directory.CreateDirectory(appHostDirectory); - - net8.0 - enable - enable - + File.WriteAllText(Path.Combine(appHostDirectory, "AppHost.csproj"), + $""" + - -"""); - File.WriteAllText(Path.Combine(libraryDirectory, "Class1.cs"), """ -namespace Library; + + Exe + net8.0 + enable + enable + true -public class Class1 -{ -} -"""); + + true + 9.0.0 + + + + + + + + + + """); + + File.WriteAllText(Path.Combine(appHostDirectory, "AppHost.cs"), + """ + var builder = DistributedApplication.CreateBuilder(); + builder.Build().Run(); + """); + + CreateDirectoryBuildFiles(appHostDirectory, repoRoot); + + var output = BuildProject(appHostDirectory); + + // Ensure a warning is emitted when an AppHost references a Library project + Assert.Contains("warning ASPIRE004", output); + } + + /// + /// Tests that the metadata sources are emitted correctly. + /// + [Fact] + public async Task ValidateMetadataSources() + { + var repoRoot = MSBuildUtils.GetRepoRoot(); + using var tempDirectory = new TempDirectory(); + + CreateAppProject(tempDirectory.Path, "App"); var appHostDirectory = Path.Combine(tempDirectory.Path, "AppHost"); Directory.CreateDirectory(appHostDirectory); - File.WriteAllText(Path.Combine(appHostDirectory, "AppHost.csproj"), $""" - - - - Exe - net8.0 - enable - enable - true - - - true - 9.0.0 - - - - - - - - - -"""); - File.WriteAllText(Path.Combine(appHostDirectory, "AppHost.cs"), """ -var builder = DistributedApplication.CreateBuilder(); -builder.Build().Run(); -"""); - - File.WriteAllText(Path.Combine(appHostDirectory, "Directory.Build.props"), $""" - - - true - - - - -"""); - File.WriteAllText(Path.Combine(appHostDirectory, "Directory.Build.targets"), $""" - - - - -"""); + File.WriteAllText(Path.Combine(appHostDirectory, "AppHost.csproj"), + $""" + + + + Exe + net8.0 + enable + enable + true + + + true + 9.0.0 + + + + + + + + + """); + File.WriteAllText(Path.Combine(appHostDirectory, "AppHost.cs"), + """ + var builder = DistributedApplication.CreateBuilder(); + builder.Build().Run(); + """); + + CreateDirectoryBuildFiles(appHostDirectory, repoRoot); + + var output = BuildProject(appHostDirectory); + + var metadataDirectory = Path.Combine(appHostDirectory, "obj", "Debug", "net8.0", "Aspire", "references"); + var appHostMetadata = await File.ReadAllTextAsync(Path.Combine(metadataDirectory, "_AppHost.ProjectMetadata.g.cs")); + var appMetadata = await File.ReadAllTextAsync(Path.Combine(metadataDirectory, "App.ProjectMetadata.g.cs")); + + await Verify(new + { + AppHost = appHostMetadata, + App = appMetadata + }).ScrubLinesWithReplace(line => + { + var temp = tempDirectory?.Path; + if (temp is not null) + { + line = line.Replace($"/private{temp}", "{AspirePath}") // Handle macOS temp symlinks + .Replace(temp, "{AspirePath}") + .Replace(Path.DirectorySeparatorChar, '/'); + } + return line; + }); + } + + private static void CreateDirectoryBuildFiles(string basePath, string repoRoot) + { + File.WriteAllText(Path.Combine(basePath, "Directory.Build.props"), + $""" + + + true + + + + + """); + File.WriteAllText(Path.Combine(basePath, "Directory.Build.targets"), + $""" + + + + + """); + } + + private static void CreateLibraryProject(string basePath, string name) + { + var libraryDirectory = Path.Combine(basePath, name); + Directory.CreateDirectory(libraryDirectory); + + File.WriteAllText(Path.Combine(libraryDirectory, $"{name}.csproj"), + """ + + + + net8.0 + enable + enable + + + + """); + File.WriteAllText(Path.Combine(libraryDirectory, "Class1.cs"), + """ + namespace Library; + + public class Class1 + { + } + """); + } + + private static void CreateAppProject(string basePath, string name) + { + var appDirectory = Path.Combine(basePath, name); + Directory.CreateDirectory(appDirectory); + + File.WriteAllText(Path.Combine(appDirectory, $"{name}.csproj"), + """ + + + net8.0 + enable + enable + + + """); + + File.WriteAllText(Path.Combine(appDirectory, "Program.cs"), + """ + Console.WriteLine("Hello, Aspire!"); + """); + } + + private static string BuildProject(string workingDirectory) + { var output = new StringBuilder(); var outputDone = new ManualResetEvent(false); using var process = new Process(); - // set '-nodereuse:false -p:UseSharedCompilation=false' so the MSBuild and Roslyn server processes don't hang around, which may hang the test in CI - process.StartInfo = new ProcessStartInfo("dotnet", $"build -nodereuse:false -p:UseSharedCompilation=false") + // set '--disable-build-servers' so the MSBuild and Roslyn server processes don't hang around, which may hang the test in CI + process.StartInfo = new ProcessStartInfo("dotnet", "build --disable-build-servers") { RedirectStandardOutput = true, UseShellExecute = false, CreateNoWindow = true, - WorkingDirectory = appHostDirectory + WorkingDirectory = workingDirectory }; process.OutputDataReceived += (sender, e) => { @@ -121,7 +238,6 @@ the Aspire.AppHost.SDK targets that will automatically add these references to p Assert.True(outputDone.WaitOne(millisecondsTimeout: 60_000), "Timed out waiting for output to complete."); - // Ensure a warning is emitted when an AppHost references a Library project - Assert.Contains("warning ASPIRE004", output.ToString()); + return output.ToString(); } } diff --git a/tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs b/tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs index 4ff93ca7c35..4bae74cdc64 100644 --- a/tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs +++ b/tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs @@ -10,7 +10,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ModelNameTests.cs b/tests/Aspire.Hosting.Tests/ModelNameTests.cs index 0d044f8fd9f..8ba321b9ea1 100644 --- a/tests/Aspire.Hosting.Tests/ModelNameTests.cs +++ b/tests/Aspire.Hosting.Tests/ModelNameTests.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - namespace Aspire.Hosting.Tests; public class ModelNameTests diff --git a/tests/Aspire.Hosting.Tests/OperationModesTests.cs b/tests/Aspire.Hosting.Tests/OperationModesTests.cs index 9d2baa60827..02de295229d 100644 --- a/tests/Aspire.Hosting.Tests/OperationModesTests.cs +++ b/tests/Aspire.Hosting.Tests/OperationModesTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; @@ -139,4 +138,4 @@ public void VerifyExplicitPublishModeInvocation() .WithTestAndResourceLogging(outputHelper); Assert.Equal(DistributedApplicationOperation.Publish, builder.ExecutionContext.Operation); } -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Tests/Orchestrator/ApplicationOrchestratorTests.cs b/tests/Aspire.Hosting.Tests/Orchestrator/ApplicationOrchestratorTests.cs index 2e2f4b7db0d..d3604e7d1e3 100644 --- a/tests/Aspire.Hosting.Tests/Orchestrator/ApplicationOrchestratorTests.cs +++ b/tests/Aspire.Hosting.Tests/Orchestrator/ApplicationOrchestratorTests.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Aspire.Hosting.Tests.Orchestrator; diff --git a/tests/Aspire.Hosting.Tests/Orchestrator/ParameterProcessorTests.cs b/tests/Aspire.Hosting.Tests/Orchestrator/ParameterProcessorTests.cs index 5fce7fe7275..f1446ba8533 100644 --- a/tests/Aspire.Hosting.Tests/Orchestrator/ParameterProcessorTests.cs +++ b/tests/Aspire.Hosting.Tests/Orchestrator/ParameterProcessorTests.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; #pragma warning disable ASPIREINTERACTION001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed. diff --git a/tests/Aspire.Hosting.Tests/Orchestrator/RelationshipEvaluatorTests.cs b/tests/Aspire.Hosting.Tests/Orchestrator/RelationshipEvaluatorTests.cs index b14844ab8f2..cbbd6a8d60a 100644 --- a/tests/Aspire.Hosting.Tests/Orchestrator/RelationshipEvaluatorTests.cs +++ b/tests/Aspire.Hosting.Tests/Orchestrator/RelationshipEvaluatorTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Orchestrator; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests.Orchestrator; diff --git a/tests/Aspire.Hosting.Tests/PortAllocatorTest.cs b/tests/Aspire.Hosting.Tests/PortAllocatorTest.cs index 902736731ae..8ff1e085879 100644 --- a/tests/Aspire.Hosting.Tests/PortAllocatorTest.cs +++ b/tests/Aspire.Hosting.Tests/PortAllocatorTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.Publishing; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ProjectResourceTests.cs b/tests/Aspire.Hosting.Tests/ProjectResourceTests.cs index 548803c0ea2..cfdcf9db5bf 100644 --- a/tests/Aspire.Hosting.Tests/ProjectResourceTests.cs +++ b/tests/Aspire.Hosting.Tests/ProjectResourceTests.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/PublishAsConnectionStringTests.cs b/tests/Aspire.Hosting.Tests/PublishAsConnectionStringTests.cs index 98a37a608fa..5994f42b260 100644 --- a/tests/Aspire.Hosting.Tests/PublishAsConnectionStringTests.cs +++ b/tests/Aspire.Hosting.Tests/PublishAsConnectionStringTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; diff --git a/tests/Aspire.Hosting.Tests/PublishAsDockerfileTests.cs b/tests/Aspire.Hosting.Tests/PublishAsDockerfileTests.cs index 94b52c966ee..9b76c6b38ef 100644 --- a/tests/Aspire.Hosting.Tests/PublishAsDockerfileTests.cs +++ b/tests/Aspire.Hosting.Tests/PublishAsDockerfileTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; diff --git a/tests/Aspire.Hosting.Tests/Publishing/PublishingActivityReporterTests.cs b/tests/Aspire.Hosting.Tests/Publishing/PublishingActivityReporterTests.cs index 100765adc14..09d07232908 100644 --- a/tests/Aspire.Hosting.Tests/Publishing/PublishingActivityReporterTests.cs +++ b/tests/Aspire.Hosting.Tests/Publishing/PublishingActivityReporterTests.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Hosting.Tests.Publishing; diff --git a/tests/Aspire.Hosting.Tests/Publishing/PublishingExtensionsTests.cs b/tests/Aspire.Hosting.Tests/Publishing/PublishingExtensionsTests.cs index f60a87d7ca9..66733630b19 100644 --- a/tests/Aspire.Hosting.Tests/Publishing/PublishingExtensionsTests.cs +++ b/tests/Aspire.Hosting.Tests/Publishing/PublishingExtensionsTests.cs @@ -4,7 +4,6 @@ #pragma warning disable ASPIREPUBLISHERS001 using Aspire.Hosting.Publishing; -using Xunit; namespace Aspire.Hosting.Tests.Publishing; diff --git a/tests/Aspire.Hosting.Tests/Publishing/ResourceContainerImageBuilderTests.cs b/tests/Aspire.Hosting.Tests/Publishing/ResourceContainerImageBuilderTests.cs index 9d0729f8d68..0d3c3423aec 100644 --- a/tests/Aspire.Hosting.Tests/Publishing/ResourceContainerImageBuilderTests.cs +++ b/tests/Aspire.Hosting.Tests/Publishing/ResourceContainerImageBuilderTests.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Hosting.Tests.Publishing; diff --git a/tests/Aspire.Hosting.Tests/PublishingTests.cs b/tests/Aspire.Hosting.Tests/PublishingTests.cs index c8e1c57abfa..2a5828ef8bd 100644 --- a/tests/Aspire.Hosting.Tests/PublishingTests.cs +++ b/tests/Aspire.Hosting.Tests/PublishingTests.cs @@ -7,7 +7,6 @@ using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ReferenceExpressionTests.cs b/tests/Aspire.Hosting.Tests/ReferenceExpressionTests.cs index 78d8a673451..bb9a58cfd37 100644 --- a/tests/Aspire.Hosting.Tests/ReferenceExpressionTests.cs +++ b/tests/Aspire.Hosting.Tests/ReferenceExpressionTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Globalization; -using Xunit; namespace Aspire.Hosting.Tests; public class ReferenceExpressionTests diff --git a/tests/Aspire.Hosting.Tests/ResourceCommandAnnotationTests.cs b/tests/Aspire.Hosting.Tests/ResourceCommandAnnotationTests.cs index 739cc6e6144..ed787a0de9f 100644 --- a/tests/Aspire.Hosting.Tests/ResourceCommandAnnotationTests.cs +++ b/tests/Aspire.Hosting.Tests/ResourceCommandAnnotationTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.Dashboard; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ResourceCommandServiceTests.cs b/tests/Aspire.Hosting.Tests/ResourceCommandServiceTests.cs index a57048bd01a..c97e0faae70 100644 --- a/tests/Aspire.Hosting.Tests/ResourceCommandServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/ResourceCommandServiceTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Utils; using Aspire.TestUtilities; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs b/tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs index 9fac71a9957..73b0e946cb9 100644 --- a/tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs +++ b/tests/Aspire.Hosting.Tests/ResourceExtensionsTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ResourceLoggerServiceTests.cs b/tests/Aspire.Hosting.Tests/ResourceLoggerServiceTests.cs index 9909f2e3dec..702ddb703da 100644 --- a/tests/Aspire.Hosting.Tests/ResourceLoggerServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/ResourceLoggerServiceTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/ResourceNotificationTests.cs b/tests/Aspire.Hosting.Tests/ResourceNotificationTests.cs index a08d8470982..311a8ae813e 100644 --- a/tests/Aspire.Hosting.Tests/ResourceNotificationTests.cs +++ b/tests/Aspire.Hosting.Tests/ResourceNotificationTests.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs b/tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs index 862b017e328..c88d8c20db0 100644 --- a/tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs +++ b/tests/Aspire.Hosting.Tests/Schema/SchemaTests.cs @@ -8,7 +8,6 @@ using Azure.Provisioning.KeyVault; using Json.Schema; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests.Schema; diff --git a/tests/Aspire.Hosting.Tests/SecretsStoreTests.cs b/tests/Aspire.Hosting.Tests/SecretsStoreTests.cs index 0762741ce70..122bc3e3e9e 100644 --- a/tests/Aspire.Hosting.Tests/SecretsStoreTests.cs +++ b/tests/Aspire.Hosting.Tests/SecretsStoreTests.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.UserSecrets; using Microsoft.Extensions.SecretManager.Tools.Internal; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/SlimTestProgramTests.cs b/tests/Aspire.Hosting.Tests/SlimTestProgramTests.cs index f01146dec71..ab3dd81ccc1 100644 --- a/tests/Aspire.Hosting.Tests/SlimTestProgramTests.cs +++ b/tests/Aspire.Hosting.Tests/SlimTestProgramTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Testing.Tests; using Aspire.TestUtilities; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/Snapshots/MSBuildTests.ValidateMetadataSources.verified.txt b/tests/Aspire.Hosting.Tests/Snapshots/MSBuildTests.ValidateMetadataSources.verified.txt new file mode 100644 index 00000000000..cdfb7f50917 --- /dev/null +++ b/tests/Aspire.Hosting.Tests/Snapshots/MSBuildTests.ValidateMetadataSources.verified.txt @@ -0,0 +1,46 @@ +{ + AppHost: +// + +namespace Projects; + +#pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language. +/// +/// Metadata for the Aspire Host project. +/// +[global::System.CodeDom.Compiler.GeneratedCode("Aspire.Hosting", null)] +[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage(Justification = "Generated code.")] +[global::System.Diagnostics.DebuggerDisplay("Type = {GetType().Name,nq}, ProjectPath = {ProjectPath}")] +public class AppHost +#pragma warning restore CS8981 +{ + private AppHost() { } + + /// + /// The path to the Aspire Host project. + /// + public static string ProjectPath => """{AspirePath}/AppHost"""; +} +, + App: +// + +namespace Projects; + +#pragma warning disable CS8981 // The type name only contains lower-cased ascii characters. Such names may become reserved for the language. +/// +/// Metadata for the App project. +/// +[global::System.CodeDom.Compiler.GeneratedCode("Aspire.Hosting", null)] +[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage(Justification = "Generated code.")] +[global::System.Diagnostics.DebuggerDisplay("Type = {GetType().Name,nq}, ProjectPath = {ProjectPath}")] +public class App : global::Aspire.Hosting.IProjectMetadata +#pragma warning restore CS8981 +{ + /// + /// The path to the App project. + /// + public string ProjectPath => """{AspirePath}/App/App.csproj"""; +} + +} \ No newline at end of file diff --git a/tests/Aspire.Hosting.Tests/StableConnectionStringBuilderTests.cs b/tests/Aspire.Hosting.Tests/StableConnectionStringBuilderTests.cs index 4407b559343..edce6a4d610 100644 --- a/tests/Aspire.Hosting.Tests/StableConnectionStringBuilderTests.cs +++ b/tests/Aspire.Hosting.Tests/StableConnectionStringBuilderTests.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - namespace Aspire.Hosting.Tests; public class StableConnectionStringBuilderTests diff --git a/tests/Aspire.Hosting.Tests/TestProgramFixture.cs b/tests/Aspire.Hosting.Tests/TestProgramFixture.cs index a2c48fc19a2..bfae2d50424 100644 --- a/tests/Aspire.Hosting.Tests/TestProgramFixture.cs +++ b/tests/Aspire.Hosting.Tests/TestProgramFixture.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Testing.Tests; using Aspire.Hosting.Tests.Utils; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/UserSecretsParameterDefaultTests.cs b/tests/Aspire.Hosting.Tests/UserSecretsParameterDefaultTests.cs index 01c585d6204..d9d3f5d9723 100644 --- a/tests/Aspire.Hosting.Tests/UserSecretsParameterDefaultTests.cs +++ b/tests/Aspire.Hosting.Tests/UserSecretsParameterDefaultTests.cs @@ -7,7 +7,6 @@ using Aspire.Hosting.Publishing; using Microsoft.Extensions.Configuration.UserSecrets; using Microsoft.Extensions.SecretManager.Tools.Internal; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/Utils/CommandLineArgsParserTests.cs b/tests/Aspire.Hosting.Tests/Utils/CommandLineArgsParserTests.cs index 56cd3c356ce..f6258a2cdb4 100644 --- a/tests/Aspire.Hosting.Tests/Utils/CommandLineArgsParserTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/CommandLineArgsParserTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; using static Aspire.Hosting.Utils.CommandLineArgsParser; namespace Aspire.Hosting.Tests.Utils; diff --git a/tests/Aspire.Hosting.Tests/Utils/ContainerReferenceParserTests.cs b/tests/Aspire.Hosting.Tests/Utils/ContainerReferenceParserTests.cs index fd265c22c64..ceb9846dc7a 100644 --- a/tests/Aspire.Hosting.Tests/Utils/ContainerReferenceParserTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/ContainerReferenceParserTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Tests.Utils; @@ -104,4 +103,4 @@ private static void ParserTest(string input, string? expectedRegistry, string ex } -} \ No newline at end of file +} diff --git a/tests/Aspire.Hosting.Tests/Utils/ManifestUtils.cs b/tests/Aspire.Hosting.Tests/Utils/ManifestUtils.cs index c08a243f0df..534c4c53d58 100644 --- a/tests/Aspire.Hosting.Tests/Utils/ManifestUtils.cs +++ b/tests/Aspire.Hosting.Tests/Utils/ManifestUtils.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Publishing; using System.Text.Json.Nodes; using System.Text.Json; -using Xunit; namespace Aspire.Hosting.Utils; diff --git a/tests/Aspire.Hosting.Tests/Utils/PasswordGeneratorTests.cs b/tests/Aspire.Hosting.Tests/Utils/PasswordGeneratorTests.cs index c37d873350e..12951b6ebc1 100644 --- a/tests/Aspire.Hosting.Tests/Utils/PasswordGeneratorTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/PasswordGeneratorTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; using static Aspire.Hosting.Utils.PasswordGenerator; namespace Aspire.Hosting.Tests.Utils; diff --git a/tests/Aspire.Hosting.Tests/Utils/PeriodicRestartAsyncEnumerableTests.cs b/tests/Aspire.Hosting.Tests/Utils/PeriodicRestartAsyncEnumerableTests.cs index ecd465f1309..66507b55ba7 100644 --- a/tests/Aspire.Hosting.Tests/Utils/PeriodicRestartAsyncEnumerableTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/PeriodicRestartAsyncEnumerableTests.cs @@ -3,7 +3,6 @@ using System.Runtime.CompilerServices; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Tests.Utils; diff --git a/tests/Aspire.Hosting.Tests/Utils/StringComparersTests.cs b/tests/Aspire.Hosting.Tests/Utils/StringComparersTests.cs index e436af03f11..186bbda119d 100644 --- a/tests/Aspire.Hosting.Tests/Utils/StringComparersTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/StringComparersTests.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; using System.Reflection; using System.Globalization; diff --git a/tests/Aspire.Hosting.Tests/Utils/TestDistributedApplicationBuilder.cs b/tests/Aspire.Hosting.Tests/Utils/TestDistributedApplicationBuilder.cs index e5691240766..a0ceee01593 100644 --- a/tests/Aspire.Hosting.Tests/Utils/TestDistributedApplicationBuilder.cs +++ b/tests/Aspire.Hosting.Tests/Utils/TestDistributedApplicationBuilder.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Testing; using Aspire.Hosting.Tests.Dcp; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Utils; diff --git a/tests/Aspire.Hosting.Tests/Utils/UseCultureAttributeTests.cs b/tests/Aspire.Hosting.Tests/Utils/UseCultureAttributeTests.cs index d6712eb1141..816dbb01f36 100644 --- a/tests/Aspire.Hosting.Tests/Utils/UseCultureAttributeTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/UseCultureAttributeTests.cs @@ -5,7 +5,6 @@ // Licensed under http://www.apache.org/licenses/LICENSE-2.0. using System.Globalization; -using Xunit; namespace Aspire.TestUtilities.Tests; diff --git a/tests/Aspire.Hosting.Tests/Utils/VolumeNameGeneratorTests.cs b/tests/Aspire.Hosting.Tests/Utils/VolumeNameGeneratorTests.cs index 4d73b79a9f9..144fbfa15c0 100644 --- a/tests/Aspire.Hosting.Tests/Utils/VolumeNameGeneratorTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/VolumeNameGeneratorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using static Aspire.Hosting.VolumeNameGenerator; -using Xunit; using Aspire.Hosting.Utils; namespace Aspire.Hosting.Tests.Utils; diff --git a/tests/Aspire.Hosting.Tests/Utils/WithAnnotationTests.cs b/tests/Aspire.Hosting.Tests/Utils/WithAnnotationTests.cs index f185f39135a..5c4978ce470 100644 --- a/tests/Aspire.Hosting.Tests/Utils/WithAnnotationTests.cs +++ b/tests/Aspire.Hosting.Tests/Utils/WithAnnotationTests.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - namespace Aspire.Hosting.Tests.Utils; public class WithAnnotationTests diff --git a/tests/Aspire.Hosting.Tests/VersionChecking/PackageUpdateHelpersTests.cs b/tests/Aspire.Hosting.Tests/VersionChecking/PackageUpdateHelpersTests.cs index 383a8327d31..fe0af58a043 100644 --- a/tests/Aspire.Hosting.Tests/VersionChecking/PackageUpdateHelpersTests.cs +++ b/tests/Aspire.Hosting.Tests/VersionChecking/PackageUpdateHelpersTests.cs @@ -3,7 +3,6 @@ using Aspire.Shared; using Semver; -using Xunit; namespace Aspire.Hosting.Tests.VersionChecking; diff --git a/tests/Aspire.Hosting.Tests/VersionChecking/VersionCheckServiceTests.cs b/tests/Aspire.Hosting.Tests/VersionChecking/VersionCheckServiceTests.cs index 66698f662ed..cc93e2ddb52 100644 --- a/tests/Aspire.Hosting.Tests/VersionChecking/VersionCheckServiceTests.cs +++ b/tests/Aspire.Hosting.Tests/VersionChecking/VersionCheckServiceTests.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Aspire.Hosting.Tests.VersionChecking; diff --git a/tests/Aspire.Hosting.Tests/WaitForTests.cs b/tests/Aspire.Hosting.Tests/WaitForTests.cs index aa15a07ef17..047aff93582 100644 --- a/tests/Aspire.Hosting.Tests/WaitForTests.cs +++ b/tests/Aspire.Hosting.Tests/WaitForTests.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/WithEndpointTests.cs b/tests/Aspire.Hosting.Tests/WithEndpointTests.cs index 32c25dc9fd1..8c5cfdfa3e7 100644 --- a/tests/Aspire.Hosting.Tests/WithEndpointTests.cs +++ b/tests/Aspire.Hosting.Tests/WithEndpointTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/WithEnvironmentTests.cs b/tests/Aspire.Hosting.Tests/WithEnvironmentTests.cs index 00ed812bb34..726c5ff1056 100644 --- a/tests/Aspire.Hosting.Tests/WithEnvironmentTests.cs +++ b/tests/Aspire.Hosting.Tests/WithEnvironmentTests.cs @@ -5,7 +5,6 @@ using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/WithHttpCommandTests.cs b/tests/Aspire.Hosting.Tests/WithHttpCommandTests.cs index 2fddee21110..bf5a57aaa5c 100644 --- a/tests/Aspire.Hosting.Tests/WithHttpCommandTests.cs +++ b/tests/Aspire.Hosting.Tests/WithHttpCommandTests.cs @@ -5,7 +5,6 @@ using Aspire.TestUtilities; using Microsoft.AspNetCore.InternalTesting; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/WithReferenceTests.cs b/tests/Aspire.Hosting.Tests/WithReferenceTests.cs index 9d24cd3f647..1204d57cbd5 100644 --- a/tests/Aspire.Hosting.Tests/WithReferenceTests.cs +++ b/tests/Aspire.Hosting.Tests/WithReferenceTests.cs @@ -4,7 +4,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.AspNetCore.InternalTesting; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/WithUrlsTests.cs b/tests/Aspire.Hosting.Tests/WithUrlsTests.cs index 932d0a4464d..ed68fb067fa 100644 --- a/tests/Aspire.Hosting.Tests/WithUrlsTests.cs +++ b/tests/Aspire.Hosting.Tests/WithUrlsTests.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Aspire.Hosting.Tests; diff --git a/tests/Aspire.Hosting.Tests/XunitAttributes.cs b/tests/Aspire.Hosting.Tests/XunitAttributes.cs index cc0c22363d4..0ad1c5168a5 100644 --- a/tests/Aspire.Hosting.Tests/XunitAttributes.cs +++ b/tests/Aspire.Hosting.Tests/XunitAttributes.cs @@ -1,6 +1,4 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Xunit; - [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)] diff --git a/tests/Aspire.Hosting.Valkey.Tests/AddValkeyTests.cs b/tests/Aspire.Hosting.Valkey.Tests/AddValkeyTests.cs index 1d3e70cc9d9..18281f41d9c 100644 --- a/tests/Aspire.Hosting.Valkey.Tests/AddValkeyTests.cs +++ b/tests/Aspire.Hosting.Valkey.Tests/AddValkeyTests.cs @@ -6,7 +6,6 @@ using Aspire.Hosting.Tests.Utils; using Aspire.Hosting.Utils; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Aspire.Hosting.Valkey.Tests; diff --git a/tests/Aspire.Hosting.Valkey.Tests/ValkeyFunctionalTests.cs b/tests/Aspire.Hosting.Valkey.Tests/ValkeyFunctionalTests.cs index 8b9154ac581..c4cc1eb11c6 100644 --- a/tests/Aspire.Hosting.Valkey.Tests/ValkeyFunctionalTests.cs +++ b/tests/Aspire.Hosting.Valkey.Tests/ValkeyFunctionalTests.cs @@ -11,7 +11,6 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Hosting; using StackExchange.Redis; -using Xunit; namespace Aspire.Hosting.Valkey.Tests; diff --git a/tests/Aspire.Hosting.Valkey.Tests/ValkeyPublicApiTests.cs b/tests/Aspire.Hosting.Valkey.Tests/ValkeyPublicApiTests.cs index bb3966eb688..4e539dfad5f 100644 --- a/tests/Aspire.Hosting.Valkey.Tests/ValkeyPublicApiTests.cs +++ b/tests/Aspire.Hosting.Valkey.Tests/ValkeyPublicApiTests.cs @@ -3,7 +3,6 @@ using Aspire.Hosting.ApplicationModel; using Aspire.Hosting.Utils; -using Xunit; namespace Aspire.Hosting.Valkey.Tests;