From 4e9036e36fd43764d8955cf801ba29b2ab4fb746 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:00:55 +0000 Subject: [PATCH 01/27] Initial plan From 7236d3812934756d0efa87222e7a8e2b8f1a2801 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:12:04 +0000 Subject: [PATCH 02/27] Add .NET 10 (preview) as a TFM for multi-targeting builds Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> --- Directory.Build.props | 2 +- Directory.Packages.props | 4 ++++ ...CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj | 2 +- ...ommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 974adbf17..57f2c17f9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ net8.0 $(DefaultTargetFramework) - $(DefaultTargetFramework);net9.0 + $(DefaultTargetFramework);net9.0;net10.0 latest enable diff --git a/Directory.Packages.props b/Directory.Packages.props index 763e8b6c2..d2352dfa6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -117,4 +117,8 @@ + + + + \ No newline at end of file diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj index 07512d831..52ffde0ba 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj b/src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj index 4d6914c83..e4cccaf2e 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.csproj @@ -20,7 +20,7 @@ - + From 303a76f7145656d12117ce9edf459fa4a07616c1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:27:27 +0000 Subject: [PATCH 03/27] Change default TFM to .NET 10 and update GitHub Actions to install .NET 10 Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> --- .github/workflows/codeql.yml | 1 + .github/workflows/dotnet-main.yml | 2 +- .github/workflows/dotnet-release.yml | 2 +- .github/workflows/generate-api-diffs.yml | 3 ++- .github/workflows/package.yml | 1 + Directory.Build.props | 4 ++-- global.json | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fee7c86ce..ab79da1cf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -69,6 +69,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v4 diff --git a/.github/workflows/dotnet-main.yml b/.github/workflows/dotnet-main.yml index 7339a0d28..8fc4c9dce 100644 --- a/.github/workflows/dotnet-main.yml +++ b/.github/workflows/dotnet-main.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: env: - DEFAULT_DOTNET_VERSION: "8.0.x" + DEFAULT_DOTNET_VERSION: "10.0.x" permissions: contents: read diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml index 2f149c0d8..1f2ec0c5c 100644 --- a/.github/workflows/dotnet-release.yml +++ b/.github/workflows/dotnet-release.yml @@ -6,7 +6,7 @@ on: - "v*" env: - DEFAULT_DOTNET_VERSION: "8.0.x" + DEFAULT_DOTNET_VERSION: "10.0.x" jobs: build: diff --git a/.github/workflows/generate-api-diffs.yml b/.github/workflows/generate-api-diffs.yml index 8a165d0aa..47d18e868 100644 --- a/.github/workflows/generate-api-diffs.yml +++ b/.github/workflows/generate-api-diffs.yml @@ -21,12 +21,13 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Restore and build run: | find src -type f -name "*.csproj" | while read -r csproj; do - dotnet build "$csproj" -f net8.0 --configuration Release --no-incremental -t:Build -t:GenAPIGenerateReferenceAssemblySource + dotnet build "$csproj" -f net10.0 --configuration Release --no-incremental -t:Build -t:GenAPIGenerateReferenceAssemblySource done continue-on-error: true diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 44ab545f8..3bdf02475 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -24,6 +24,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Get git tag id: git_tag diff --git a/Directory.Build.props b/Directory.Build.props index 57f2c17f9..6844bf2a9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,9 +3,9 @@ - net8.0 + net10.0 $(DefaultTargetFramework) - $(DefaultTargetFramework);net9.0;net10.0 + $(DefaultTargetFramework);net8.0;net9.0 latest enable diff --git a/global.json b/global.json index a8ab760dd..20dc84cd1 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "allowPrerelease": false + "allowPrerelease": true } } \ No newline at end of file From c6b19fca7818f9a66b6fc3548093650e864e981f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:42:38 +0000 Subject: [PATCH 04/27] Update devcontainer to install .NET 10 as preview Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> --- .devcontainer/devcontainer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cc803f382..388762fb9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,8 +4,9 @@ "features": { "ghcr.io/azure/azure-dev/azd:latest": {}, "ghcr.io/devcontainers/features/dotnet:latest": { - "version": "8.0", - "additionalVersions": "9.0" + "version": "10.0", + "additionalVersions": "8.0,9.0", + "installUsingApt": false }, "ghcr.io/devcontainers/features/github-cli:latest": {}, "ghcr.io/devcontainers/features/java:1": { From 1e4e20dcdaf9d68c95863303aabd5b21edc89095 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 6 Nov 2025 05:56:31 +0000 Subject: [PATCH 05/27] Add .NET 10 to setup-runtimes-caching action Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com> --- .github/actions/setup-runtimes-caching/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup-runtimes-caching/action.yml b/.github/actions/setup-runtimes-caching/action.yml index a92919c74..31fe1a33b 100644 --- a/.github/actions/setup-runtimes-caching/action.yml +++ b/.github/actions/setup-runtimes-caching/action.yml @@ -22,6 +22,7 @@ runs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Set up Python uses: actions/setup-python@v5 From ac50650b3271e0a07e526b104d4301b75daf37f6 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Thu, 6 Nov 2025 22:55:05 +0000 Subject: [PATCH 06/27] Fixing some versioning --- Directory.Build.props | 2 +- Directory.Packages.props | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 6844bf2a9..42e996108 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,7 @@ $(AspireVersion) preview.1.25522.3 9.0.0 - 9.0.10 + 10.0.0-rc.2.25502.107 1.12.0 4.7.0 9.9.0 diff --git a/Directory.Packages.props b/Directory.Packages.props index d2352dfa6..ce41a4a4a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -44,11 +44,12 @@ - + + @@ -73,6 +74,7 @@ + @@ -113,12 +115,4 @@ - - - - - - - - \ No newline at end of file From 94417949dc1a8d84a1083b196175fd1a0d84c2e1 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Thu, 6 Nov 2025 22:55:56 +0000 Subject: [PATCH 07/27] Hard coding an update to use Apache.NMS.AMQP@2.4.0 as 2.2.0 has a CVE but the MassTransit.ActiveMQ package isn't updated yet Tracked: https://github.com/MassTransit/MassTransit/issues/6133 --- ...ommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj | 1 + .../CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj b/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj index 815a154dc..a611be36d 100644 --- a/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj +++ b/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj @@ -9,6 +9,7 @@ + diff --git a/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj index e7c0115f7..a76ecb91d 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj @@ -12,4 +12,8 @@ + + + + From ef89379b33b8519480fcb6293f83dfc6c7b8f6e7 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Thu, 6 Nov 2025 23:54:58 +0000 Subject: [PATCH 08/27] Fixing some projects that specified their own TFM and trying to address ambiguous referencing --- Directory.Packages.props | 7 +++++++ ...Toolkit.Aspire.MassTransit.RabbitMQ.MessageTypes.csproj | 3 --- ...ityToolkit.Aspire.MassTransit.RabbitMQ.Publisher.csproj | 3 --- .../CommunityToolkit.Aspire.PowerShell.AppHost.csproj | 3 --- .../CommunityToolkit.Aspire.Hosting.KurrentDB.csproj | 7 +++++++ tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ce41a4a4a..7f6ab35c8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -115,4 +115,11 @@ + + + + all + + + \ No newline at end of file diff --git a/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes.csproj b/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes.csproj index abae6f43d..78b3f4709 100644 --- a/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes.csproj +++ b/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes/CommunityToolkit.Aspire.MassTransit.RabbitMQ.MessageTypes.csproj @@ -1,9 +1,6 @@  - net8.0 - enable - enable Messaging diff --git a/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher.csproj b/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher.csproj index 047ceb190..1eaa00f58 100644 --- a/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher.csproj +++ b/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher/CommunityToolkit.Aspire.MassTransit.RabbitMQ.Publisher.csproj @@ -2,9 +2,6 @@ Exe - net8.0 - enable - enable diff --git a/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj b/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj index 63aed919d..780f57a93 100644 --- a/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj +++ b/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj @@ -4,9 +4,6 @@ Exe - net8.0 - enable - enable true bc193f31-c9f7-4e3d-b70a-0dc39ec3047f diff --git a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj index 4480a050d..24cd4a68b 100644 --- a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj @@ -14,4 +14,11 @@ + + + all + + + + diff --git a/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj b/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj index a690e00c6..ca4a2b973 100644 --- a/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj +++ b/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj @@ -3,7 +3,7 @@ Exe - net8.0 + net10.0 enable enable true From e66de71765399293f314db145b116f57e3d5f78f Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Fri, 7 Nov 2025 03:11:01 +0000 Subject: [PATCH 09/27] Using an improved approach approach to adding system.linq.asyncenumerable --- Directory.Packages.props | 6 ++---- .../CommunityToolkit.Aspire.Hosting.KurrentDB.csproj | 4 ++-- .../CommunityToolkit.Aspire.KurrentDB.csproj | 6 ++++++ .../CommunityToolkit.Aspire.KurrentDB.Tests.csproj | 7 +++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7f6ab35c8..92765cc7c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -116,10 +116,8 @@ - - - all - + + \ No newline at end of file diff --git a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj index 24cd4a68b..2d0d68eb5 100644 --- a/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.KurrentDB/CommunityToolkit.Aspire.Hosting.KurrentDB.csproj @@ -14,11 +14,11 @@ - + all - + diff --git a/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj b/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj index 886e876f5..c9164e06f 100644 --- a/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj +++ b/src/CommunityToolkit.Aspire.KurrentDB/CommunityToolkit.Aspire.KurrentDB.csproj @@ -16,4 +16,10 @@ + + + all + + + diff --git a/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj b/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj index fabc6da45..72ed754f7 100644 --- a/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.KurrentDB.Tests/CommunityToolkit.Aspire.KurrentDB.Tests.csproj @@ -9,4 +9,11 @@ + + + + all + + + From 51e57ba867ab691d3fda3f2997624bfc93264a16 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Mon, 10 Nov 2025 00:49:38 +0000 Subject: [PATCH 10/27] Updating how dev certs are setup --- .devcontainer/post-create.sh | 3 +-- .github/actions/setup-runtimes-caching/action.yml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index 6096ba239..dcd64df77 100755 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -5,8 +5,7 @@ sudo apt-get update && \ sudo rm -rf /var/lib/apt/lists/* echo Install .NET dev certs -dotnet tool update -g linux-dev-certs -dotnet linux-dev-certs install +dotnet dev-certs https --trust echo Install JS monorepo tools npm install -g turbo diff --git a/.github/actions/setup-runtimes-caching/action.yml b/.github/actions/setup-runtimes-caching/action.yml index 31fe1a33b..a4d38f6ef 100644 --- a/.github/actions/setup-runtimes-caching/action.yml +++ b/.github/actions/setup-runtimes-caching/action.yml @@ -85,8 +85,7 @@ runs: shell: bash if: ${{ matrix.os == 'ubuntu-latest' }} run: | - dotnet tool update -g linux-dev-certs - dotnet linux-dev-certs install + dotnet dev-certs https --trust - name: Setup Node globals shell: bash @@ -118,3 +117,4 @@ runs: run: | dapr init --runtime-version=${{ env.DAPR_VERSION }} dapr --version + From f3ff1ffb9e3ecb81c670ce8ec5d8a06b951f346f Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Mon, 10 Nov 2025 01:01:39 +0000 Subject: [PATCH 11/27] Turns out you can't upgrade around the CVE, so we now suppress it I feel dirty doing that... --- Directory.Build.props | 4 ++++ Directory.Packages.props | 1 - ...ommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj | 1 - .../CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj | 4 ---- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 42e996108..7d9be405f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -46,4 +46,8 @@ $(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion) + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props index 92765cc7c..30934a6be 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -74,7 +74,6 @@ - diff --git a/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj b/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj index a611be36d..815a154dc 100644 --- a/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj +++ b/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit/CommunityToolkit.Aspire.Hosting.ActiveMQ.MassTransit.csproj @@ -9,7 +9,6 @@ - diff --git a/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj index a76ecb91d..e7c0115f7 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests/CommunityToolkit.Aspire.Hosting.ActiveMQ.Tests.csproj @@ -12,8 +12,4 @@ - - - - From dc27f092977ed2392cdf4fdfa6abfc46cbf1e5f6 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 11 Nov 2025 00:50:09 +0000 Subject: [PATCH 12/27] skipping tests which would do nothing --- Directory.Build.props | 2 +- .../ConformanceTests.cs | 8 +++++--- tests/CommunityToolkit.Aspire.Testing/ConformanceTests.cs | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7d9be405f..6561505c7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -18,7 +18,7 @@ 9.0.0 10.0.0-rc.2.25502.107 1.12.0 - 4.7.0 + 4.8.1 9.9.0 10.0.0-preview.1.25520.3 false diff --git a/tests/CommunityToolkit.Aspire.SurrealDb.Tests/ConformanceTests.cs b/tests/CommunityToolkit.Aspire.SurrealDb.Tests/ConformanceTests.cs index c0d49f471..276b7359b 100644 --- a/tests/CommunityToolkit.Aspire.SurrealDb.Tests/ConformanceTests.cs +++ b/tests/CommunityToolkit.Aspire.SurrealDb.Tests/ConformanceTests.cs @@ -9,12 +9,12 @@ namespace CommunityToolkit.Aspire.SurrealDb.Tests; -public class ConformanceTests : - ConformanceTests, +public class ConformanceTests : + ConformanceTests, IClassFixture { private readonly SurrealDbContainerFixture _containerFixture; - + protected override ServiceLifetime ServiceLifetime => ServiceLifetime.Singleton; protected override string ActivitySourceName => string.Empty; @@ -25,6 +25,8 @@ public class ConformanceTests : protected override bool SupportsKeyedRegistrations => true; + protected override bool CanCreateClientWithoutConnectingToServer => false; + public ConformanceTests(SurrealDbContainerFixture containerFixture) { _containerFixture = containerFixture; diff --git a/tests/CommunityToolkit.Aspire.Testing/ConformanceTests.cs b/tests/CommunityToolkit.Aspire.Testing/ConformanceTests.cs index ec0c5ca6b..fb5f9e35d 100644 --- a/tests/CommunityToolkit.Aspire.Testing/ConformanceTests.cs +++ b/tests/CommunityToolkit.Aspire.Testing/ConformanceTests.cs @@ -259,6 +259,11 @@ public void LoggerFactoryIsUsedByRegisteredClient(bool registerAfterLoggerFactor SkipIfRequiredServerConnectionCanNotBeEstablished(); SkipIfKeyedRegistrationIsNotSupported(useKey); + if (RequiredLogCategories.Length == 0 && NotAcceptableLogCategories.Length == 0) + { + throw new SkipTestException("No log categories specified to test against."); + } + string? key = useKey ? "key" : null; HostApplicationBuilder builder = CreateHostBuilder(key: key); From 2dca5eba83df95e362604087aca40688a4669d42 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 11 Nov 2025 21:14:18 +0000 Subject: [PATCH 13/27] Some msbuild library updates --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 30934a6be..696c12741 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -79,8 +79,8 @@ - - + + From a705c4ddfeb1594427a8f9e17ac6b82ae3e113f0 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 11 Nov 2025 21:33:15 +0000 Subject: [PATCH 14/27] handling .net 8 down leveling of packages --- Directory.Packages.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7d8d03561..c25890659 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -119,4 +119,8 @@ + + + + \ No newline at end of file From 7172f3477460071850d35213c9f819cdad1b2f6f Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 11 Nov 2025 22:11:03 +0000 Subject: [PATCH 15/27] Removing .NET 10 support from sql database projects integration --- Directory.Packages.props | 6 +----- ...mmunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c25890659..7582ebc7a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -79,7 +79,7 @@ - + @@ -119,8 +119,4 @@ - - - - \ No newline at end of file diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj index 52ffde0ba..bb2fb844b 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj @@ -1,6 +1,7 @@  + net8.0;net9.0 An Aspire hosting integration capable of deploying SQL Server Database Projects as part of your AppHost. hosting sql sqlproj From d784f00cc969924bcfebc81be15f36240c993d89 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Tue, 11 Nov 2025 22:48:51 +0000 Subject: [PATCH 16/27] test and example projects set to net8.0 --- ...yToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj | 4 ++++ ...ityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj index 9c25b95b9..631e8f7b5 100644 --- a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj +++ b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj @@ -2,6 +2,10 @@ + + net8.0 + + Exe enable diff --git a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj index 02800ae53..8948bbf13 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj @@ -1,4 +1,8 @@ + + net8.0 + + From 3a3128deb51a4a211abb4dbe3b87ad9206613e78 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 12 Nov 2025 10:20:12 +1100 Subject: [PATCH 17/27] Setting target frameworks too --- ...tyToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj | 1 + examples/sql-database-projects/SdkProject/SdkProject.csproj | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj index 631e8f7b5..f566c8b5e 100644 --- a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj +++ b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj @@ -4,6 +4,7 @@ net8.0 + net8.0 diff --git a/examples/sql-database-projects/SdkProject/SdkProject.csproj b/examples/sql-database-projects/SdkProject/SdkProject.csproj index 9bd8dbf27..e706adb83 100644 --- a/examples/sql-database-projects/SdkProject/SdkProject.csproj +++ b/examples/sql-database-projects/SdkProject/SdkProject.csproj @@ -1,6 +1,7 @@ - $(DefaultTargetFramework) + net8.0 + net8.0 Sql150 True From 87c71c6a36d8ffcf881a1cc1ef6fe09ec52c6687 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 12 Nov 2025 04:05:35 +0000 Subject: [PATCH 18/27] Moving to the new sdk structure --- .devcontainer/devcontainer.json | 10 ++++++---- .devcontainer/post-create.sh | 14 ++------------ .../agents/hosting-integration-creator.agent.md | 8 +------- ...yToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj | 8 +------- ...tyToolkit.Aspire.Hosting.Adminer.AppHost.csproj | 7 +------ ...munityToolkit.Aspire.Hosting.Bun.AppHost.csproj | 8 +------- ...oolkit.Aspire.Hosting.Azure.Dapr.AppHost.csproj | 8 +------- ...unityToolkit.Aspire.Hosting.Dapr.AppHost.csproj | 5 +---- ...ire.Hosting.Azure.DataApiBuilder.AppHost.csproj | 4 +--- ...ityToolkit.Aspire.Hosting.DbGate.AppHost.csproj | 7 +------ ...unityToolkit.Aspire.Hosting.Deno.AppHost.csproj | 7 +------ ...nityToolkit.Aspire.Hosting.Flagd.AppHost.csproj | 5 +---- ...kit.Aspire.Hosting.GoFeatureFlag.AppHost.csproj | 7 +------ ...ityToolkit.Aspire.Hosting.Golang.AppHost.csproj | 7 +------ ...unityToolkit.Aspire.Hosting.Java.AppHost.csproj | 7 +------ ...re.Hosting.JavaScript.Extensions.AppHost.csproj | 7 +------ ...mmunityToolkit.Aspire.Hosting.k6.AppHost.csproj | 10 +--------- ...pire.Hosting.Keycloak.Extensions.AppHost.csproj | 2 -- ...Toolkit.Aspire.Hosting.KurrentDB.AppHost.csproj | 7 +------ ...tyToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj | 8 +------- ...tyToolkit.Aspire.Hosting.MailPit.AppHost.csproj | 8 +------- ...ire.Hosting.MassTransit.RabbitMQ.AppHost.csproj | 7 +------ ...lkit.Aspire.Hosting.McpInspector.AppHost.csproj | 8 +------- ...olkit.Aspire.Hosting.Meilisearch.AppHost.csproj | 7 +------ ...nityToolkit.Aspire.Hosting.Minio.AppHost.csproj | 10 +--------- ...spire.Hosting.MongoDB.Extensions.AppHost.csproj | 7 +------ ....Aspire.Hosting.MySql.Extensions.AppHost.csproj | 7 +------ ...nityToolkit.Aspire.Hosting.Ngrok.AppHost.csproj | 12 +----------- ...ityToolkit.Aspire.Hosting.Ollama.AppHost.csproj | 10 +--------- ...e.Hosting.OpenTelemetryCollector.AppHost.csproj | 8 +------- ...lkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj | 8 +------- ...re.Hosting.PostgreSQL.Extensions.AppHost.csproj | 7 +------ ...mmunityToolkit.Aspire.PowerShell.AppHost.csproj | 6 +----- ...Aspire.Hosting.Python.Extensions.AppHost.csproj | 3 +-- ...tyToolkit.Aspire.Hosting.RavenDB.AppHost.csproj | 7 +------ ....Aspire.Hosting.Redis.Extensions.AppHost.csproj | 7 +------ ...unityToolkit.Aspire.Hosting.Rust.AppHost.csproj | 7 +------ ...unityToolkit.Aspire.Hosting.Solr.AppHost.csproj | 7 +------ ...pire.Hosting.SqlDatabaseProjects.AppHost.csproj | 4 ---- .../CommunityToolkit.Aspire.Sqlite.AppHost.csproj | 8 +------- ...ire.Hosting.SqlServer.Extensions.AppHost.csproj | 7 +------ ...Toolkit.Aspire.Hosting.SurrealDb.AppHost.csproj | 10 +--------- .../Ollama.AppHost/Ollama.AppHost.csproj | 12 +----------- .../CommunityToolkit.Aspire.Testing.csproj | 3 +-- 44 files changed, 48 insertions(+), 278 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 388762fb9..f81350ce4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { - "name": ".NET Aspire Community Toolkit", - "image": "mcr.microsoft.com/devcontainers/dotnet:8.0-noble", + "name": "Aspire Community Toolkit", + "image": "mcr.microsoft.com/devcontainers/dotnet:10.0-noble", "features": { "ghcr.io/azure/azure-dev/azd:latest": {}, "ghcr.io/devcontainers/features/dotnet:latest": { @@ -14,13 +14,15 @@ "installMaven": true, "version": "21" }, - "ghcr.io/devcontainers/features/docker-in-docker": {}, + "ghcr.io/devcontainers/features/docker-in-docker:2": {}, "ghcr.io/devcontainers/features/node:latest": {}, "ghcr.io/devcontainers-community/features/deno": {}, "ghcr.io/devcontainers/features/go:latest": {}, "ghcr.io/devcontainers/features/rust:latest": {}, "ghcr.io/devcontainers/features/python:1": {}, - "ghcr.io/dapr/cli/dapr-cli:0": {} + "ghcr.io/dapr/cli/dapr-cli:0": { + "version": "1.16.3" + } }, "customizations": { "vscode": { diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh index dcd64df77..b880b6188 100755 --- a/.devcontainer/post-create.sh +++ b/.devcontainer/post-create.sh @@ -7,23 +7,13 @@ sudo apt-get update && \ echo Install .NET dev certs dotnet dev-certs https --trust -echo Install JS monorepo tools -npm install -g turbo -npm install -g nx - -echo Install Aspire 9 templates -dotnet new install Aspire.ProjectTemplates +echo Install Aspire +curl -sSL https://aspire.dev/install.sh | bash echo Installing Bun curl -fsSL https://bun.sh/install | bash -echo Installing uvicorn -pip install uvicorn - echo Setting up dapr dapr init -echo Installing uv -pip install uv - echo Done! diff --git a/.github/agents/hosting-integration-creator.agent.md b/.github/agents/hosting-integration-creator.agent.md index 3a262fcff..25c7f552a 100644 --- a/.github/agents/hosting-integration-creator.agent.md +++ b/.github/agents/hosting-integration-creator.agent.md @@ -238,9 +238,7 @@ Each hosting integration should have a corresponding sample application in the ` Here is an example of the `csproj` file for the AppHost project for the Bun hosting integration: ```xml - - - + Exe @@ -248,10 +246,6 @@ Here is an example of the `csproj` file for the AppHost project for the Bun host 7e518d7d-87e8-4337-8806-1c99acce5dfb - - - - diff --git a/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj b/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj index 51aa6fa60..1f0184a81 100644 --- a/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj +++ b/examples/activemq/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ cb846a57-bdaf-4abd-a7fb-0299aa095f5e - - - - diff --git a/examples/adminer/CommunityToolkit.Aspire.Hosting.Adminer.AppHost/CommunityToolkit.Aspire.Hosting.Adminer.AppHost.csproj b/examples/adminer/CommunityToolkit.Aspire.Hosting.Adminer.AppHost/CommunityToolkit.Aspire.Hosting.Adminer.AppHost.csproj index 3bfd8baf5..b3af2cb52 100644 --- a/examples/adminer/CommunityToolkit.Aspire.Hosting.Adminer.AppHost/CommunityToolkit.Aspire.Hosting.Adminer.AppHost.csproj +++ b/examples/adminer/CommunityToolkit.Aspire.Hosting.Adminer.AppHost/CommunityToolkit.Aspire.Hosting.Adminer.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/bun/CommunityToolkit.Aspire.Hosting.Bun.AppHost/CommunityToolkit.Aspire.Hosting.Bun.AppHost.csproj b/examples/bun/CommunityToolkit.Aspire.Hosting.Bun.AppHost/CommunityToolkit.Aspire.Hosting.Bun.AppHost.csproj index a5c004512..0d478dfe6 100644 --- a/examples/bun/CommunityToolkit.Aspire.Hosting.Bun.AppHost/CommunityToolkit.Aspire.Hosting.Bun.AppHost.csproj +++ b/examples/bun/CommunityToolkit.Aspire.Hosting.Bun.AppHost/CommunityToolkit.Aspire.Hosting.Bun.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ 7e518d7d-87e8-4337-8806-1c99acce5dfb - - - - diff --git a/examples/dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost.csproj b/examples/dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost.csproj index ae10f5818..19bb30956 100644 --- a/examples/dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost.csproj +++ b/examples/dapr/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Azure.Dapr.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ 068ca29f-dd8a-4898-9ba1-5839fd6a13db - - - - diff --git a/examples/dapr/CommunityToolkit.Aspire.Hosting.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Dapr.AppHost.csproj b/examples/dapr/CommunityToolkit.Aspire.Hosting.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Dapr.AppHost.csproj index ab1fe20be..4ed1f0b1b 100644 --- a/examples/dapr/CommunityToolkit.Aspire.Hosting.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Dapr.AppHost.csproj +++ b/examples/dapr/CommunityToolkit.Aspire.Hosting.Dapr.AppHost/CommunityToolkit.Aspire.Hosting.Dapr.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -15,7 +13,6 @@ - diff --git a/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj b/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj index eacccadf5..341c9da2b 100644 --- a/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj +++ b/examples/data-api-builder/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -10,7 +9,6 @@ - diff --git a/examples/dbgate/CommunityToolkit.Aspire.Hosting.DbGate.AppHost/CommunityToolkit.Aspire.Hosting.DbGate.AppHost.csproj b/examples/dbgate/CommunityToolkit.Aspire.Hosting.DbGate.AppHost/CommunityToolkit.Aspire.Hosting.DbGate.AppHost.csproj index e32acfbb6..b9ee73429 100644 --- a/examples/dbgate/CommunityToolkit.Aspire.Hosting.DbGate.AppHost/CommunityToolkit.Aspire.Hosting.DbGate.AppHost.csproj +++ b/examples/dbgate/CommunityToolkit.Aspire.Hosting.DbGate.AppHost/CommunityToolkit.Aspire.Hosting.DbGate.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/deno/CommunityToolkit.Aspire.Hosting.Deno.AppHost/CommunityToolkit.Aspire.Hosting.Deno.AppHost.csproj b/examples/deno/CommunityToolkit.Aspire.Hosting.Deno.AppHost/CommunityToolkit.Aspire.Hosting.Deno.AppHost.csproj index cf44940c4..dd73561b5 100644 --- a/examples/deno/CommunityToolkit.Aspire.Hosting.Deno.AppHost/CommunityToolkit.Aspire.Hosting.Deno.AppHost.csproj +++ b/examples/deno/CommunityToolkit.Aspire.Hosting.Deno.AppHost/CommunityToolkit.Aspire.Hosting.Deno.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ 68a53d20-c63f-4188-8bf5-5206263fa5c7 - - - - diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj index 81b0b3c88..7afdf7c8f 100644 --- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj +++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -11,7 +9,6 @@ - diff --git a/examples/goff/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost.csproj b/examples/goff/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost.csproj index cb322efb2..bf816ad77 100644 --- a/examples/goff/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost.csproj +++ b/examples/goff/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost/CommunityToolkit.Aspire.Hosting.GoFeatureFlag.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ 6f09f62a-98fa-44a3-a1ac-a3ae097e367f - - - - diff --git a/examples/golang/CommunityToolkit.Aspire.Hosting.Golang.AppHost/CommunityToolkit.Aspire.Hosting.Golang.AppHost.csproj b/examples/golang/CommunityToolkit.Aspire.Hosting.Golang.AppHost/CommunityToolkit.Aspire.Hosting.Golang.AppHost.csproj index 7d2f23d1d..69c3725e9 100644 --- a/examples/golang/CommunityToolkit.Aspire.Hosting.Golang.AppHost/CommunityToolkit.Aspire.Hosting.Golang.AppHost.csproj +++ b/examples/golang/CommunityToolkit.Aspire.Hosting.Golang.AppHost/CommunityToolkit.Aspire.Hosting.Golang.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ 5a6548a5-b5dd-40f0-876a-9e3d4ac91fd1 - - - - diff --git a/examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj b/examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj index 236c18400..05f20ef72 100644 --- a/examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj +++ b/examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/CommunityToolkit.Aspire.Hosting.Java.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -10,10 +9,6 @@ $(MSBuildProjectDirectory)/../CommunityToolkit.Aspire.Hosting.Java.Spring.Maven - - - - diff --git a/examples/javascript-ext/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost.csproj b/examples/javascript-ext/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost.csproj index c1e322369..f197475db 100644 --- a/examples/javascript-ext/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost.csproj +++ b/examples/javascript-ext/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ 125d4633-7e41-4639-b0ce-cfc16cd67e39 - - - - diff --git a/examples/k6/CommunityToolkit.Aspire.Hosting.k6.AppHost/CommunityToolkit.Aspire.Hosting.k6.AppHost.csproj b/examples/k6/CommunityToolkit.Aspire.Hosting.k6.AppHost/CommunityToolkit.Aspire.Hosting.k6.AppHost.csproj index af12cce8d..e7e812def 100644 --- a/examples/k6/CommunityToolkit.Aspire.Hosting.k6.AppHost/CommunityToolkit.Aspire.Hosting.k6.AppHost.csproj +++ b/examples/k6/CommunityToolkit.Aspire.Hosting.k6.AppHost/CommunityToolkit.Aspire.Hosting.k6.AppHost.csproj @@ -1,18 +1,10 @@ - - + Exe - enable - enable - true bdd580db-20ba-4a95-95a1-a8b4dbe0521d - - - - diff --git a/examples/keycloak-postgres/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost.csproj b/examples/keycloak-postgres/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost.csproj index 7ce993cb0..53bfce5cc 100644 --- a/examples/keycloak-postgres/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost.csproj +++ b/examples/keycloak-postgres/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Keycloak.Extensions.AppHost.csproj @@ -8,8 +8,6 @@ - - diff --git a/examples/kurrentdb/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost.csproj b/examples/kurrentdb/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost.csproj index f11be1abf..83cd4499d 100644 --- a/examples/kurrentdb/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost.csproj +++ b/examples/kurrentdb/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost/CommunityToolkit.Aspire.Hosting.KurrentDB.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ 9ea31b5e-317f-4692-8a61-e60ac7ec0d0a - - - - diff --git a/examples/lavinmq/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj b/examples/lavinmq/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj index 7028ee988..52f01f05b 100644 --- a/examples/lavinmq/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj +++ b/examples/lavinmq/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ cb846a57-bdaf-4abd-a7fb-0299aa095f5e - - - - diff --git a/examples/mailpit/CommunityToolkit.Aspire.Hosting.MailPit.AppHost/CommunityToolkit.Aspire.Hosting.MailPit.AppHost.csproj b/examples/mailpit/CommunityToolkit.Aspire.Hosting.MailPit.AppHost/CommunityToolkit.Aspire.Hosting.MailPit.AppHost.csproj index fae764f32..301c6ac3b 100644 --- a/examples/mailpit/CommunityToolkit.Aspire.Hosting.MailPit.AppHost/CommunityToolkit.Aspire.Hosting.MailPit.AppHost.csproj +++ b/examples/mailpit/CommunityToolkit.Aspire.Hosting.MailPit.AppHost/CommunityToolkit.Aspire.Hosting.MailPit.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ f60c6ce9-5628-467c-a6fc-2fc7938b39ad - - - - diff --git a/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost.csproj b/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost.csproj index f2d58409a..5032735d1 100644 --- a/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost.csproj +++ b/examples/masstransit-rabbitmq/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost/CommunityToolkit.Aspire.Hosting.MassTransit.RabbitMQ.AppHost.csproj @@ -1,16 +1,11 @@ - - + Exe - enable - enable - true c86b96db-58a9-47f7-b8a0-552da81efa9f - diff --git a/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost.csproj b/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost.csproj index a84a875d3..6730f895d 100644 --- a/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost.csproj +++ b/examples/mcp-inspector/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost/CommunityToolkit.Aspire.Hosting.McpInspector.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ 985811f2-fd0c-480a-885b-bc6cc0574b62 - - - - diff --git a/examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost.csproj b/examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost.csproj index 3017924f3..eee0322d4 100644 --- a/examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost.csproj +++ b/examples/meilisearch/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost/CommunityToolkit.Aspire.Hosting.Meilisearch.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ 6adfc361-47fd-4c05-88de-c95763714bb0 - - - - diff --git a/examples/minio/CommunityToolkit.Aspire.Hosting.Minio.AppHost/CommunityToolkit.Aspire.Hosting.Minio.AppHost.csproj b/examples/minio/CommunityToolkit.Aspire.Hosting.Minio.AppHost/CommunityToolkit.Aspire.Hosting.Minio.AppHost.csproj index 18cd3dcd5..333ccd6ce 100644 --- a/examples/minio/CommunityToolkit.Aspire.Hosting.Minio.AppHost/CommunityToolkit.Aspire.Hosting.Minio.AppHost.csproj +++ b/examples/minio/CommunityToolkit.Aspire.Hosting.Minio.AppHost/CommunityToolkit.Aspire.Hosting.Minio.AppHost.csproj @@ -1,18 +1,10 @@ - - + Exe - enable - enable - true bfe6b134-1a06-4449-a146-ba3cdb0d02a5 - - - - diff --git a/examples/mongodb-ext/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost.csproj b/examples/mongodb-ext/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost.csproj index a1ea1e7c3..5113f431c 100644 --- a/examples/mongodb-ext/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost.csproj +++ b/examples/mongodb-ext/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/mysql-ext/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost.csproj b/examples/mysql-ext/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost.csproj index c2d40df91..749f548a3 100644 --- a/examples/mysql-ext/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost.csproj +++ b/examples/mysql-ext/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.MySql.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost.csproj b/examples/ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost.csproj index f9412aed9..9adcf1039 100644 --- a/examples/ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost.csproj +++ b/examples/ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost.csproj @@ -1,19 +1,9 @@ - - - - + Exe - enable - enable - true dea39c19-075e-4a9d-aba2-ffd65de91136 - - - - diff --git a/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj b/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj index 3b2dc53c9..b5a0e3a01 100644 --- a/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj +++ b/examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj @@ -1,11 +1,7 @@ - - + Exe - enable - enable - true f39fb70f-21f3-4af9-89b4-3062ff4431e6 @@ -14,8 +10,4 @@ - - - - diff --git a/examples/opentelemetry-collector/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost.csproj b/examples/opentelemetry-collector/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost.csproj index 71d3ec06f..0d3f3001e 100644 --- a/examples/opentelemetry-collector/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost.csproj +++ b/examples/opentelemetry-collector/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -9,10 +7,6 @@ f0af42ab-ea83-435c-9273-89269ca78d75 - - - - diff --git a/examples/papercut/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj b/examples/papercut/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj index e93c78211..1eece1881 100644 --- a/examples/papercut/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj +++ b/examples/papercut/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -10,10 +8,6 @@ f60c6ce9-5628-467c-a6fc-2fc7938b38ad - - - - diff --git a/examples/postgres-ext/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost.csproj b/examples/postgres-ext/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost.csproj index e57270fdb..de20915dc 100644 --- a/examples/postgres-ext/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost.csproj +++ b/examples/postgres-ext/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.PostgreSQL.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj b/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj index 780f57a93..f53ca3b8b 100644 --- a/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj +++ b/examples/powershell/CommunityToolkit.Aspire.PowerShell.AppHost/CommunityToolkit.Aspire.PowerShell.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -9,8 +7,6 @@ - - diff --git a/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj b/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj index f1b8e1f79..8c8346855 100644 --- a/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj +++ b/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe diff --git a/examples/ravendb/RavenDB.AppHost/CommunityToolkit.Aspire.Hosting.RavenDB.AppHost.csproj b/examples/ravendb/RavenDB.AppHost/CommunityToolkit.Aspire.Hosting.RavenDB.AppHost.csproj index a24818921..1b43b6b77 100644 --- a/examples/ravendb/RavenDB.AppHost/CommunityToolkit.Aspire.Hosting.RavenDB.AppHost.csproj +++ b/examples/ravendb/RavenDB.AppHost/CommunityToolkit.Aspire.Hosting.RavenDB.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -15,8 +14,4 @@ - - - - \ No newline at end of file diff --git a/examples/redis-ext/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost.csproj b/examples/redis-ext/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost.csproj index 2bc0d5979..89a696e5a 100644 --- a/examples/redis-ext/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost.csproj +++ b/examples/redis-ext/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Redis.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/rust/CommunityToolkit.Aspire.Hosting.Rust.AppHost/CommunityToolkit.Aspire.Hosting.Rust.AppHost.csproj b/examples/rust/CommunityToolkit.Aspire.Hosting.Rust.AppHost/CommunityToolkit.Aspire.Hosting.Rust.AppHost.csproj index e449ea9ec..09c9d5361 100644 --- a/examples/rust/CommunityToolkit.Aspire.Hosting.Rust.AppHost/CommunityToolkit.Aspire.Hosting.Rust.AppHost.csproj +++ b/examples/rust/CommunityToolkit.Aspire.Hosting.Rust.AppHost/CommunityToolkit.Aspire.Hosting.Rust.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ ac9b4409-a7e7-465e-a16c-19293aaa12aa - - - - diff --git a/examples/solr/CommunityToolkit.Aspire.Hosting.Solr.AppHost.csproj b/examples/solr/CommunityToolkit.Aspire.Hosting.Solr.AppHost.csproj index 11dc8afdc..0ba15f77c 100644 --- a/examples/solr/CommunityToolkit.Aspire.Hosting.Solr.AppHost.csproj +++ b/examples/solr/CommunityToolkit.Aspire.Hosting.Solr.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -9,10 +8,6 @@ bfe6b134-1a06-4449-a146-ba3cdb0d02a6 - - - - diff --git a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj index f566c8b5e..87e48c51a 100644 --- a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj +++ b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj @@ -9,14 +9,10 @@ Exe - enable - enable - true e290de9f-eab3-428b-bd01-f53b072f8406 - diff --git a/examples/sqlite/CommunityToolkit.Aspire.Sqlite.AppHost/CommunityToolkit.Aspire.Sqlite.AppHost.csproj b/examples/sqlite/CommunityToolkit.Aspire.Sqlite.AppHost/CommunityToolkit.Aspire.Sqlite.AppHost.csproj index e745ff835..f0699ea12 100644 --- a/examples/sqlite/CommunityToolkit.Aspire.Sqlite.AppHost/CommunityToolkit.Aspire.Sqlite.AppHost.csproj +++ b/examples/sqlite/CommunityToolkit.Aspire.Sqlite.AppHost/CommunityToolkit.Aspire.Sqlite.AppHost.csproj @@ -1,6 +1,4 @@ - - - + Exe @@ -8,10 +6,6 @@ a3170cd5-07ea-49f0-a9c1-de86fce2d32f - - - - diff --git a/examples/sqlserver-ext/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost.csproj b/examples/sqlserver-ext/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost.csproj index b29c8e7c2..a3f6701dc 100644 --- a/examples/sqlserver-ext/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost.csproj +++ b/examples/sqlserver-ext/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.AppHost.csproj @@ -1,5 +1,4 @@ - - + Exe @@ -8,10 +7,6 @@ true - - - - diff --git a/examples/surrealdb/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost.csproj b/examples/surrealdb/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost.csproj index 009a61e32..80fd00616 100644 --- a/examples/surrealdb/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost.csproj +++ b/examples/surrealdb/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost/CommunityToolkit.Aspire.Hosting.SurrealDb.AppHost.csproj @@ -1,17 +1,9 @@ - - + Exe - enable - enable - true - - - - diff --git a/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj b/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj index ca4a2b973..643c2f052 100644 --- a/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj +++ b/tests-app-hosts/Ollama.AppHost/Ollama.AppHost.csproj @@ -1,22 +1,12 @@ - - + Exe - net10.0 - enable - enable - true f39fb70f-21f3-4af9-89b4-3062ff4431e6 - false - - - - diff --git a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj index e19371f19..b22618687 100644 --- a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj +++ b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj @@ -1,5 +1,4 @@  - enable @@ -9,7 +8,7 @@ - + From 79190202a7a43dbefa7c8200aba6fa7565d985eb Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 12 Nov 2025 04:07:26 +0000 Subject: [PATCH 19/27] how'd I miss that merge --- Directory.Packages.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index eefdd7244..21e48a08c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -115,11 +115,8 @@ -<<<<<<< HEAD -======= ->>>>>>> main \ No newline at end of file From f6d32e94b0ffa6d6a348d6ee9db64df292c8e6b8 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 12 Nov 2025 04:29:26 +0000 Subject: [PATCH 20/27] Can't have Aspire.Hosting.AppHost in CPM as it's implicitly added --- Directory.Packages.props | 2 +- ...pire.Hosting.SqlDatabaseProjects.AppHost.csproj | 4 +--- ...Aspire.Hosting.SqlDatabaseProjects.Tests.csproj | 1 + .../CommunityToolkit.Aspire.Testing.csproj | 14 ++++++-------- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 21e48a08c..376e36d7b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,7 @@ - + diff --git a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj index 87e48c51a..28988e785 100644 --- a/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj +++ b/examples/sql-database-projects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.AppHost.csproj @@ -1,6 +1,4 @@ - - - + net8.0 diff --git a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj index 8948bbf13..65757549c 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj @@ -1,6 +1,7 @@ net8.0 + net8.0 diff --git a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj index b22618687..56fa7b9d6 100644 --- a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj +++ b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj @@ -1,16 +1,14 @@ - + + + + net8.0 + net8.0 + - enable - enable false - true - - - - @@ -11,7 +10,6 @@ - @@ -24,9 +22,4 @@ - - - - - diff --git a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj index 65757549c..02800ae53 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj @@ -1,9 +1,4 @@ - - net8.0 - net8.0 - - diff --git a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj index 56fa7b9d6..44daba410 100644 --- a/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj +++ b/tests/CommunityToolkit.Aspire.Testing/CommunityToolkit.Aspire.Testing.csproj @@ -1,10 +1,5 @@  - - net8.0 - net8.0 - - false From 809b1717effd5fc4ca85a49055e6c4e6468ba12e Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 12 Nov 2025 04:49:18 +0000 Subject: [PATCH 22/27] Removing the .net down levelling there too --- examples/sql-database-projects/SdkProject/SdkProject.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/sql-database-projects/SdkProject/SdkProject.csproj b/examples/sql-database-projects/SdkProject/SdkProject.csproj index e706adb83..e63d1261e 100644 --- a/examples/sql-database-projects/SdkProject/SdkProject.csproj +++ b/examples/sql-database-projects/SdkProject/SdkProject.csproj @@ -1,7 +1,5 @@ - net8.0 - net8.0 Sql150 True From 6a73db8e16b13e3c275c245210f4fcb1ef61016b Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Wed, 12 Nov 2025 04:56:35 +0000 Subject: [PATCH 23/27] Missed another reference to the apphost package --- Directory.Packages.props | 1 - ...ityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj | 4 ---- 2 files changed, 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 376e36d7b..3f79488a5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,6 @@ - diff --git a/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj b/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj index 8c8346855..8b76edb34 100644 --- a/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj +++ b/examples/python/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.Python.Extensions.AppHost.csproj @@ -9,10 +9,6 @@ $(NoWarn);ASPIREHOSTINGPYTHON001 - - - - From e567daa7b214355e301f20444d40def3a42f7919 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Fri, 14 Nov 2025 06:29:24 +0000 Subject: [PATCH 24/27] reverting a change --- examples/sql-database-projects/SdkProject/SdkProject.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/sql-database-projects/SdkProject/SdkProject.csproj b/examples/sql-database-projects/SdkProject/SdkProject.csproj index e63d1261e..9bd8dbf27 100644 --- a/examples/sql-database-projects/SdkProject/SdkProject.csproj +++ b/examples/sql-database-projects/SdkProject/SdkProject.csproj @@ -1,5 +1,6 @@ + $(DefaultTargetFramework) Sql150 True From 19119447ec66f5ae620f1b486e74c8ce2ad051b0 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Fri, 14 Nov 2025 19:08:10 +1100 Subject: [PATCH 25/27] Attempting to force the removal of some nuget packages that we don't want at runtime --- Directory.Packages.props | 2 ++ ...munityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj | 5 +++++ ...mmunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props | 7 +++++++ ...mmunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props | 3 +++ ...Toolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj | 6 ++++++ 5 files changed, 23 insertions(+) create mode 100644 src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props create mode 100644 src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/buildMultiTargeting/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props diff --git a/Directory.Packages.props b/Directory.Packages.props index 3f79488a5..7c7ac9cb0 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -79,6 +79,8 @@ + + diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj index 34dbef3f2..e5ed5b664 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj @@ -18,6 +18,11 @@ + + + + + diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props new file mode 100644 index 000000000..0df630616 --- /dev/null +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/buildMultiTargeting/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/buildMultiTargeting/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props new file mode 100644 index 000000000..bb2ff1164 --- /dev/null +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/buildMultiTargeting/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj index 02800ae53..32fa1e433 100644 --- a/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj +++ b/tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.Tests.csproj @@ -16,4 +16,10 @@ + + + + + + From a6057e6ff5c2b7ca6fa76ae0a3ebe5508ae4c622 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Fri, 14 Nov 2025 19:08:43 +1100 Subject: [PATCH 26/27] csproj mistake --- ...ommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj index e5ed5b664..34dbef3f2 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.csproj @@ -18,11 +18,6 @@ - - - - - From 90fb953d3b31746073250a6551d37c0cc42fbd87 Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Fri, 14 Nov 2025 20:52:33 +1100 Subject: [PATCH 27/27] Going nuclear on the files in a post-build task --- ...ommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props | 6 +++--- ...munityToolkit.Aspire.Hosting.SqlDatabaseProjects.targets | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props index 0df630616..80e4220c8 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.props @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.targets b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.targets index 4e6dca355..dae73efd7 100644 --- a/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.targets +++ b/src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/build/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects.targets @@ -62,4 +62,8 @@ namespace Packages%3B + + + + \ No newline at end of file