Skip to content
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

[release/8.0] Start producing stable packages #3785

Merged
merged 5 commits into from
May 7, 2024
Merged

[release/8.0] Start producing stable packages #3785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
604164a
Start producing stable packages
joperezr Apr 17, 2024
7406fdf
Fix build issue due to incorrect handling of stable packages.
joperezr Apr 18, 2024
3f20874
Merge 'release/8.0' into StablePackages
joperezr May 6, 2024
912b009
Remove stable suppression now that it is no longer required
joperezr May 6, 2024
24a05b8
Fix incorrect package versions for helix tests
joperezr May 7, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PreReleaseVersionLabel>preview.8</PreReleaseVersionLabel>
<UseVSTestRunner>true</UseVSTestRunner>
<!-- 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
16 changes: 16 additions & 0 deletions tests/Aspire.EndToEnd.Tests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project>
<Import Project="..\Directory.Build.targets" />

<!-- Overriding this target which is originally defined in the Microsoft.Net.Runtime.WorkloadTesting.Internal package, given
it makes assumptions of which package version should be set when packages are being stabalized which is specific to the dotnet/runtime repo. -->
<Target Name="_SetPackageVersionForWorkloadsTesting">
<PropertyGroup>
<!-- Used for workload testing -->
<PackageVersionForWorkloadManifests>$(VersionPrefix)</PackageVersionForWorkloadManifests>
</PropertyGroup>

<Error Condition="'$(PackageVersionForWorkloadManifests)' == ''"
Text="%24(PackageVersionForWorkloadManifests) is not set. PackageVersion=$(PackageVersion)." />
</Target>
</Project>

79 changes: 43 additions & 36 deletions tests/testproject/Directory.Packages.Helix.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,49 @@
</PropertyGroup>
<Import Project="$(_DirectoryPackagesRepoProps)" Condition="Exists($(_DirectoryPackagesRepoProps))" />

<PropertyGroup>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<_PackageVersion>$(PackageVersion)</_PackageVersion>
<!-- If package versions are being stabilized, the version used shouldn't have the prerelease tag in it. -->
<_PackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">8.0.0</_PackageVersion>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Aspire.Confluent.Kafka" 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.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.Kafka" 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.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Seq" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.MongoDB.Driver" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.MySqlConnector" 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.RabbitMQ.Client" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Confluent.Kafka" 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.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.Kafka" 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.PostgreSQL" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Seq" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.MongoDB.Driver" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.MySqlConnector" 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.RabbitMQ.Client" Version="$(_PackageVersion)" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="$(_PackageVersion)" />
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions tests/testproject/TestProject.IntegrationServiceA/TestProject.IntegrationServiceA.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<!-- MongoDB.Driver package is unsigned, we ignore that warning on purpose -->
<NoWarn>$(NoWarn);CS8002</NoWarn>
<!-- MongoDB.Driver package is unsigned, we ignore that warning on purpose.
CA1305 Specify IFormatProvider -->
<NoWarn>$(NoWarn);CS8002;CA1305</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down