From 928e3d3fb56c230f902dd1710ad396647634814e Mon Sep 17 00:00:00 2001 From: David Pine Date: Wed, 27 May 2026 13:26:27 -0500 Subject: [PATCH] Upgrade Aspire samples to 13.4 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/ci.yml | 5 +++-- .gitignore | 2 +- build/Build.proj | 12 ++++++------ .../MetricsApp.AppHost/MetricsApp.AppHost.csproj | 4 ++-- .../AspireShop.AppHost/AspireShop.AppHost.csproj | 8 ++++---- .../AspireShop.BasketService.csproj | 2 +- .../AspireShop.CatalogDb.csproj | 2 +- .../AspireShop.CatalogDbManager.csproj | 2 +- .../Directory.Packages.props | 14 +++++++------- .../ImageGallery.AppHost.csproj | 2 +- .../AspireJavaScript.AppHost.csproj | 6 +++--- .../AspireWithNode.AppHost.csproj | 8 ++++---- samples/aspire-with-python/apphost.cs | 8 ++++---- samples/aspire-with-python/apphost.run.json | 2 -- .../ClientAppsIntegration.AppHost.csproj | 4 ++-- samples/container-build/apphost.cs | 2 +- samples/container-build/apphost.run.json | 1 - .../CustomResources.AppHost.csproj | 4 ++-- .../DatabaseContainers.ApiService.csproj | 6 +++--- .../DatabaseContainers.AppHost.csproj | 10 +++++----- .../DatabaseMigrations.ApiService.csproj | 2 +- .../DatabaseMigrations.AppHost.csproj | 6 +++--- .../DatabaseMigrations.MigrationService.csproj | 2 +- samples/golang-api/{apphost.ts => apphost.mts} | 2 +- samples/golang-api/aspire.config.json | 6 +++--- samples/golang-api/eslint.config.mjs | 2 +- samples/golang-api/package.json | 2 +- samples/golang-api/tsconfig.apphost.json | 2 +- .../HealthChecksUI.AppHost.csproj | 8 ++++---- .../HealthChecksUI.Web/HealthChecksUI.Web.csproj | 2 +- samples/image-gallery/api/api.csproj | 6 +++--- samples/image-gallery/apphost.cs | 11 +++++------ samples/image-gallery/apphost.run.json | 2 -- samples/image-gallery/worker/worker.csproj | 6 +++--- .../node-express-redis/{apphost.ts => apphost.mts} | 2 +- samples/node-express-redis/aspire.config.json | 12 ++++++------ samples/node-express-redis/eslint.config.mjs | 2 +- samples/node-express-redis/package.json | 2 +- samples/node-express-redis/tsconfig.apphost.json | 2 +- .../OrleansVoting.AppHost.csproj | 8 ++++---- .../OrleansVoting.Service.csproj | 2 +- .../{apphost.ts => apphost.mts} | 2 +- samples/polyglot-task-queue/aspire.config.json | 12 ++++++------ samples/polyglot-task-queue/eslint.config.mjs | 2 +- samples/polyglot-task-queue/package.json | 2 +- samples/polyglot-task-queue/tsconfig.apphost.json | 2 +- .../worker-csharp/worker-csharp.csproj | 2 +- samples/python-fastapi-postgres/README.md | 4 ++-- .../{apphost.ts => apphost.mts} | 2 +- samples/python-fastapi-postgres/aspire.config.json | 10 +++++----- samples/python-fastapi-postgres/eslint.config.mjs | 2 +- samples/python-fastapi-postgres/package.json | 2 +- .../python-fastapi-postgres/tsconfig.apphost.json | 2 +- samples/python-openai-agent/README.md | 4 ++-- .../{apphost.ts => apphost.mts} | 2 +- samples/python-openai-agent/aspire.config.json | 10 +++++----- samples/python-openai-agent/eslint.config.mjs | 2 +- samples/python-openai-agent/package.json | 2 +- samples/python-openai-agent/tsconfig.apphost.json | 2 +- samples/python-script/README.md | 4 ++-- samples/python-script/{apphost.ts => apphost.mts} | 2 +- samples/python-script/aspire.config.json | 6 +++--- samples/python-script/eslint.config.mjs | 2 +- samples/python-script/package.json | 2 +- samples/python-script/tsconfig.apphost.json | 2 +- .../{apphost.ts => apphost.mts} | 2 +- samples/rag-document-qa-svelte/aspire.config.json | 12 ++++++------ samples/rag-document-qa-svelte/eslint.config.mjs | 2 +- samples/rag-document-qa-svelte/package.json | 2 +- .../rag-document-qa-svelte/tsconfig.apphost.json | 2 +- samples/vite-csharp-postgres/api/Api.csproj | 2 +- .../{apphost.ts => apphost.mts} | 2 +- samples/vite-csharp-postgres/aspire.config.json | 10 +++++----- samples/vite-csharp-postgres/eslint.config.mjs | 2 +- samples/vite-csharp-postgres/package.json | 2 +- samples/vite-csharp-postgres/tsconfig.apphost.json | 2 +- .../vite-react-fastapi/{apphost.ts => apphost.mts} | 2 +- samples/vite-react-fastapi/aspire.config.json | 12 ++++++------ samples/vite-react-fastapi/eslint.config.mjs | 2 +- samples/vite-react-fastapi/package.json | 2 +- samples/vite-react-fastapi/tsconfig.apphost.json | 2 +- samples/vite-yarp-static/README.md | 2 +- .../vite-yarp-static/{apphost.ts => apphost.mts} | 2 +- samples/vite-yarp-static/aspire.config.json | 10 +++++----- samples/vite-yarp-static/eslint.config.mjs | 2 +- samples/vite-yarp-static/package.json | 2 +- samples/vite-yarp-static/tsconfig.apphost.json | 2 +- .../VolumeMount.AppHost/VolumeMount.AppHost.csproj | 10 +++++----- .../VolumeMount.BlazorWeb.csproj | 4 ++-- .../SamplesIntegrationTests.csproj | 10 +++++----- 90 files changed, 188 insertions(+), 193 deletions(-) rename samples/golang-api/{apphost.ts => apphost.mts} (93%) rename samples/node-express-redis/{apphost.ts => apphost.mts} (94%) rename samples/polyglot-task-queue/{apphost.ts => apphost.mts} (97%) rename samples/python-fastapi-postgres/{apphost.ts => apphost.mts} (86%) rename samples/python-openai-agent/{apphost.ts => apphost.mts} (87%) rename samples/python-script/{apphost.ts => apphost.mts} (68%) rename samples/rag-document-qa-svelte/{apphost.ts => apphost.mts} (92%) rename samples/vite-csharp-postgres/{apphost.ts => apphost.mts} (97%) rename samples/vite-react-fastapi/{apphost.ts => apphost.mts} (94%) rename samples/vite-yarp-static/{apphost.ts => apphost.mts} (90%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 525a17b55..24dc75e6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -98,15 +98,16 @@ jobs: while IFS= read -r apphost; do sample_dir="$(dirname "$apphost")" + apphost_name="$(basename "$apphost")" sample_name="${apphost#./samples/}" echo "::group::Restore $sample_name" ( cd "$sample_dir" - "$ASPIRE_CLI" restore --apphost apphost.ts --non-interactive + "$ASPIRE_CLI" restore --apphost "$apphost_name" --non-interactive npm ci --no-audit --no-fund ) echo "::endgroup::" - done < <(find ./samples -name apphost.ts | sort) + done < <(find ./samples \( -name apphost.ts -o -name apphost.mts \) | sort) - name: Build (Ubuntu) if: matrix.os == 'ubuntu-latest' diff --git a/.gitignore b/.gitignore index 42088181f..02c84c5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -64,7 +64,7 @@ bld/ # Aspire output directory aspire-output/ **/.aspire/settings.json -**/.modules/ +**/.aspire/modules/ **/dist/apphost/ # Visual Studio 2015/2017 cache/options directory diff --git a/build/Build.proj b/build/Build.proj index ac50d443d..3203891bf 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -12,7 +12,7 @@ - + @@ -62,11 +62,11 @@ - - - @@ -82,9 +82,9 @@ - - diff --git a/samples/Metrics/MetricsApp.AppHost/MetricsApp.AppHost.csproj b/samples/Metrics/MetricsApp.AppHost/MetricsApp.AppHost.csproj index 828a2da4c..8bcd3fa64 100644 --- a/samples/Metrics/MetricsApp.AppHost/MetricsApp.AppHost.csproj +++ b/samples/Metrics/MetricsApp.AppHost/MetricsApp.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,7 +9,7 @@ - + diff --git a/samples/aspire-shop/AspireShop.AppHost/AspireShop.AppHost.csproj b/samples/aspire-shop/AspireShop.AppHost/AspireShop.AppHost.csproj index 26e4a16db..6fe566da4 100644 --- a/samples/aspire-shop/AspireShop.AppHost/AspireShop.AppHost.csproj +++ b/samples/aspire-shop/AspireShop.AppHost/AspireShop.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/aspire-shop/AspireShop.BasketService/AspireShop.BasketService.csproj b/samples/aspire-shop/AspireShop.BasketService/AspireShop.BasketService.csproj index da83d54b6..21ff075ea 100644 --- a/samples/aspire-shop/AspireShop.BasketService/AspireShop.BasketService.csproj +++ b/samples/aspire-shop/AspireShop.BasketService/AspireShop.BasketService.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/aspire-shop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj b/samples/aspire-shop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj index ed1ab71d7..cfcc603f5 100644 --- a/samples/aspire-shop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj +++ b/samples/aspire-shop/AspireShop.CatalogDb/AspireShop.CatalogDb.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/aspire-shop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj b/samples/aspire-shop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj index 535acdcd3..5f936e6d4 100644 --- a/samples/aspire-shop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj +++ b/samples/aspire-shop/AspireShop.CatalogDbManager/AspireShop.CatalogDbManager.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/samples/aspire-with-azure-functions/Directory.Packages.props b/samples/aspire-with-azure-functions/Directory.Packages.props index 6cf4830c9..e2d0eb81d 100644 --- a/samples/aspire-with-azure-functions/Directory.Packages.props +++ b/samples/aspire-with-azure-functions/Directory.Packages.props @@ -3,15 +3,15 @@ true - - + + - - - + + + - - + + diff --git a/samples/aspire-with-azure-functions/ImageGallery.AppHost/ImageGallery.AppHost.csproj b/samples/aspire-with-azure-functions/ImageGallery.AppHost/ImageGallery.AppHost.csproj index 4da6fb790..fc7b65a43 100644 --- a/samples/aspire-with-azure-functions/ImageGallery.AppHost/ImageGallery.AppHost.csproj +++ b/samples/aspire-with-azure-functions/ImageGallery.AppHost/ImageGallery.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe diff --git a/samples/aspire-with-javascript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj b/samples/aspire-with-javascript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj index e87fda554..dc678eb6d 100644 --- a/samples/aspire-with-javascript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj +++ b/samples/aspire-with-javascript/AspireJavaScript.AppHost/AspireJavaScript.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,10 +9,10 @@ - + - + diff --git a/samples/aspire-with-node/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj b/samples/aspire-with-node/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj index c53bb05df..1ce9c84d2 100644 --- a/samples/aspire-with-node/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj +++ b/samples/aspire-with-node/AspireWithNode.AppHost/AspireWithNode.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,11 +9,11 @@ - + - - + + diff --git a/samples/aspire-with-python/apphost.cs b/samples/aspire-with-python/apphost.cs index 9d87e847f..fe88381fe 100644 --- a/samples/aspire-with-python/apphost.cs +++ b/samples/aspire-with-python/apphost.cs @@ -1,7 +1,7 @@ -#:sdk Aspire.AppHost.Sdk@13.3.3 -#:package Aspire.Hosting.JavaScript@13.3.3 -#:package Aspire.Hosting.Python@13.3.3 -#:package Aspire.Hosting.Redis@13.3.3 +#:sdk Aspire.AppHost.Sdk@13.4.0 +#:package Aspire.Hosting.JavaScript@13.4.0 +#:package Aspire.Hosting.Python@13.4.0 +#:package Aspire.Hosting.Redis@13.4.0 var builder = DistributedApplication.CreateBuilder(args); diff --git a/samples/aspire-with-python/apphost.run.json b/samples/aspire-with-python/apphost.run.json index aa507ebfc..17b076a1a 100644 --- a/samples/aspire-with-python/apphost.run.json +++ b/samples/aspire-with-python/apphost.run.json @@ -10,7 +10,6 @@ "ASPNETCORE_ENVIRONMENT": "Development", "DOTNET_ENVIRONMENT": "Development", "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21056", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23032", "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22003" } }, @@ -23,7 +22,6 @@ "ASPNETCORE_ENVIRONMENT": "Development", "DOTNET_ENVIRONMENT": "Development", "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19215", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18255", "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20143" } } diff --git a/samples/client-apps-integration/ClientAppsIntegration.AppHost/ClientAppsIntegration.AppHost.csproj b/samples/client-apps-integration/ClientAppsIntegration.AppHost/ClientAppsIntegration.AppHost.csproj index aac2f26d4..98315a08a 100644 --- a/samples/client-apps-integration/ClientAppsIntegration.AppHost/ClientAppsIntegration.AppHost.csproj +++ b/samples/client-apps-integration/ClientAppsIntegration.AppHost/ClientAppsIntegration.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,7 +9,7 @@ - + diff --git a/samples/container-build/apphost.cs b/samples/container-build/apphost.cs index 7e083cd9a..5df3987d8 100644 --- a/samples/container-build/apphost.cs +++ b/samples/container-build/apphost.cs @@ -1,4 +1,4 @@ -#:sdk Aspire.AppHost.Sdk@13.3.3 +#:sdk Aspire.AppHost.Sdk@13.4.0 using Microsoft.Extensions.Hosting; diff --git a/samples/container-build/apphost.run.json b/samples/container-build/apphost.run.json index f2f803355..5dee3c5de 100644 --- a/samples/container-build/apphost.run.json +++ b/samples/container-build/apphost.run.json @@ -11,7 +11,6 @@ "DOTNET_ENVIRONMENT": "Development", "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21227", "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22169", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:15014", "ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true" } }, diff --git a/samples/custom-resources/CustomResources.AppHost/CustomResources.AppHost.csproj b/samples/custom-resources/CustomResources.AppHost/CustomResources.AppHost.csproj index 7cb01efdb..b38c7fcb4 100644 --- a/samples/custom-resources/CustomResources.AppHost/CustomResources.AppHost.csproj +++ b/samples/custom-resources/CustomResources.AppHost/CustomResources.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -8,7 +8,7 @@ 00d08ee4-b2e0-4d12-827c-d131fda1c6f6 - + diff --git a/samples/database-containers/DatabaseContainers.ApiService/DatabaseContainers.ApiService.csproj b/samples/database-containers/DatabaseContainers.ApiService/DatabaseContainers.ApiService.csproj index dc31f7b22..882664fb1 100644 --- a/samples/database-containers/DatabaseContainers.ApiService/DatabaseContainers.ApiService.csproj +++ b/samples/database-containers/DatabaseContainers.ApiService/DatabaseContainers.ApiService.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/samples/database-containers/DatabaseContainers.AppHost/DatabaseContainers.AppHost.csproj b/samples/database-containers/DatabaseContainers.AppHost/DatabaseContainers.AppHost.csproj index 6c1acb0e0..0753e344a 100644 --- a/samples/database-containers/DatabaseContainers.AppHost/DatabaseContainers.AppHost.csproj +++ b/samples/database-containers/DatabaseContainers.AppHost/DatabaseContainers.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/samples/database-migrations/DatabaseMigrations.ApiService/DatabaseMigrations.ApiService.csproj b/samples/database-migrations/DatabaseMigrations.ApiService/DatabaseMigrations.ApiService.csproj index c4d050a89..50d075ae2 100644 --- a/samples/database-migrations/DatabaseMigrations.ApiService/DatabaseMigrations.ApiService.csproj +++ b/samples/database-migrations/DatabaseMigrations.ApiService/DatabaseMigrations.ApiService.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/database-migrations/DatabaseMigrations.AppHost/DatabaseMigrations.AppHost.csproj b/samples/database-migrations/DatabaseMigrations.AppHost/DatabaseMigrations.AppHost.csproj index 0618207c1..e31d464ec 100644 --- a/samples/database-migrations/DatabaseMigrations.AppHost/DatabaseMigrations.AppHost.csproj +++ b/samples/database-migrations/DatabaseMigrations.AppHost/DatabaseMigrations.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,11 +9,11 @@ - + - + diff --git a/samples/database-migrations/DatabaseMigrations.MigrationService/DatabaseMigrations.MigrationService.csproj b/samples/database-migrations/DatabaseMigrations.MigrationService/DatabaseMigrations.MigrationService.csproj index fb677b456..eeff3e56a 100644 --- a/samples/database-migrations/DatabaseMigrations.MigrationService/DatabaseMigrations.MigrationService.csproj +++ b/samples/database-migrations/DatabaseMigrations.MigrationService/DatabaseMigrations.MigrationService.csproj @@ -13,7 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/samples/golang-api/apphost.ts b/samples/golang-api/apphost.mts similarity index 93% rename from samples/golang-api/apphost.ts rename to samples/golang-api/apphost.mts index 732d800a2..c129e2c81 100644 --- a/samples/golang-api/apphost.ts +++ b/samples/golang-api/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); const executionContext = await builder.executionContext(); diff --git a/samples/golang-api/aspire.config.json b/samples/golang-api/aspire.config.json index d4a9ae7be..ed37963d0 100644 --- a/samples/golang-api/aspire.config.json +++ b/samples/golang-api/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,6 +16,6 @@ } }, "packages": { - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/golang-api/eslint.config.mjs b/samples/golang-api/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/golang-api/eslint.config.mjs +++ b/samples/golang-api/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/golang-api/package.json b/samples/golang-api/package.json index a1c501218..884bd1cf1 100644 --- a/samples/golang-api/package.json +++ b/samples/golang-api/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/golang-api/tsconfig.apphost.json b/samples/golang-api/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/golang-api/tsconfig.apphost.json +++ b/samples/golang-api/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/health-checks-ui/HealthChecksUI.AppHost/HealthChecksUI.AppHost.csproj b/samples/health-checks-ui/HealthChecksUI.AppHost/HealthChecksUI.AppHost.csproj index a83e7c6eb..7d50103ca 100644 --- a/samples/health-checks-ui/HealthChecksUI.AppHost/HealthChecksUI.AppHost.csproj +++ b/samples/health-checks-ui/HealthChecksUI.AppHost/HealthChecksUI.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -14,9 +14,9 @@ - - - + + + diff --git a/samples/health-checks-ui/HealthChecksUI.Web/HealthChecksUI.Web.csproj b/samples/health-checks-ui/HealthChecksUI.Web/HealthChecksUI.Web.csproj index 3771b528f..b04a09f0e 100644 --- a/samples/health-checks-ui/HealthChecksUI.Web/HealthChecksUI.Web.csproj +++ b/samples/health-checks-ui/HealthChecksUI.Web/HealthChecksUI.Web.csproj @@ -12,7 +12,7 @@ - + diff --git a/samples/image-gallery/api/api.csproj b/samples/image-gallery/api/api.csproj index 82d3c19a8..5b3df8db8 100644 --- a/samples/image-gallery/api/api.csproj +++ b/samples/image-gallery/api/api.csproj @@ -17,9 +17,9 @@ all - - - + + + diff --git a/samples/image-gallery/apphost.cs b/samples/image-gallery/apphost.cs index 0506a9333..e52d032d0 100644 --- a/samples/image-gallery/apphost.cs +++ b/samples/image-gallery/apphost.cs @@ -1,11 +1,11 @@ #pragma warning disable ASPIRECSHARPAPPS001 #pragma warning disable ASPIREAZURE002 -#:sdk Aspire.AppHost.Sdk@13.3.3 -#:package Aspire.Hosting.Azure.Storage@13.3.3 -#:package Aspire.Hosting.Azure.Sql@13.3.3 -#:package Aspire.Hosting.JavaScript@13.3.3 -#:package Aspire.Hosting.Azure.AppContainers@13.3.3 +#:sdk Aspire.AppHost.Sdk@13.4.0 +#:package Aspire.Hosting.Azure.Storage@13.4.0 +#:package Aspire.Hosting.Azure.Sql@13.4.0 +#:package Aspire.Hosting.JavaScript@13.4.0 +#:package Aspire.Hosting.Azure.AppContainers@13.4.0 using Aspire.Hosting.Azure; using Azure.Provisioning.AppContainers; @@ -109,4 +109,3 @@ builder.Build().Run(); - diff --git a/samples/image-gallery/apphost.run.json b/samples/image-gallery/apphost.run.json index cb85dbab9..333b7434c 100644 --- a/samples/image-gallery/apphost.run.json +++ b/samples/image-gallery/apphost.run.json @@ -11,7 +11,6 @@ "ASPNETCORE_ENVIRONMENT": "Development", "DOTNET_ENVIRONMENT": "Development", "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21250", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:23250", "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22250" } }, @@ -24,7 +23,6 @@ "ASPNETCORE_ENVIRONMENT": "Development", "DOTNET_ENVIRONMENT": "Development", "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19250", - "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18250", "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20250" } } diff --git a/samples/image-gallery/worker/worker.csproj b/samples/image-gallery/worker/worker.csproj index 0916b50a8..e2971b367 100644 --- a/samples/image-gallery/worker/worker.csproj +++ b/samples/image-gallery/worker/worker.csproj @@ -16,9 +16,9 @@ - - - + + + diff --git a/samples/node-express-redis/apphost.ts b/samples/node-express-redis/apphost.mts similarity index 94% rename from samples/node-express-redis/apphost.ts rename to samples/node-express-redis/apphost.mts index 66c48285b..9dfe288b1 100644 --- a/samples/node-express-redis/apphost.ts +++ b/samples/node-express-redis/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); const executionContext = await builder.executionContext(); diff --git a/samples/node-express-redis/aspire.config.json b/samples/node-express-redis/aspire.config.json index 2523c79bd..07b5d1229 100644 --- a/samples/node-express-redis/aspire.config.json +++ b/samples/node-express-redis/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,9 +16,9 @@ } }, "packages": { - "Aspire.Hosting.JavaScript": "13.3.3", - "Aspire.Hosting.Redis": "13.3.3", - "Aspire.Hosting.Yarp": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.JavaScript": "13.4.0", + "Aspire.Hosting.Redis": "13.4.0", + "Aspire.Hosting.Yarp": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/node-express-redis/eslint.config.mjs b/samples/node-express-redis/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/node-express-redis/eslint.config.mjs +++ b/samples/node-express-redis/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/node-express-redis/package.json b/samples/node-express-redis/package.json index a1c501218..884bd1cf1 100644 --- a/samples/node-express-redis/package.json +++ b/samples/node-express-redis/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/node-express-redis/tsconfig.apphost.json b/samples/node-express-redis/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/node-express-redis/tsconfig.apphost.json +++ b/samples/node-express-redis/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/orleans-voting/OrleansVoting.AppHost/OrleansVoting.AppHost.csproj b/samples/orleans-voting/OrleansVoting.AppHost/OrleansVoting.AppHost.csproj index 934463eb4..aeb6690d1 100644 --- a/samples/orleans-voting/OrleansVoting.AppHost/OrleansVoting.AppHost.csproj +++ b/samples/orleans-voting/OrleansVoting.AppHost/OrleansVoting.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,12 +9,12 @@ - - + + - + diff --git a/samples/orleans-voting/OrleansVoting.Service/OrleansVoting.Service.csproj b/samples/orleans-voting/OrleansVoting.Service/OrleansVoting.Service.csproj index 8be53df2a..5b61d032a 100644 --- a/samples/orleans-voting/OrleansVoting.Service/OrleansVoting.Service.csproj +++ b/samples/orleans-voting/OrleansVoting.Service/OrleansVoting.Service.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/polyglot-task-queue/apphost.ts b/samples/polyglot-task-queue/apphost.mts similarity index 97% rename from samples/polyglot-task-queue/apphost.ts rename to samples/polyglot-task-queue/apphost.mts index 3262849d7..cfe8d1180 100644 --- a/samples/polyglot-task-queue/apphost.ts +++ b/samples/polyglot-task-queue/apphost.mts @@ -1,4 +1,4 @@ -import { ContainerLifetime, UrlDisplayLocation, createBuilder } from "./.modules/aspire.js"; +import { ContainerLifetime, UrlDisplayLocation, createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/polyglot-task-queue/aspire.config.json b/samples/polyglot-task-queue/aspire.config.json index b2ffa3793..a898069b6 100644 --- a/samples/polyglot-task-queue/aspire.config.json +++ b/samples/polyglot-task-queue/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,9 +16,9 @@ } }, "packages": { - "Aspire.Hosting.RabbitMQ": "13.3.3", - "Aspire.Hosting.Python": "13.3.3", - "Aspire.Hosting.JavaScript": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.RabbitMQ": "13.4.0", + "Aspire.Hosting.Python": "13.4.0", + "Aspire.Hosting.JavaScript": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/polyglot-task-queue/eslint.config.mjs b/samples/polyglot-task-queue/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/polyglot-task-queue/eslint.config.mjs +++ b/samples/polyglot-task-queue/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/polyglot-task-queue/package.json b/samples/polyglot-task-queue/package.json index a1c501218..884bd1cf1 100644 --- a/samples/polyglot-task-queue/package.json +++ b/samples/polyglot-task-queue/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/polyglot-task-queue/tsconfig.apphost.json b/samples/polyglot-task-queue/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/polyglot-task-queue/tsconfig.apphost.json +++ b/samples/polyglot-task-queue/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/polyglot-task-queue/worker-csharp/worker-csharp.csproj b/samples/polyglot-task-queue/worker-csharp/worker-csharp.csproj index c8b3ebec7..c10873b3a 100644 --- a/samples/polyglot-task-queue/worker-csharp/worker-csharp.csproj +++ b/samples/polyglot-task-queue/worker-csharp/worker-csharp.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/python-fastapi-postgres/README.md b/samples/python-fastapi-postgres/README.md index 624c53ff5..cf66a719c 100644 --- a/samples/python-fastapi-postgres/README.md +++ b/samples/python-fastapi-postgres/README.md @@ -31,10 +31,10 @@ The application consists of: ## Key Code -The `apphost.ts` configuration demonstrates Aspire 13's Python support: +The `apphost.mts` configuration demonstrates Aspire 13's Python support: ```ts -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/python-fastapi-postgres/apphost.ts b/samples/python-fastapi-postgres/apphost.mts similarity index 86% rename from samples/python-fastapi-postgres/apphost.ts rename to samples/python-fastapi-postgres/apphost.mts index 82d377598..982141bd8 100644 --- a/samples/python-fastapi-postgres/apphost.ts +++ b/samples/python-fastapi-postgres/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/python-fastapi-postgres/aspire.config.json b/samples/python-fastapi-postgres/aspire.config.json index 565511f6e..2e99fe39e 100644 --- a/samples/python-fastapi-postgres/aspire.config.json +++ b/samples/python-fastapi-postgres/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,8 +16,8 @@ } }, "packages": { - "Aspire.Hosting.Python": "13.3.3", - "Aspire.Hosting.PostgreSQL": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.Python": "13.4.0", + "Aspire.Hosting.PostgreSQL": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/python-fastapi-postgres/eslint.config.mjs b/samples/python-fastapi-postgres/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/python-fastapi-postgres/eslint.config.mjs +++ b/samples/python-fastapi-postgres/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/python-fastapi-postgres/package.json b/samples/python-fastapi-postgres/package.json index a1c501218..884bd1cf1 100644 --- a/samples/python-fastapi-postgres/package.json +++ b/samples/python-fastapi-postgres/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/python-fastapi-postgres/tsconfig.apphost.json b/samples/python-fastapi-postgres/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/python-fastapi-postgres/tsconfig.apphost.json +++ b/samples/python-fastapi-postgres/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/python-openai-agent/README.md b/samples/python-openai-agent/README.md index 239ac6025..b47c74bac 100644 --- a/samples/python-openai-agent/README.md +++ b/samples/python-openai-agent/README.md @@ -36,10 +36,10 @@ The application consists of: ## Key Code -The `apphost.ts` configuration demonstrates AI workloads with Aspire: +The `apphost.mts` configuration demonstrates AI workloads with Aspire: ```ts -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/python-openai-agent/apphost.ts b/samples/python-openai-agent/apphost.mts similarity index 87% rename from samples/python-openai-agent/apphost.ts rename to samples/python-openai-agent/apphost.mts index ac2178abb..e845f72e5 100644 --- a/samples/python-openai-agent/apphost.ts +++ b/samples/python-openai-agent/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/python-openai-agent/aspire.config.json b/samples/python-openai-agent/aspire.config.json index 3c5b28982..21f073e40 100644 --- a/samples/python-openai-agent/aspire.config.json +++ b/samples/python-openai-agent/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,8 +16,8 @@ } }, "packages": { - "Aspire.Hosting.Python": "13.3.3", - "Aspire.Hosting.OpenAI": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.Python": "13.4.0", + "Aspire.Hosting.OpenAI": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/python-openai-agent/eslint.config.mjs b/samples/python-openai-agent/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/python-openai-agent/eslint.config.mjs +++ b/samples/python-openai-agent/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/python-openai-agent/package.json b/samples/python-openai-agent/package.json index a1c501218..884bd1cf1 100644 --- a/samples/python-openai-agent/package.json +++ b/samples/python-openai-agent/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/python-openai-agent/tsconfig.apphost.json b/samples/python-openai-agent/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/python-openai-agent/tsconfig.apphost.json +++ b/samples/python-openai-agent/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/python-script/README.md b/samples/python-script/README.md index fe4c32949..a9e6ed7f9 100644 --- a/samples/python-script/README.md +++ b/samples/python-script/README.md @@ -26,10 +26,10 @@ The application consists of: ## Key Code -The `apphost.ts` configuration shows the minimal setup for Python scripts: +The `apphost.mts` configuration shows the minimal setup for Python scripts: ```ts -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/python-script/apphost.ts b/samples/python-script/apphost.mts similarity index 68% rename from samples/python-script/apphost.ts rename to samples/python-script/apphost.mts index 2cc3e3c8a..10c09d8aa 100644 --- a/samples/python-script/apphost.ts +++ b/samples/python-script/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/python-script/aspire.config.json b/samples/python-script/aspire.config.json index e2ff7f6ed..edc310434 100644 --- a/samples/python-script/aspire.config.json +++ b/samples/python-script/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,6 +16,6 @@ } }, "packages": { - "Aspire.Hosting.Python": "13.3.3" + "Aspire.Hosting.Python": "13.4.0" } } diff --git a/samples/python-script/eslint.config.mjs b/samples/python-script/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/python-script/eslint.config.mjs +++ b/samples/python-script/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/python-script/package.json b/samples/python-script/package.json index a1c501218..884bd1cf1 100644 --- a/samples/python-script/package.json +++ b/samples/python-script/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/python-script/tsconfig.apphost.json b/samples/python-script/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/python-script/tsconfig.apphost.json +++ b/samples/python-script/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/rag-document-qa-svelte/apphost.ts b/samples/rag-document-qa-svelte/apphost.mts similarity index 92% rename from samples/rag-document-qa-svelte/apphost.ts rename to samples/rag-document-qa-svelte/apphost.mts index a250afcd6..8925b1bb1 100644 --- a/samples/rag-document-qa-svelte/apphost.ts +++ b/samples/rag-document-qa-svelte/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/rag-document-qa-svelte/aspire.config.json b/samples/rag-document-qa-svelte/aspire.config.json index ec3fc58cb..b9578b913 100644 --- a/samples/rag-document-qa-svelte/aspire.config.json +++ b/samples/rag-document-qa-svelte/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,9 +16,9 @@ } }, "packages": { - "Aspire.Hosting.Python": "13.3.3", - "Aspire.Hosting.JavaScript": "13.3.3", - "Aspire.Hosting.Qdrant": "13.3.3", - "Aspire.Hosting.OpenAI": "13.3.3" + "Aspire.Hosting.Python": "13.4.0", + "Aspire.Hosting.JavaScript": "13.4.0", + "Aspire.Hosting.Qdrant": "13.4.0", + "Aspire.Hosting.OpenAI": "13.4.0" } } diff --git a/samples/rag-document-qa-svelte/eslint.config.mjs b/samples/rag-document-qa-svelte/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/rag-document-qa-svelte/eslint.config.mjs +++ b/samples/rag-document-qa-svelte/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/rag-document-qa-svelte/package.json b/samples/rag-document-qa-svelte/package.json index a1c501218..884bd1cf1 100644 --- a/samples/rag-document-qa-svelte/package.json +++ b/samples/rag-document-qa-svelte/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/rag-document-qa-svelte/tsconfig.apphost.json b/samples/rag-document-qa-svelte/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/rag-document-qa-svelte/tsconfig.apphost.json +++ b/samples/rag-document-qa-svelte/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/vite-csharp-postgres/api/Api.csproj b/samples/vite-csharp-postgres/api/Api.csproj index e60aadcb2..cb9011adc 100644 --- a/samples/vite-csharp-postgres/api/Api.csproj +++ b/samples/vite-csharp-postgres/api/Api.csproj @@ -13,7 +13,7 @@ all - + diff --git a/samples/vite-csharp-postgres/apphost.ts b/samples/vite-csharp-postgres/apphost.mts similarity index 97% rename from samples/vite-csharp-postgres/apphost.ts rename to samples/vite-csharp-postgres/apphost.mts index 2abb79df2..e2b4017a3 100644 --- a/samples/vite-csharp-postgres/apphost.ts +++ b/samples/vite-csharp-postgres/apphost.mts @@ -1,4 +1,4 @@ -import { ContainerLifetime, UrlDisplayLocation, createBuilder } from "./.modules/aspire.js"; +import { ContainerLifetime, UrlDisplayLocation, createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); diff --git a/samples/vite-csharp-postgres/aspire.config.json b/samples/vite-csharp-postgres/aspire.config.json index f49c1c709..c64e14d81 100644 --- a/samples/vite-csharp-postgres/aspire.config.json +++ b/samples/vite-csharp-postgres/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,8 +16,8 @@ } }, "packages": { - "Aspire.Hosting.PostgreSQL": "13.3.3", - "Aspire.Hosting.JavaScript": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.PostgreSQL": "13.4.0", + "Aspire.Hosting.JavaScript": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/vite-csharp-postgres/eslint.config.mjs b/samples/vite-csharp-postgres/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/vite-csharp-postgres/eslint.config.mjs +++ b/samples/vite-csharp-postgres/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/vite-csharp-postgres/package.json b/samples/vite-csharp-postgres/package.json index a1c501218..884bd1cf1 100644 --- a/samples/vite-csharp-postgres/package.json +++ b/samples/vite-csharp-postgres/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/vite-csharp-postgres/tsconfig.apphost.json b/samples/vite-csharp-postgres/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/vite-csharp-postgres/tsconfig.apphost.json +++ b/samples/vite-csharp-postgres/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/vite-react-fastapi/apphost.ts b/samples/vite-react-fastapi/apphost.mts similarity index 94% rename from samples/vite-react-fastapi/apphost.ts rename to samples/vite-react-fastapi/apphost.mts index ccc1d76de..16ee9f777 100644 --- a/samples/vite-react-fastapi/apphost.ts +++ b/samples/vite-react-fastapi/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); const executionContext = await builder.executionContext(); diff --git a/samples/vite-react-fastapi/aspire.config.json b/samples/vite-react-fastapi/aspire.config.json index 883f3eec7..15fa3051a 100644 --- a/samples/vite-react-fastapi/aspire.config.json +++ b/samples/vite-react-fastapi/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,9 +16,9 @@ } }, "packages": { - "Aspire.Hosting.Python": "13.3.3", - "Aspire.Hosting.JavaScript": "13.3.3", - "Aspire.Hosting.Yarp": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.Python": "13.4.0", + "Aspire.Hosting.JavaScript": "13.4.0", + "Aspire.Hosting.Yarp": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/vite-react-fastapi/eslint.config.mjs b/samples/vite-react-fastapi/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/vite-react-fastapi/eslint.config.mjs +++ b/samples/vite-react-fastapi/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/vite-react-fastapi/package.json b/samples/vite-react-fastapi/package.json index a1c501218..884bd1cf1 100644 --- a/samples/vite-react-fastapi/package.json +++ b/samples/vite-react-fastapi/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/vite-react-fastapi/tsconfig.apphost.json b/samples/vite-react-fastapi/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/vite-react-fastapi/tsconfig.apphost.json +++ b/samples/vite-react-fastapi/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/vite-yarp-static/README.md b/samples/vite-yarp-static/README.md index a293247fc..be98ac008 100644 --- a/samples/vite-yarp-static/README.md +++ b/samples/vite-yarp-static/README.md @@ -45,7 +45,7 @@ aspire do docker-compose-down-dc # Teardown deployment **Dual-Mode YARP** - Run mode proxies to Vite, publish mode serves static files: ```ts -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); const executionContext = await builder.executionContext.get(); diff --git a/samples/vite-yarp-static/apphost.ts b/samples/vite-yarp-static/apphost.mts similarity index 90% rename from samples/vite-yarp-static/apphost.ts rename to samples/vite-yarp-static/apphost.mts index 3f3fa5aed..9b2d0a329 100644 --- a/samples/vite-yarp-static/apphost.ts +++ b/samples/vite-yarp-static/apphost.mts @@ -1,4 +1,4 @@ -import { createBuilder } from "./.modules/aspire.js"; +import { createBuilder } from "./.aspire/modules/aspire.mjs"; const builder = await createBuilder(); const executionContext = await builder.executionContext(); diff --git a/samples/vite-yarp-static/aspire.config.json b/samples/vite-yarp-static/aspire.config.json index 510120ffe..786da4e9e 100644 --- a/samples/vite-yarp-static/aspire.config.json +++ b/samples/vite-yarp-static/aspire.config.json @@ -1,10 +1,10 @@ { "appHost": { - "path": "apphost.ts", + "path": "apphost.mts", "language": "typescript/nodejs" }, "sdk": { - "version": "13.3.3" + "version": "13.4.0" }, "profiles": { "https": { @@ -16,8 +16,8 @@ } }, "packages": { - "Aspire.Hosting.JavaScript": "13.3.3", - "Aspire.Hosting.Yarp": "13.3.3", - "Aspire.Hosting.Docker": "13.3.3" + "Aspire.Hosting.JavaScript": "13.4.0", + "Aspire.Hosting.Yarp": "13.4.0", + "Aspire.Hosting.Docker": "13.4.0" } } diff --git a/samples/vite-yarp-static/eslint.config.mjs b/samples/vite-yarp-static/eslint.config.mjs index 8b22a696c..e77223af8 100644 --- a/samples/vite-yarp-static/eslint.config.mjs +++ b/samples/vite-yarp-static/eslint.config.mjs @@ -4,7 +4,7 @@ import { defineConfig } from 'eslint/config'; import tseslint from 'typescript-eslint'; export default defineConfig({ - files: ['apphost.ts'], + files: ['apphost.mts'], extends: [tseslint.configs.base], languageOptions: { parserOptions: { diff --git a/samples/vite-yarp-static/package.json b/samples/vite-yarp-static/package.json index a1c501218..884bd1cf1 100644 --- a/samples/vite-yarp-static/package.json +++ b/samples/vite-yarp-static/package.json @@ -7,7 +7,7 @@ "node": "^20.19.0 || ^22.13.0 || >=24" }, "scripts": { - "aspire:lint": "eslint apphost.ts", + "aspire:lint": "eslint apphost.mts", "aspire:start": "aspire run", "aspire:build": "tsc -p tsconfig.apphost.json", "aspire:dev": "tsc --watch -p tsconfig.apphost.json" diff --git a/samples/vite-yarp-static/tsconfig.apphost.json b/samples/vite-yarp-static/tsconfig.apphost.json index 99b7afb1e..139b67749 100644 --- a/samples/vite-yarp-static/tsconfig.apphost.json +++ b/samples/vite-yarp-static/tsconfig.apphost.json @@ -10,6 +10,6 @@ "outDir": "./dist/apphost", "rootDir": "." }, - "include": ["apphost.ts", ".modules/**/*.ts"], + "include": ["apphost.mts", ".aspire/modules/**/*.mts"], "exclude": ["node_modules"] } \ No newline at end of file diff --git a/samples/volume-mount/VolumeMount.AppHost/VolumeMount.AppHost.csproj b/samples/volume-mount/VolumeMount.AppHost/VolumeMount.AppHost.csproj index 162b8c9cc..529b179b5 100644 --- a/samples/volume-mount/VolumeMount.AppHost/VolumeMount.AppHost.csproj +++ b/samples/volume-mount/VolumeMount.AppHost/VolumeMount.AppHost.csproj @@ -1,4 +1,4 @@ - + Exe @@ -9,13 +9,13 @@ - - - + + + - + diff --git a/samples/volume-mount/VolumeMount.BlazorWeb/VolumeMount.BlazorWeb.csproj b/samples/volume-mount/VolumeMount.BlazorWeb/VolumeMount.BlazorWeb.csproj index 95cc16f5c..dc674568a 100644 --- a/samples/volume-mount/VolumeMount.BlazorWeb/VolumeMount.BlazorWeb.csproj +++ b/samples/volume-mount/VolumeMount.BlazorWeb/VolumeMount.BlazorWeb.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/tests/SamplesIntegrationTests/SamplesIntegrationTests.csproj b/tests/SamplesIntegrationTests/SamplesIntegrationTests.csproj index 3babfdba1..8047779ba 100644 --- a/tests/SamplesIntegrationTests/SamplesIntegrationTests.csproj +++ b/tests/SamplesIntegrationTests/SamplesIntegrationTests.csproj @@ -10,11 +10,11 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive