Skip to content

Commit 3648f86

Browse files
aaronpowellaaronpowell
authored
Updating to aspire 13 stable (#963)
* Refactoring the Node.js extensions to JavaScript so it matches with the 13 package * cleanup of instructions * Fixing tests * fixing how the monorepo tests work to ensure they run nx/turbo properly * The approach to running via npx/etc. didn't work right * test coverage saving me from my own refactors
1 parent 8e76ad7 commit 3648f86

118 files changed

Lines changed: 256 additions & 407 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/copilot-instructions.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- Hosting integrations: extension methods in `Aspire.Hosting` namespace.
1414
- Client integrations: extension methods in `Microsoft.Extensions.Hosting` namespace.
1515
- Use file-scoped namespaces.
16-
- **Installer resources:** For Node.js, package installers (npm/yarn/pnpm) are modeled as `ExecutableResource` instances, providing dashboard visibility and proper process management. See `src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/REFACTORING_NOTES.md` for rationale and migration.
1716

1817
### Coding Style
1918

@@ -56,12 +55,13 @@ public static class SomeProgramExtensions
5655
- Integrations must add `Aspire.Hosting` as a dependency; see `Directory.Build.props` for shared MSBuild config.
5756
- Use the [create-integration guide](../docs/create-integration.md) for new integrations.
5857
- For Azure/Dapr integrations, see `src/Shared/DaprAzureExtensions/README.md` for shared resource patterns.
59-
- Don't update files under */api/*.cs (e.g. src/CommunityToolkit.Aspire.Hosting.Ollama/api/CommunityToolkit.Aspire.Hosting.Ollama.cs) as they are generated.
58+
- Don't update files under _/api/_.cs (e.g. src/CommunityToolkit.Aspire.Hosting.Ollama/api/CommunityToolkit.Aspire.Hosting.Ollama.cs) as they are generated.
59+
6060
### External Dependencies & Integration
6161

6262
- Many integrations wrap external services (e.g., Dapr, MinIO, k6, Node.js, Python, Rust, Java, etc.).
6363
- Each integration's README in `src/` or `examples/` details usage, supported versions, and special setup.
64-
- For Node.js, package manager flags can be customized via extension methods (see `src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/README.md`).
64+
- For Node.js, package manager flags can be customized via extension methods (see `src/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions/README.md`).
6565

6666
### Documentation & Contribution
6767

@@ -72,3 +72,4 @@ public static class SomeProgramExtensions
7272
---
7373

7474
If you find any unclear or incomplete sections, please provide feedback to improve these instructions.
75+

‎.github/workflows/code-coverage.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
tag: "${{ github.run_number }}_${{ github.run_id }}"
2626
customSettings: ""
2727
toolpath: "reportgeneratortool"
28-
assemblyfilters: "-*.AppHost;-CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.BlazorApp;-*.ServiceDefaults;-CommunityToolkit.Aspire.Testing;-Aspire.Hosting;-Aspire.Hosting.NodeJs;-Aspire.Hosting.SqlServer;-Aspire.Hosting.Python;-Aspire.Hosting.RabbitMQ;-Aspire.Hosting.Redis;-Aspire.Hosting.PostgreSQL;-Aspire.Hosting.MongoDB"
28+
assemblyfilters: "-*.AppHost;-CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.BlazorApp;-*.ServiceDefaults;-CommunityToolkit.Aspire.Testing;-Aspire.Hosting;-Aspire.Hosting.JavaScript;-Aspire.Hosting.SqlServer;-Aspire.Hosting.Python;-Aspire.Hosting.RabbitMQ;-Aspire.Hosting.Redis;-Aspire.Hosting.PostgreSQL;-Aspire.Hosting.MongoDB"
2929

3030
- name: Upload combined coverage XML
3131
uses: actions/upload-artifact@v5
@@ -64,4 +64,3 @@ jobs:
6464
- name: Coverage on step summary
6565
if: always()
6666
run: cat "${{ github.workspace }}/report/SummaryGithub.md" >> $GITHUB_STEP_SUMMARY
67-

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
Hosting.MongoDB.Extensions.Tests,
4545
Hosting.MySql.Extensions.Tests,
4646
Hosting.Ngrok.Tests,
47-
Hosting.NodeJS.Extensions.Tests,
47+
Hosting.JavaScript.Extensions.Tests,
4848
Hosting.Ollama.Tests,
4949
Hosting.OpenTelemetryCollector.Tests,
5050
Hosting.PapercutSmtp.Tests,

‎CommunityToolkit.Aspire.slnx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106
<Project Path="examples/ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost/CommunityToolkit.Aspire.Hosting.Ngrok.AppHost.csproj" />
107107
<Project Path="examples/ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.ServiceDefauls/CommunityToolkit.Aspire.Hosting.Ngrok.ServiceDefauls.csproj" />
108108
</Folder>
109-
<Folder Name="/examples/nodejs-ext/">
110-
<Project Path="examples/nodejs-ext/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.AppHost.csproj" />
109+
<Folder Name="/examples/javascript-ext/">
110+
<Project Path="examples/javascript-ext/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.AppHost.csproj" />
111111
</Folder>
112112
<Folder Name="/examples/ollama/">
113113
<Project Path="examples/ollama/CommunityToolkit.Aspire.Hosting.Ollama.AppHost/CommunityToolkit.Aspire.Hosting.Ollama.AppHost.csproj" />
@@ -184,7 +184,7 @@
184184
<Project Path="src/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.csproj" />
185185
<Project Path="src/CommunityToolkit.Aspire.Hosting.MySql.Extensions/CommunityToolkit.Aspire.Hosting.MySql.Extensions.csproj" />
186186
<Project Path="src/CommunityToolkit.Aspire.Hosting.Ngrok/CommunityToolkit.Aspire.Hosting.Ngrok.csproj" />
187-
<Project Path="src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.csproj" />
187+
<Project Path="src/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.csproj" />
188188
<Project Path="src/CommunityToolkit.Aspire.Hosting.Ollama/CommunityToolkit.Aspire.Hosting.Ollama.csproj" />
189189
<Project Path="src/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.csproj" />
190190
<Project Path="src/CommunityToolkit.Aspire.Hosting.PapercutSmtp/CommunityToolkit.Aspire.Hosting.PapercutSmtp.csproj" />
@@ -237,7 +237,7 @@
237237
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.Tests/CommunityToolkit.Aspire.Hosting.MongoDB.Extensions.Tests.csproj" />
238238
<Project Path="tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests/CommunityToolkit.Aspire.Hosting.MySql.Extensions.Tests.csproj" />
239239
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests/CommunityToolkit.Aspire.Hosting.Ngrok.Tests.csproj" />
240-
<Project Path="tests/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.Tests/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions.Tests.csproj" />
240+
<Project Path="tests/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.Tests/CommunityToolkit.Aspire.Hosting.JavaScript.Extensions.Tests.csproj" />
241241
<Project Path="tests/CommunityToolkit.Aspire.Hosting.Ollama.Tests/CommunityToolkit.Aspire.Hosting.Ollama.Tests.csproj" />
242242
<Project Path="tests/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.Tests/CommunityToolkit.Aspire.Hosting.OpenTelemetryCollector.Tests.csproj" />
243243
<Project Path="tests/CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests/CommunityToolkit.Aspire.Hosting.PapercutSmtp.Tests.csproj" />

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<Nullable>enable</Nullable>
1313

1414
<AspireMajorVersion>13</AspireMajorVersion>
15-
<AspireVersion>$(AspireMajorVersion).0.0-preview.1.25531.6</AspireVersion>
15+
<AspireVersion>$(AspireMajorVersion).0.0</AspireVersion>
1616
<AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
17-
<AspirePreviewSuffix>preview.1.25522.3</AspirePreviewSuffix>
17+
<AspirePreviewSuffix>preview.1.25560.3</AspirePreviewSuffix>
1818
<AspNetCoreVersion>9.0.0</AspNetCoreVersion>
19-
<DotNetExtensionsVersion>9.0.10</DotNetExtensionsVersion>
19+
<DotNetExtensionsVersion>10.0.0</DotNetExtensionsVersion>
2020
<OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
2121
<TestContainersVersion>4.7.0</TestContainersVersion>
2222
<MEAIVersion>9.9.0</MEAIVersion>
23-
<ServiceDiscoveryVersion>10.0.0-preview.1.25520.3</ServiceDiscoveryVersion>
23+
<ServiceDiscoveryVersion>10.0.0</ServiceDiscoveryVersion>
2424
<IsPackable>false</IsPackable>
2525
<MoqVersion>4.20.72</MoqVersion>
2626

‎Directory.Packages.props‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<PackageVersion Include="Aspire.Hosting.Dapr" Version="$(AspireVersion)" />
1212
<PackageVersion Include="Aspire.Hosting.Azure.AppContainers" Version="$(AspireVersion)" />
1313
<PackageVersion Include="Aspire.Hosting.Azure.Redis" Version="$(AspireVersion)" />
14-
<PackageVersion Include="Aspire.Hosting.Keycloak" Version="$(AspireVersion)" />
15-
<PackageVersion Include="Aspire.Keycloak.Authentication" Version="$(AspireVersion)" />
16-
<PackageVersion Include="Aspire.Hosting.NodeJS" Version="$(AspireVersion)" />
14+
<PackageVersion Include="Aspire.Hosting.Keycloak" Version="$(AspireVersion)-$(AspirePreviewSuffix)" />
15+
<PackageVersion Include="Aspire.Keycloak.Authentication" Version="$(AspireVersion)-$(AspirePreviewSuffix)" />
16+
<PackageVersion Include="Aspire.Hosting.JavaScript" Version="$(AspireVersion)" />
1717
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="$(AspireVersion)" />
1818
<PackageVersion Include="Aspire.Hosting.Python" Version="$(AspireVersion)" />
1919
<PackageVersion Include="Aspire.Hosting.Rabbitmq" Version="$(AspireVersion)" />
@@ -44,7 +44,7 @@
4444
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(DotNetExtensionsVersion)" />
4545
<PackageVersion Include="Microsoft.Extensions.Http" Version="$(DotNetExtensionsVersion)" />
4646
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetExtensionsVersion)" />
47-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
47+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.11" />
4848
<!-- .NET packages -->
4949
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" />
5050
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(ServiceDiscoveryVersion)" />
@@ -113,8 +113,5 @@
113113
<PackageVersion Include="Testcontainers" Version="$(TestContainersVersion)" />
114114
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestContainersVersion)" />
115115
</ItemGroup>
116-
<ItemGroup Label=".NET 9 Overrides" Condition="'$(TargetFramework)' == 'net9.0'">
117-
<PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
118-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.10" />
119-
</ItemGroup>
116+
120117
</Project>

0 commit comments

Comments
 (0)