Skip to content

Update to Aspire 13.3 #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eerhardt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to Aspire 13.3 #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<DotnetPackagesVersion>10.0.5</DotnetPackagesVersion>
<MicrosoftExtensionsVersion>10.4.0</MicrosoftExtensionsVersion>
<AspireVersion>13.2.0</AspireVersion>
<AspireUnstablePackagesVersion>13.2.0-preview.1.26170.3</AspireUnstablePackagesVersion>
<DotnetPackagesVersion>10.0.7</DotnetPackagesVersion>
<MicrosoftExtensionsVersion>10.5.0</MicrosoftExtensionsVersion>
<AspireVersion>13.3.0</AspireVersion>
<AspireUnstablePackagesVersion>13.3.0-preview.1.26229.6</AspireUnstablePackagesVersion>
<GrpcVersion>2.76.0</GrpcVersion>
<DuendeVersion>7.3.1</DuendeVersion>
<ApiVersioningVersion>10.0.0-preview.2</ApiVersioningVersion>
<ApiVersioningVersion>10.0.0</ApiVersioningVersion>
</PropertyGroup>
<ItemGroup>
<!-- Version together with Aspire -->
Expand All @@ -26,7 +26,7 @@
<PackageVersion Include="Asp.Versioning.Http" Version="$(ApiVersioningVersion)" />
<PackageVersion Include="Asp.Versioning.Http.Client" Version="$(ApiVersioningVersion)" />
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="$(ApiVersioningVersion)" />
<PackageVersion Include="Asp.Versioning.OpenApi" Version="$(ApiVersioningVersion)" />
<PackageVersion Include="Asp.Versioning.OpenApi" Version="10.0.0-rc.1" />
Copy link

Copilot AI Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ApiVersioningVersion was bumped to 10.0.0, but Asp.Versioning.OpenApi is pinned separately to 10.0.0-rc.1. Having the Asp.Versioning packages on different release trains (stable vs RC) can lead to restore/compatibility issues and makes upgrades harder. Consider aligning Asp.Versioning.OpenApi to the same version property (or introduce a dedicated ApiVersioningOpenApiVersion property if it must differ) so the intent is explicit.

Suggested change
<PackageVersion Include="Asp.Versioning.OpenApi" Version="10.0.0-rc.1" />
<PackageVersion Include="Asp.Versioning.OpenApi" Version="$(ApiVersioningVersion)" />

Copilot uses AI. Check for mistakes.
<!-- Version together with ASP.NET -->
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(DotnetPackagesVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(DotnetPackagesVersion)" />
Expand Down Expand Up @@ -60,15 +60,15 @@
<!-- Xabaril packages -->
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<!-- AI -->
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="13.1.1" />
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.1.1" />
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Ollama" Version="13.2.1-beta.532" />
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.2.1-beta.532" />
<!-- Open Telemetry -->
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.15.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.15.1-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
Comment on lines 66 to +70
Copy link

Copilot AI Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OpenTelemetry package versions are now mixed (OpenTelemetry.Exporter.OpenTelemetryProtocol is still 1.15.0 while the hosting/instrumentation packages were bumped to 1.15.1–1.15.3). To reduce the chance of transitive dependency mismatches, consider aligning the exporter to the same patch level as the other OpenTelemetry packages (or document why it must remain at 1.15.0).

Copilot uses AI. Check for mistakes.
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
<!-- IdentityServer -->
<PackageVersion Include="Duende.IdentityServer" Version="7.3.2" />
<PackageVersion Include="Duende.IdentityServer.AspNetIdentity" Version="7.3.2" />
Expand Down
5 changes: 5 additions & 0 deletions aspire.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"appHost": {
"path": "src/eShop.AppHost/eShop.AppHost.csproj"
}
}
10 changes: 8 additions & 2 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<add key="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-aspire-be8c19e4/nuget/v3/index.json" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-aspire-be8c19e4/nuget/v3/index.json" />
Copy link
Copy Markdown
Member Author

@eerhardt eerhardt Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be reverted once 13.3 officially ships.

</packageSources>

<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<clear />
<packageSource key="nuget">
<package pattern="*" />
</packageSource>
<packageSource key="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-aspire-be8c19e4/nuget/v3/index.json">
<package pattern="Aspire*" />
</packageSource>
</packageSourceMapping>
</configuration>
<config>
<add key="globalPackagesFolder" value=".nugetpackages" />
</config>
Comment on lines +19 to +21
Copy link

Copilot AI Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

globalPackagesFolder is set to .nugetpackages, but this folder isn't currently ignored in .gitignore. That will typically create a large number of untracked files after restore. Either add .nugetpackages/ to .gitignore (preferred) or avoid overriding the global packages folder here if it's not required.

Suggested change
<config>
<add key="globalPackagesFolder" value=".nugetpackages" />
</config>

Copilot uses AI. Check for mistakes.
</configuration>
78 changes: 52 additions & 26 deletions src/Catalog.API/Catalog.API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
Copy link
Copy Markdown
Member Author

@eerhardt eerhardt Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikekistler @halter73 - I updated Asp.Versioning.* packages. Are these changes expected?

Copy link
Copy Markdown
Contributor

@mikekistler mikekistler May 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this is a recent change in the latest Asp.Versioning package:

https://github.com/dotnet/aspnet-api-versioning/releases/tag/v10.0.0

OpenAPI documents use "enum": ["1.0"] instead of "default": "1.0"

We have a transformer that repaced default with example. We should just update that to remove enum and add example.

"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -96,8 +98,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -152,8 +156,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -193,8 +199,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -285,8 +293,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -332,8 +342,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -379,8 +391,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -452,8 +466,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -494,8 +510,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -589,8 +607,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -671,8 +691,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -771,8 +793,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -857,8 +881,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "1.0"
"enum": [
"1.0"
],
"type": "string"
}
}
],
Expand Down
60 changes: 40 additions & 20 deletions src/Catalog.API/Catalog.API_v2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -96,8 +98,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -152,8 +156,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -191,8 +197,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -259,8 +267,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -351,8 +361,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -398,8 +410,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -445,8 +459,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -552,8 +568,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down Expand Up @@ -634,8 +652,10 @@
"description": "The API version, in the format 'major.minor'.",
"required": true,
"schema": {
"type": "string",
"example": "2.0"
"enum": [
"2.0"
],
"type": "string"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion src/eShop.AppHost/eShop.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.2.0">
<Project Sdk="Aspire.AppHost.Sdk/13.3.0">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion tests/Catalog.FunctionalTests/Catalog.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.2.0">
<Project Sdk="Aspire.AppHost.Sdk/13.3.0">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion tests/Ordering.FunctionalTests/Ordering.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Aspire.AppHost.Sdk/13.2.0">
<Project Sdk="Aspire.AppHost.Sdk/13.3.0">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
Expand Down
Loading