Update to Aspire 13.3 #985
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,13 +2,13 @@ | |
| <PropertyGroup> | ||
| <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled> | ||
| <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</ApiVersioningVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <!-- Version together with Aspire --> | ||
|
|
@@ -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="10.0.0-rc.1" /> | ||
| <!-- Version together with ASP.NET --> | ||
| <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(DotnetPackagesVersion)" /> | ||
| <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(DotnetPackagesVersion)" /> | ||
|
|
@@ -60,15 +60,15 @@ | |
| <!-- Xabaril packages --> | ||
| <PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" /> | ||
| <!-- AI --> | ||
| <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.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
There was a problem hiding this comment. OpenTelemetry package versions are now mixed ( |
||
| <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" /> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "appHost": { | ||
| "path": "src/eShop.AppHost/eShop.AppHost.csproj" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -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" /> | ||||||||
|
Member
Author
There was a problem hiding this comment. 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> | ||||||||
| <config> | ||||||||
| <add key="globalPackagesFolder" value=".nugetpackages" /> | ||||||||
| </config> | ||||||||
|
Comment on lines
+19
to
+21
There was a problem hiding this comment.
Suggested change
|
||||||||
| </configuration> | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,8 +38,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
|
Member
Author
There was a problem hiding this comment. @mikekistler @halter73 - I updated
Contributor
There was a problem hiding this comment. 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
We have a transformer that repaced |
||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -96,8 +98,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -152,8 +156,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -193,8 +199,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -285,8 +293,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -332,8 +342,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -379,8 +391,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -452,8 +466,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -494,8 +510,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -589,8 +607,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -671,8 +691,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -771,8 +793,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
@@ -857,8 +881,10 @@ | |
| "description": "The API version, in the format 'major.minor'.", | ||
| "required": true, | ||
| "schema": { | ||
| "enum": [ | ||
| "1.0" | ||
| ], | ||
| "type": "string" | ||
| } | ||
| } | ||
| ], | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <Project Sdk="Aspire.AppHost.Sdk/13.3.0"> | ||
|
|
||
| <PropertyGroup> | ||
| <OutputType>Exe</OutputType> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <Project Sdk="Aspire.AppHost.Sdk/13.3.0"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| <Project Sdk="Aspire.AppHost.Sdk/13.3.0"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ApiVersioningVersionwas bumped to10.0.0, butAsp.Versioning.OpenApiis pinned separately to10.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 aligningAsp.Versioning.OpenApito the same version property (or introduce a dedicatedApiVersioningOpenApiVersionproperty if it must differ) so the intent is explicit.