Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ concurrency:
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

env:
ASPIRE_CLI_VERSION: '13.4.6'
ASPIRE_CLI_VERSION: '13.5.0'
NODE_VERSION: '24.18.0'
Comment thread
IEvangelist marked this conversation as resolved.

jobs:
Expand Down Expand Up @@ -68,6 +68,7 @@ jobs:
global-json-file: ./build/global.json

- name: Print .NET info
working-directory: ./build
run: dotnet --info

- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
Expand Down Expand Up @@ -105,6 +106,7 @@ jobs:
# Trusting certs on Windows throws a prompt so will halt the build
if: runner.os == 'Linux'
shell: bash
working-directory: ./build
run: |
trust_dir="$HOME/.aspnet/dev-certs/trust"
echo "SSL_CERT_DIR=$trust_dir:/usr/lib/ssl/certs" >> "$GITHUB_ENV"
Expand All @@ -117,11 +119,13 @@ jobs:

- name: Build (Ubuntu)
if: runner.os == 'Linux'
run: ./build/build.sh -p:SkipTypeScriptRestore=true
working-directory: ./build
run: ./build.sh -p:SkipTypeScriptRestore=true

- name: Build (Windows)
if: runner.os == 'Windows'
run: .\build\build.cmd
working-directory: ./build
run: .\build.cmd

- name: Copy binlog files
if: always()
Expand Down Expand Up @@ -155,11 +159,12 @@ jobs:
# We only test on Ubuntu because Windows agents don't support Docker with WSL
if: runner.os == 'Linux'
timeout-minutes: 20
working-directory: ./tests
# Note that the space after the last double dash (--) is intentional
run: >
dotnet test ./tests/SamplesTests.slnx
dotnet test ./SamplesTests.slnx
--logger console --logger trx --logger GitHubActions
--results-directory ./TestResults --blame
--results-directory ../TestResults --blame
--
RunConfiguration.CollectSourceInformation=true

Expand Down
4 changes: 2 additions & 2 deletions samples/Metrics/MetricsApp.AppHost/MetricsApp.AppHost.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
<ProjectReference Include="..\MetricsApp\MetricsApp.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,9 +9,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.Redis" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.Redis" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
<ProjectReference Include="..\AspireShop.BasketService\AspireShop.BasketService.csproj" />
<ProjectReference Include="..\AspireShop.CatalogDbManager\AspireShop.CatalogDbManager.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" Version="2.83.0" />
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.83.0" />
<PackageReference Include="Aspire.StackExchange.Redis" Version="13.4.6" />
<PackageReference Include="Aspire.StackExchange.Redis" Version="13.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.4.6" />
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.5.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.4.6" />
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.5.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
14 changes: 7 additions & 7 deletions samples/aspire-with-azure-functions/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="13.4.6" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="13.5.0" />
<!-- Aspire Hosting -->
<PackageVersion Include="Aspire.Hosting.Azure.AppContainers" Version="13.4.6" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.4.6" />
<PackageVersion Include="Aspire.Hosting.Azure.Functions" Version="13.4.6" />
<PackageVersion Include="Aspire.Hosting.Azure.AppContainers" Version="13.5.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.5.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Functions" Version="13.5.0" />
<!-- Aspire Azure -->
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="13.4.6" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="13.4.6" />
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="13.5.0" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="13.5.0" />
<!-- Azure Functions -->
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.52.0" />
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.1" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,10 +9,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
<ProjectReference Include="..\AspireJavaScript.MinimalApi\AspireJavaScript.MinimalApi.csproj" />
<PackageReference Include="Aspire.Hosting.JavaScript" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.JavaScript" Version="13.5.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions samples/aspire-with-node/aspire.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"language": "typescript/nodejs"
},
"sdk": {
"version": "13.4.0"
"version": "13.5.0"
},
"profiles": {
"https": {
Expand All @@ -24,6 +24,6 @@
}
},
"packages": {
"Aspire.Hosting.JavaScript": "13.4.0"
"Aspire.Hosting.JavaScript": "13.5.0"
}
}
8 changes: 4 additions & 4 deletions samples/aspire-with-python/apphost.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#:sdk Aspire.AppHost.Sdk@13.4.6
#:package Aspire.Hosting.JavaScript@13.4.6
#:package Aspire.Hosting.Python@13.4.6
#:package Aspire.Hosting.Redis@13.4.6
#:sdk Aspire.AppHost.Sdk@13.5.0
#:package Aspire.Hosting.JavaScript@13.5.0
#:package Aspire.Hosting.Python@13.5.0
#:package Aspire.Hosting.Redis@13.5.0

var builder = DistributedApplication.CreateBuilder(args);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
<ProjectReference Include="..\ClientAppsIntegration.ApiService\ClientAppsIntegration.ApiService.csproj" />
<ProjectReference Include="..\ClientAppsIntegration.WinForms\ClientAppsIntegration.WinForms.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion samples/container-build/apphost.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#:sdk Aspire.AppHost.Sdk@13.4.6
#:sdk Aspire.AppHost.Sdk@13.5.0

using Microsoft.Extensions.Hosting;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -8,7 +8,7 @@
<UserSecretsId>00d08ee4-b2e0-4d12-827c-d131fda1c6f6</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Microsoft.Data.SqlClient" Version="13.4.6" />
<PackageReference Include="Aspire.Npgsql" Version="13.4.6" />
<PackageReference Include="Aspire.MySqlConnector" Version="13.4.6" />
<PackageReference Include="Aspire.Microsoft.Data.SqlClient" Version="13.5.0" />
<PackageReference Include="Aspire.Npgsql" Version="13.5.0" />
<PackageReference Include="Aspire.MySqlConnector" Version="13.5.0" />
<PackageReference Include="Dapper" Version="2.1.79" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.11" />
<PackageReference Include="Microsoft.OpenApi" Version="2.12.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -17,10 +17,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.MySql" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.MySql" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.4.6" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.5.0" />

<ProjectReference Include="..\DatabaseMigrations.ApiModel\DatabaseMigrations.ApiModel.csproj" />
<ProjectReference Include="..\DatabaseMigrations.ServiceDefaults\DatabaseMigrations.ServiceDefaults.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -9,11 +9,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.SqlServer" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="13.5.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
<ProjectReference Include="..\DatabaseMigrations.ApiService\DatabaseMigrations.ApiService.csproj" />
<ProjectReference Include="..\DatabaseMigrations.MigrationService\DatabaseMigrations.MigrationService.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.4.6" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.5.0" />
<ProjectReference Include="..\DatabaseMigrations.ApiModel\DatabaseMigrations.ApiModel.csproj" />
<ProjectReference Include="..\DatabaseMigrations.ServiceDefaults\DatabaseMigrations.ServiceDefaults.csproj" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/golang-api/aspire.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"language": "typescript/nodejs"
},
"sdk": {
"version": "13.4.0"
"version": "13.5.0"
},
"profiles": {
"https": {
Expand All @@ -16,6 +16,6 @@
}
},
"packages": {
"Aspire.Hosting.Docker": "13.4.0"
"Aspire.Hosting.Docker": "13.5.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.4.6">
<Project Sdk="Aspire.AppHost.Sdk/13.5.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -14,9 +14,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.Docker" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.Redis" Version="13.4.6" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.Docker" Version="13.5.0" />
<PackageReference Include="Aspire.Hosting.Redis" Version="13.5.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="13.4.6" />
<PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="13.5.0" />
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions samples/image-gallery/api/api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.8" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.4.0" />
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="13.4.0" />
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="13.4.0" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.5.0" />
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="13.5.0" />
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="13.5.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.14.11" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.10" />
<PackageReference Include="Microsoft.OpenApi" Version="2.11.0" />
Expand Down
10 changes: 5 additions & 5 deletions samples/image-gallery/apphost.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma warning disable ASPIRECSHARPAPPS001
#pragma warning disable ASPIREAZURE002

#:sdk Aspire.AppHost.Sdk@13.4.6
#:package Aspire.Hosting.Azure.Storage@13.4.6
#:package Aspire.Hosting.Azure.Sql@13.4.6
#:package Aspire.Hosting.JavaScript@13.4.6
#:package Aspire.Hosting.Azure.AppContainers@13.4.6
#:sdk Aspire.AppHost.Sdk@13.5.0
#:package Aspire.Hosting.Azure.Storage@13.5.0
#:package Aspire.Hosting.Azure.Sql@13.5.0
#:package Aspire.Hosting.JavaScript@13.5.0
#:package Aspire.Hosting.Azure.AppContainers@13.5.0

using Aspire.Hosting.Azure;
using Azure.Provisioning.AppContainers;
Expand Down
6 changes: 3 additions & 3 deletions samples/image-gallery/worker/worker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.8" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.4.0" />
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="13.4.0" />
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="13.4.0" />
<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="13.5.0" />
<PackageReference Include="Aspire.Azure.Storage.Blobs" Version="13.5.0" />
<PackageReference Include="Aspire.Azure.Storage.Queues" Version="13.5.0" />
<PackageReference Include="SkiaSharp" Version="3.119.1" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/maildev-mailkit/CSharpAppHost/CSharpAppHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting" Version="13.4.0" />
<PackageReference Include="Aspire.Hosting" Version="13.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading