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
4 changes: 0 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet-extensions" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-988e9ee7/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="dotnet9-transport">
Expand All @@ -39,9 +38,6 @@
<packageSource key="dotnet-eng">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet-extensions">
<package pattern="Microsoft.Extensions.AI*" />
</packageSource>
</packageSourceMapping>
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- This repo version -->
<MajorVersion>9</MajorVersion>
<MinorVersion>3</MinorVersion>
<PatchVersion>0</PatchVersion>
<PatchVersion>1</PatchVersion>
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
<DefaultTargetFramework>net8.0</DefaultTargetFramework>
Expand Down
8 changes: 4 additions & 4 deletions tests/Aspire.Cli.Tests/Commands/AddCommandTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public async Task AddCommandSortsPackageVersions()
{
Id = "Aspire.Hosting.Redis",
Source = "nuget",
Version = "9.3.0"
Version = "9.3.1"
};

return (
Expand All @@ -154,7 +154,7 @@ public async Task AddCommandSortsPackageVersions()
Assert.Equal(0, exitCode);
Assert.Collection(
promptedPackages!,
p => Assert.Equal("9.3.0", p.Package.Version),
p => Assert.Equal("9.3.1", p.Package.Version),
p => Assert.Equal("9.2.0", p.Package.Version)
);
}
Expand Down Expand Up @@ -205,7 +205,7 @@ public async Task AddCommandSortsPackageVersionsWithPrerelease()
{
Id = "Aspire.Hosting.Redis",
Source = "nuget",
Version = "9.3.0"
Version = "9.3.1"
};

return (
Expand Down Expand Up @@ -233,7 +233,7 @@ public async Task AddCommandSortsPackageVersionsWithPrerelease()
Assert.Collection(
promptedPackages!,
p => Assert.Equal("9.4.0-preview1.1234", p.Package.Version),
p => Assert.Equal("9.3.0", p.Package.Version),
p => Assert.Equal("9.3.1", p.Package.Version),
p => Assert.Equal("9.2.0", p.Package.Version)
);
}
Expand Down
8 changes: 4 additions & 4 deletions tests/Aspire.Cli.Tests/Commands/NewCommandTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectly()
{
Id = "Aspire.ProjectTemplates",
Source = "nuget",
Version = "9.3.0"
Version = "9.3.1"
};

return (
Expand All @@ -299,7 +299,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectly()
Assert.NotNull(promptedPackages);
Assert.Collection(
promptedPackages,
package => Assert.Equal("9.3.0", package.Version),
package => Assert.Equal("9.3.1", package.Version),
package => Assert.Equal("9.2.0", package.Version)
);
}
Expand Down Expand Up @@ -349,7 +349,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectlyWithPrerelease
{
Id = "Aspire.ProjectTemplates",
Source = "nuget",
Version = "9.3.0"
Version = "9.3.1"
};

return (
Expand All @@ -372,7 +372,7 @@ public async Task NewCommandOrdersTemplatePackageVersionsCorrectlyWithPrerelease
Assert.Collection(
promptedPackages,
package => Assert.Equal("9.4.0-preview.1234", package.Version),
package => Assert.Equal("9.3.0", package.Version),
package => Assert.Equal("9.3.1", package.Version),
package => Assert.Equal("9.2.0", package.Version)
);
}
Expand Down
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="9.3.0" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="9.3.1" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />

<PropertyGroup>
<!-- 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="9.3.0" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<Import Project="Sdk.targets" Sdk="Aspire.AppHost.Sdk" Version="9.3.1" 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)" />
<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" />
<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.Azure.Data.Tables" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Messaging.EventHubs" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Messaging.ServiceBus" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Messaging.WebPubSub" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Search.Documents" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Security.KeyVault" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Storage.Queues" Version="9.3.1" />
<PackageVersion Include="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.1" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="9.3.1" />
<PackageVersion Include="Aspire.Elastic.Clients.Elasticsearch" Version="9.3.1" />

<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" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.AppConfiguration" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.ContainerRegistry" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.Functions" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Hosting.Azure.KeyVault" Version="9.3.0" />
<PackageVersion Include="Aspire.Hosting.Azure.OperationalInsights" Version="9.3.0" />
<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.Azure.KeyVault" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.OperationalInsights" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.PostgreSQL" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.Redis" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.ServiceBus" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.SignalR" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.Sql" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Azure.WebPubSub" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Docker" 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.Elasticsearch" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Garnet" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Kafka" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Keycloak" 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.Milvus" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.MongoDB" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.MySql" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Nats" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.NodeJs" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Oracle" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Orleans" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Python" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Qdrant" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="9.3.1" />
<PackageVersion Include="Aspire.AppHost.Sdk" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Seq" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.SqlServer" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Valkey" Version="9.3.1" />
<PackageVersion Include="Aspire.Hosting.Yarp" Version="$(PackageVersion)" />

<PackageVersion Include="Aspire.Keycloak.Authentication" 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.Microsoft.Azure.Cosmos" Version="9.3.1" />
<PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="9.3.1" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" Version="9.3.1" />
<PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="9.3.1" />
<PackageVersion Include="Aspire.Milvus.Client" 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="Aspire.MongoDB.Driver" Version="9.3.1" />
<PackageVersion Include="Aspire.MongoDB.Driver.v3" Version="9.3.1" />
<PackageVersion Include="Aspire.MySqlConnector" Version="9.3.1" />
<PackageVersion Include="Aspire.NATS.Net" Version="9.3.1" />
<PackageVersion Include="Aspire.Npgsql" Version="9.3.1" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.1" />
<PackageVersion Include="Aspire.Oracle.EntityFrameworkCore" Version="9.3.1" />
<PackageVersion Include="Aspire.Pomelo.EntityFrameworkCore.MySql" Version="9.3.1" />
<PackageVersion Include="Aspire.Qdrant.Client" Version="9.3.1" />
<PackageVersion Include="Aspire.RabbitMQ.Client" Version="9.3.1" />
<PackageVersion Include="Aspire.RabbitMQ.Client.v7" Version="9.3.1" />
<PackageVersion Include="Aspire.Seq" Version="9.3.1" />
<PackageVersion Include="Aspire.StackExchange.Redis" Version="9.3.1" />
<PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="9.3.1" />
<PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.3.1" />

<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" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.1" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Abstractions" Version="9.3.1" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Dns" Version="9.3.1" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.3.1" />
</ItemGroup>

<ItemGroup Label="For tests">
Expand Down