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
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<MicrosoftTestingPlatformVersion>1.6.3</MicrosoftTestingPlatformVersion>
<MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
</PropertyGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<PackageReference Include="Azure.Provisioning.KeyVault" />
<PackageReference Include="Azure.Provisioning.Storage" />
<ProjectReference Include="..\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" />
<ProjectReference Include="..\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<PackageReference Include="Azure.Provisioning.AppService" />
<PackageReference Include="Azure.Provisioning.ContainerRegistry" />
<ProjectReference Include="..\Aspire.Hosting.Azure\Aspire.Hosting.Azure.csproj" />
<ProjectReference Include="..\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions tests/Shared/RepoTesting/Aspire.RepoTesting.targets
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
`AspireProjectOrPackageReference` - maps to projects in `src/` or `src/Components/`
-->

<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="$(PackageVersion)" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="9.3.0" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
Copy link
Member

Choose a reason for hiding this comment

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

Do we do this hardcoding every time?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'd love for that not to be the case but we haven't made the work to fix it. Main issue is that PackageVersion can't be used as that is a variable that changes depending on the project you are building, so when you are emitting a reference (like in this case or in the Directory.Packages.Helix.props) to a different package getting built, you don't want to use PackageVersion (as that is the package version of the project getting built) and instead you want to have a way to call a target into that reference to know whether or not that specific reference should be stable or not.

This is not super trivial and we haven't been able to prioritize it, so for now, we have to hard code each time we stabilize, but I'd love to not have to do this in the future :)


<PropertyGroup>
Comment on lines +36 to 38
Copy link

Copilot AI May 13, 2025

Choose a reason for hiding this comment

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

[nitpick] Hardcoding the SDK version can lead to more churn each release. Consider referencing a centralized version property (e.g., $(AspireSdkVersion)) to DRY up the files.

Suggested change
<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="9.3.0" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<PropertyGroup>
<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="$(AspireSdkVersion)" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<PropertyGroup>
<AspireSdkVersion>9.3.0</AspireSdkVersion>

Copilot uses AI. Check for mistakes.
<!-- copy by default only when archiving tests, and for test projects that support running out of repo -->
Expand Down Expand Up @@ -160,6 +160,6 @@
<AspireHostingSDKVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</AspireHostingSDKVersion>
</PropertyGroup>

<Import Project="Sdk.targets" Sdk="Aspire.AppHost.Sdk" Version="$(PackageVersion)" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<Import Project="Sdk.targets" Sdk="Aspire.AppHost.Sdk" Version="9.3.0" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />

</Project>
144 changes: 72 additions & 72 deletions tests/Shared/RepoTesting/Directory.Packages.Helix.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,88 +3,88 @@

<ItemGroup Label="Aspire packages">
<PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(PackageVersion)" />
Copy link
Member

Choose a reason for hiding this comment

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

Why no update here?

Copy link
Member Author

Choose a reason for hiding this comment

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

<PackageVersion Include="Aspire.Azure.Data.Tables" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Messaging.EventHubs" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Messaging.ServiceBus" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Messaging.WebPubSub" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Search.Documents" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Security.KeyVault" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Elastic.Clients.Elasticsearch" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Messaging.EventHubs" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Messaging.ServiceBus" Version="9.3.0" />
Copy link
Member

Choose a reason for hiding this comment

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

Same q here

<PackageVersion Include="Aspire.Azure.Messaging.WebPubSub" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Search.Documents" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Security.KeyVault" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="9.3.0" />
<PackageVersion Include="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.0" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="9.3.0" />
<PackageVersion Include="Aspire.Elastic.Clients.Elasticsearch" Version="9.3.0" />

<PackageVersion Include="Aspire.Hosting" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.AppConfiguration" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.AppConfiguration" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.ContainerRegistry" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Functions" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.KeyVault" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.OperationalInsights" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Redis" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.ServiceBus" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.SignalR" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Sql" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.WebPubSub" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.KeyVault" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.OperationalInsights" Version="9.3.0" />
Comment on lines 4 to +29
Copy link

Copilot AI May 13, 2025

Choose a reason for hiding this comment

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

[nitpick] The version literal 9.3.0 is duplicated across many lines. Extract this into a shared MSBuild property to reduce repetition and simplify future updates.

Copilot uses AI. Check for mistakes.
<PackageVersion Include="Aspire.Hosting.Azure.PostgreSQL" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Redis" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.ServiceBus" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.SignalR" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Sql" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.WebPubSub" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Docker" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Elasticsearch" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Garnet" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Kafka" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Elasticsearch" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Garnet" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Kafka" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Keycloak" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Milvus" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.MongoDB" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.MySql" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Nats" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Oracle" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Orleans" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Python" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Qdrant" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.AppHost.Sdk" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Seq" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Valkey" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Milvus" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.MongoDB" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.MySql" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Nats" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Oracle" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Orleans" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Python" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Qdrant" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.3.0" />
<PackageVersion Include="Aspire.AppHost.Sdk" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Seq" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Valkey" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Yarp" Version="$(PackageVersion)" />

<PackageVersion Include="Aspire.Keycloak.Authentication" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="9.3.0" />
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="9.3.0" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" Version="9.3.0" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.3.0" />
<PackageVersion Include="Aspire.Milvus.Client" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.MongoDB.Driver" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.MongoDB.Driver.v3" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.MySqlConnector" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.NATS.Net" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Npgsql" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Oracle.EntityFrameworkCore" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Pomelo.EntityFrameworkCore.MySql" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Qdrant.Client" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.RabbitMQ.Client.v7" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Seq" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.MongoDB.Driver" Version="9.3.0" />
<PackageVersion Include="Aspire.MongoDB.Driver.v3" Version="9.3.0" />
<PackageVersion Include="Aspire.MySqlConnector" Version="9.3.0" />
<PackageVersion Include="Aspire.NATS.Net" Version="9.3.0" />
<PackageVersion Include="Aspire.Npgsql" Version="9.3.0" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.0" />
<PackageVersion Include="Aspire.Oracle.EntityFrameworkCore" Version="9.3.0" />
<PackageVersion Include="Aspire.Pomelo.EntityFrameworkCore.MySql" Version="9.3.0" />
<PackageVersion Include="Aspire.Qdrant.Client" Version="9.3.0" />
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="9.3.0" />
<PackageVersion Include="Aspire.RabbitMQ.Client.v7" Version="9.3.0" />
<PackageVersion Include="Aspire.Seq" Version="9.3.0" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="9.3.0" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.3.0" />
<PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.3.0" />

<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Abstractions" Version="$(PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Dns" Version="$(PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(PackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Abstractions" Version="9.3.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Dns" Version="9.3.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.3.0" />
</ItemGroup>

<ItemGroup Label="For tests">
Expand Down