Skip to content

Commit 1812ef6

Browse files
joperezrjoperezr
committed
Merged PR 44427: Merge changes from release/9.0 into internal/release/9.0
#### AI description (iteration 1) #### PR Classification Code cleanup and dependency updates. #### PR Summary This pull request merges changes from `release/9.0` into `internal/release/9.0`, addressing several work items related to security, dependency updates, and code cleanup. - Removed `MilvusClient` creation logic and health checks from `src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs`. - Updated various package dependencies in `Directory.Packages.props` and `eng/Version.Details.xml`. - Added `AssemblyInfo.cs` to `src/Aspire.Hosting.Python` to mark it as experimental. - Updated container image tags in `src/Aspire.Hosting.Milvus`, `src/Aspire.Hosting.MySql`, `src/Aspire.Hosting.Elasticsearch`, and `src/Aspire.Hosting.Keycloak`. - Removed deprecated package references and suppressed final package version in `src/Aspire.Hosting.Milvus/Aspire.Hosting.Milvus.csproj`. Related work items: #5994, #6054, #6298, #6377, #6417, #6435, #6451, #6460, #6498
2 parents de77d2a + 6f5e1a0 commit 1812ef6

File tree

60 files changed

+413
-434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+413
-434
lines changed

‎Directory.Packages.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
88
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
99
<TestcontainersPackageVersion>3.10.0</TestcontainersPackageVersion>
10-
<AzureProvisiongVersion>1.0.0-beta.1</AzureProvisiongVersion>
10+
<AzureProvisiongVersion>1.0.0</AzureProvisiongVersion>
1111
</PropertyGroup>
1212
<ItemGroup>
1313
<!-- AWS SDK for .NET dependencies -->
1414
<PackageVersion Include="AspNetCore.HealthChecks.Oracle" Version="8.0.1" />
15-
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.28" />
16-
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.28" />
17-
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.28" />
18-
<PackageVersion Include="AWSSDK.Core" Version="3.7.400.28" />
15+
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.36" />
16+
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.36" />
17+
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.36" />
18+
<PackageVersion Include="AWSSDK.Core" Version="3.7.400.36" />
1919
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
2020
<PackageVersion Include="AWS.Messaging" Version="0.9.2" />
2121
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.6" />
@@ -31,11 +31,11 @@
3131
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
3232
<PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
3333
<PackageVersion Include="Azure.Messaging.WebPubSub" Version="1.4.0" />
34-
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
34+
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
3535
<PackageVersion Include="Azure.Storage.Blobs" Version="12.22.2" />
3636
<PackageVersion Include="Azure.Storage.Queues" Version="12.20.1" />
3737
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
38-
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.44.0" />
38+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.44.1" />
3939
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.28.0" />
4040
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.6" />
4141
<!-- Azure Management SDK for .NET dependencies -->
@@ -106,14 +106,14 @@
106106
<!-- NuGet dependencies -->
107107
<PackageVersion Include="NuGet.ProjectModel" Version="6.11.1" />
108108
<!-- external dependencies -->
109-
<PackageVersion Include="Confluent.Kafka" Version="2.5.3" />
109+
<PackageVersion Include="Confluent.Kafka" Version="2.6.0" />
110110
<PackageVersion Include="Dapper" Version="2.1.44" />
111111
<PackageVersion Include="DnsClient" Version="1.8.0" />
112-
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.15.8" />
112+
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.15.10" />
113113
<PackageVersion Include="Google.Protobuf" Version="3.28.2" />
114114
<PackageVersion Include="Grpc.AspNetCore" Version="2.66.0" />
115115
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.66.0" />
116-
<PackageVersion Include="Grpc.Tools" Version="2.66.0" />
116+
<PackageVersion Include="Grpc.Tools" Version="2.67.0" />
117117
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
118118
<PackageVersion Include="KubernetesClient" Version="15.0.1" />
119119
<PackageVersion Include="JsonPatch.Net" Version="3.1.1" />
@@ -125,22 +125,22 @@
125125
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.5.0" />
126126
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" />
127127
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
128-
<PackageVersion Include="NATS.Net" Version="2.4.0" />
129-
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.4" />
128+
<PackageVersion Include="NATS.Net" Version="2.5.1" />
129+
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.5" />
130130
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLPackageVersion)" />
131131
<PackageVersion Include="OpenAI" Version="2.0.0" />
132-
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.50" />
133-
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.5.0" />
132+
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.60" />
133+
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.6.0" />
134134
<PackageVersion Include="Polly.Core" Version="8.4.2" />
135135
<PackageVersion Include="Polly.Extensions" Version="8.4.2" />
136136
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
137-
<PackageVersion Include="Qdrant.Client" Version="1.11.0" />
137+
<PackageVersion Include="Qdrant.Client" Version="1.12.0" />
138138
<PackageVersion Include="RabbitMQ.Client" Version="[6.8.1,7.0.0)" />
139139
<PackageVersion Include="StackExchange.Redis" Version="2.8.16" />
140140
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
141141
<PackageVersion Include="Yarp.ReverseProxy" Version="2.2.0" />
142142
<!-- Open Telemetry -->
143-
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.4" />
143+
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.5" />
144144
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
145145
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
146146
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
@@ -157,15 +157,15 @@
157157
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
158158
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24324.3" />
159159
<!-- unit test dependencies -->
160-
<PackageVersion Include="bUnit" Version="1.31.3" />
160+
<PackageVersion Include="bUnit" Version="1.33.3" />
161161
<PackageVersion Include="JsonSchema.Net" Version="7.2.3" />
162162
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
163163
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorPackageVersion)" />
164164
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
165165
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)" />
166166
<PackageVersion Include="Microsoft.NET.Runtime.WorkloadTesting.Internal" Version="$(MicrosoftNETRuntimeWorkloadTestingInternalVersion)" />
167167
<PackageVersion Include="Microsoft.Playwright" Version="1.47.0" />
168-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.8.1" />
168+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
169169
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
170170
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
171171
<PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5050
<Sha>eddf880ac57b7f2c79a77592e3e6d24d1d02f112</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0">
52+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
54+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0">
56+
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
58+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0">
60+
<Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.1">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
62+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.Extensions.Http" Version="8.0.0">
64+
<Dependency Name="Microsoft.Extensions.Http" Version="8.0.1">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
66+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
6767
</Dependency>
68-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0">
68+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
70+
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
7171
</Dependency>
7272
<Dependency Name="Microsoft.Extensions.Options" Version="8.0.2">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>8.0.11</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
6868
<MicrosoftEntityFrameworkCoreToolsPackageVersion>8.0.11</MicrosoftEntityFrameworkCoreToolsPackageVersion>
6969
<MicrosoftNETRuntimeWorkloadTestingInternalVersion>9.0.0-preview.5.24272.3</MicrosoftNETRuntimeWorkloadTestingInternalVersion>
70-
<NpgsqlEntityFrameworkCorePostgreSQLPackageVersion>8.0.8</NpgsqlEntityFrameworkCorePostgreSQLPackageVersion>
70+
<NpgsqlEntityFrameworkCorePostgreSQLPackageVersion>8.0.10</NpgsqlEntityFrameworkCorePostgreSQLPackageVersion>
7171
<!-- for templates -->
7272
<MicrosoftAspNetCorePackageVersionForNet9>9.0.0</MicrosoftAspNetCorePackageVersionForNet9>
7373
<!-- System dependencies -->

‎playground/AzureContainerApps/AzureContainerApps.AppHost/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
app.ConfigureCustomDomain(customDomain, certificateName);
4343

4444
// Scale to 0
45-
app.Template.Value!.Scale.Value!.MinReplicas = 0;
45+
app.Template.Scale.MinReplicas = 0;
4646
});
4747

4848
#if !SKIP_DASHBOARD_REFERENCE

‎playground/bicep/BicepSample.AppHost/redis.module.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ resource redis 'Microsoft.Cache/redis@2024-03-01' = {
1515
capacity: 1
1616
}
1717
enableNonSslPort: false
18+
disableAccessKeyAuthentication: true
1819
minimumTlsVersion: '1.2'
1920
redisConfiguration: {
2021
'aad-enabled': 'true'
2122
}
22-
disableAccessKeyAuthentication: 'true'
2323
}
2424
tags: {
2525
'aspire-resource-name': 'redis'

‎playground/cdk/CdkSample.AppHost/Program.cs‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Azure.Provisioning.ApplicationInsights;
5-
using Azure.Provisioning.Expressions;
65
using Azure.Provisioning.KeyVault;
76
using Azure.Provisioning.OperationalInsights;
87
using Azure.Provisioning.ServiceBus;
@@ -17,7 +16,7 @@
1716
var storage = builder.AddAzureStorage("storage")
1817
.ConfigureInfrastructure(infrastructure =>
1918
{
20-
var account = infrastructure.GetResources().OfType<StorageAccount>().Single();
19+
var account = infrastructure.GetProvisionableResources().OfType<StorageAccount>().Single();
2120
account.Sku = new StorageSku() { Name = sku.AsProvisioningParameter(infrastructure) };
2221
account.Location = locationOverride.AsProvisioningParameter(infrastructure);
2322
});
@@ -30,7 +29,7 @@
3029
var keyvault = builder.AddAzureKeyVault("mykv")
3130
.ConfigureInfrastructure(infrastructure =>
3231
{
33-
var keyVault = infrastructure.GetResources().OfType<KeyVaultService>().Single();
32+
var keyVault = infrastructure.GetProvisionableResources().OfType<KeyVaultService>().Single();
3433
var secret = new KeyVaultSecret("mysecret")
3534
{
3635
Parent = keyVault,
@@ -55,26 +54,22 @@
5554
.AddQueue("queue1")
5655
.ConfigureInfrastructure(infrastructure =>
5756
{
58-
var queue = infrastructure.GetResources().OfType<ServiceBusQueue>().Single(q => q.IdentifierName == "queue1");
57+
var queue = infrastructure.GetProvisionableResources().OfType<ServiceBusQueue>().Single(q => q.BicepIdentifier == "queue1");
5958
queue.MaxDeliveryCount = 5;
60-
queue.LockDuration = new StringLiteral("PT5M");
61-
// TODO: this should be
62-
// queue.LockDuration = TimeSpan.FromMinutes(5);
59+
queue.LockDuration = TimeSpan.FromMinutes(5);
6360
})
6461
.AddTopic("topic1")
6562
.ConfigureInfrastructure(infrastructure =>
6663
{
67-
var topic = infrastructure.GetResources().OfType<ServiceBusTopic>().Single(q => q.IdentifierName == "topic1");
64+
var topic = infrastructure.GetProvisionableResources().OfType<ServiceBusTopic>().Single(q => q.BicepIdentifier == "topic1");
6865
topic.EnablePartitioning = true;
6966
})
7067
.AddTopic("topic2")
7168
.AddSubscription("topic1", "subscription1")
7269
.ConfigureInfrastructure(infrastructure =>
7370
{
74-
var subscription = infrastructure.GetResources().OfType<ServiceBusSubscription>().Single(q => q.IdentifierName == "subscription1");
75-
subscription.LockDuration = new StringLiteral("PT5M");
76-
// TODO: this should be
77-
//subscription.LockDuration = TimeSpan.FromMinutes(5);
71+
var subscription = infrastructure.GetProvisionableResources().OfType<ServiceBusSubscription>().Single(q => q.BicepIdentifier == "subscription1");
72+
subscription.LockDuration = TimeSpan.FromMinutes(5);
7873
subscription.RequiresSession = true;
7974
})
8075
.AddSubscription("topic1", "subscription2")
@@ -89,7 +84,7 @@
8984
var logAnalyticsWorkspace = builder.AddAzureLogAnalyticsWorkspace("logAnalyticsWorkspace")
9085
.ConfigureInfrastructure(infrastructure =>
9186
{
92-
var logAnalyticsWorkspace = infrastructure.GetResources().OfType<OperationalInsightsWorkspace>().Single();
87+
var logAnalyticsWorkspace = infrastructure.GetProvisionableResources().OfType<OperationalInsightsWorkspace>().Single();
9388
logAnalyticsWorkspace.Sku = new OperationalInsightsWorkspaceSku()
9489
{
9590
Name = OperationalInsightsWorkspaceSkuName.PerNode
@@ -99,7 +94,7 @@
9994
var appInsights = builder.AddAzureApplicationInsights("appInsights", logAnalyticsWorkspace)
10095
.ConfigureInfrastructure(infrastructure =>
10196
{
102-
var appInsights = infrastructure.GetResources().OfType<ApplicationInsightsComponent>().Single();
97+
var appInsights = infrastructure.GetProvisionableResources().OfType<ApplicationInsightsComponent>().Single();
10398
appInsights.IngestionMode = ComponentIngestionMode.LogAnalytics;
10499
});
105100

‎playground/cdk/CdkSample.AppHost/cache.module.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ resource cache 'Microsoft.Cache/redis@2024-03-01' = {
1515
capacity: 1
1616
}
1717
enableNonSslPort: false
18+
disableAccessKeyAuthentication: true
1819
minimumTlsVersion: '1.2'
1920
redisConfiguration: {
2021
'aad-enabled': 'true'
2122
}
22-
disableAccessKeyAuthentication: 'true'
2323
}
2424
tags: {
2525
'aspire-resource-name': 'cache'

‎playground/python/Python.AppHost/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4+
#pragma warning disable ASPIREHOSTINGPYTHON001 // Test for experimental feature
5+
46
var builder = DistributedApplication.CreateBuilder(args);
57

68
builder.AddPythonApp("script-only", "../script_only", "main.py");

0 commit comments

Comments
 (0)