From 7a4390c2b82c628f9ab94a3f22ef414a3f8b4826 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 4 Oct 2024 23:21:51 -0700 Subject: [PATCH 1/5] Branding changes for 8.2.2 and fix CG alert (#5994) --- Directory.Packages.props | 1 + eng/Versions.props | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f39570e11d0..7eb3e45bdc7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -174,5 +174,6 @@ + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 89565071d4c..2673232003f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,8 +3,8 @@ 8 2 - 1 - 8.2.1 + 2 + 8.2.2 preview.1 - + true diff --git a/eng/apicompat/PublicApiAnalyzer.targets b/eng/apicompat/PublicApiAnalyzer.targets index 19d5483bcfe..81ca3e242e4 100644 --- a/eng/apicompat/PublicApiAnalyzer.targets +++ b/eng/apicompat/PublicApiAnalyzer.targets @@ -1,9 +1,9 @@ - + - \ No newline at end of file + From 2c38f6c884b5026a7f278cdfe6e1f816810093f9 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 19 Oct 2024 21:24:03 -0700 Subject: [PATCH 3/5] [release/8.2] Update dependencies (#6377) --- Directory.Packages.props | 84 +++++------ eng/Version.Details.xml | 94 +++++++----- eng/Versions.props | 44 +++--- .../bicep/BicepSample.ApiService/Program.cs | 4 +- .../AzureStorageExtensions.cs | 2 +- .../ElasticsearchContainerImageTags.cs | 2 +- .../KafkaContainerImageTags.cs | 2 +- .../KeycloakContainerImageTags.cs | 2 +- .../MilvusContainerImageTags.cs | 2 +- .../MongoDBContainerImageTags.cs | 2 +- .../MySqlContainerImageTags.cs | 2 +- .../PostgresContainerImageTags.cs | 6 +- .../QdrantContainerImageTags.cs | 2 +- .../RabbitMQContainerImageTags.cs | 2 +- .../AspireAzureOpenAIExtensions.cs | 4 +- .../Aspire.EndToEnd.Tests.csproj | 2 +- .../Directory.Packages.Helix.props | 134 +++++++++--------- 17 files changed, 205 insertions(+), 185 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7eb3e45bdc7..f5dbedf3d7b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,33 +6,33 @@ true true - 3.9.0 + 3.10.0 - - - - + + + + - + - + - + - - - - - - - + + + + + + + @@ -93,41 +93,41 @@ - + - + - - - - - + + + + + - - + + - + - - - - - - - + + + + + + + - + - + - + @@ -144,14 +144,14 @@ - - + + - - + + @@ -170,10 +170,10 @@ - - + + - \ No newline at end of file + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b084da2e9d..8edeea35b2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,17 +29,17 @@ https://github.com/microsoft/usvc-apiserver 321c1a348e169663d287109df1f3e4f9acbc2268 - - https://github.com/dotnet/extensions - 544b8d5c8de9ed4940c5f39457256d090b8ffbfb + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 2d7ad3a50441dca3e5d90be59b82859410187d90 - - https://github.com/dotnet/extensions - 544b8d5c8de9ed4940c5f39457256d090b8ffbfb + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 2d7ad3a50441dca3e5d90be59b82859410187d90 - - https://github.com/dotnet/extensions - 544b8d5c8de9ed4940c5f39457256d090b8ffbfb + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 2d7ad3a50441dca3e5d90be59b82859410187d90 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -49,25 +49,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime eddf880ac57b7f2c79a77592e3e6d24d1d02f112 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -81,41 +81,61 @@ https://github.com/dotnet/runtime b83186a969946f61c71ad0da034936fac9947752 - + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore + 4315fa43c9573671f8f5be21497d59f9c99cd829 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a97f6ffcf78100056683c8c3b116721a89e5c58c + 4315fa43c9573671f8f5be21497d59f9c99cd829 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a97f6ffcf78100056683c8c3b116721a89e5c58c + 4315fa43c9573671f8f5be21497d59f9c99cd829 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a97f6ffcf78100056683c8c3b116721a89e5c58c + 4315fa43c9573671f8f5be21497d59f9c99cd829 diff --git a/eng/Versions.props b/eng/Versions.props index 2673232003f..d39cd83bba4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,33 +33,33 @@ 8.0.0-beta.24413.2 8.0.0-beta.24413.2 8.0.0-beta.24413.2 - 8.9.1 - 8.9.1 + 8.10.0 + 8.10.0 8.0.0 8.0.2 - 8.0.1 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.1 + 8.0.2 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.2 8.0.2 8.0.0 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 - 8.9.1 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.10.0 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 9.0.0-preview.5.24272.3 diff --git a/playground/bicep/BicepSample.ApiService/Program.cs b/playground/bicep/BicepSample.ApiService/Program.cs index de60f3c4459..a040ed6c5b8 100644 --- a/playground/bicep/BicepSample.ApiService/Program.cs +++ b/playground/bicep/BicepSample.ApiService/Program.cs @@ -179,7 +179,7 @@ var message = await queue.ReceiveMessageAsync(cancellationToken: cancellationToken); if (message != null) { - entries.Add(message.Value.Body.ToObjectFromJson()); + entries.Add(message.Value.Body.ToObjectFromJson()!); } return entries; @@ -199,7 +199,7 @@ var message = await receiver.ReceiveMessageAsync(cancellationToken: cancellationToken); if (message != null) { - entries.Add(message.Body.ToObjectFromJson()); + entries.Add(message.Body.ToObjectFromJson()!); } return entries; diff --git a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs index 6bbc64c21a7..6c1a33f5838 100644 --- a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs +++ b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs @@ -115,7 +115,7 @@ public static IResourceBuilder RunAsEmulator(this IResourc { Registry = "mcr.microsoft.com", Image = "azure-storage/azurite", - Tag = "3.31.0" + Tag = "3.32.0" }); if (configureContainer != null) diff --git a/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs b/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs index 7bc37ef04ad..bbc8dcd9de4 100644 --- a/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs +++ b/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs @@ -7,6 +7,6 @@ internal static class ElasticsearchContainerImageTags { public const string Registry = "docker.io"; public const string Image = "library/elasticsearch"; - public const string Tag = "8.15.1"; + public const string Tag = "8.15.3"; } diff --git a/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs b/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs index 5883e703414..cf6530aeee4 100644 --- a/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs +++ b/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs @@ -7,7 +7,7 @@ internal static class KafkaContainerImageTags { public const string Registry = "docker.io"; public const string Image = "confluentinc/confluent-local"; - public const string Tag = "7.7.0"; + public const string Tag = "7.7.1"; public const string KafkaUiImage = "provectuslabs/kafka-ui"; public const string KafkaUiTag = "v0.7.2"; } diff --git a/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs b/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs index 060abb8397c..f1725953b67 100644 --- a/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs +++ b/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs @@ -7,5 +7,5 @@ internal static class KeycloakContainerImageTags { public const string Registry = "quay.io"; public const string Image = "keycloak/keycloak"; - public const string Tag = "25.0"; + public const string Tag = "26.0"; } diff --git a/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs b/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs index ae3ebe3c0ea..7c49f09da80 100644 --- a/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs +++ b/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs @@ -7,7 +7,7 @@ internal static class MilvusContainerImageTags { public const string Registry = "docker.io"; public const string Image = "milvusdb/milvus"; - public const string Tag = "v2.4.10"; + public const string Tag = "v2.4.13"; public const string AttuImage = "zilliz/attu"; public const string AttuTag = "v2.4"; diff --git a/src/Aspire.Hosting.MongoDB/MongoDBContainerImageTags.cs b/src/Aspire.Hosting.MongoDB/MongoDBContainerImageTags.cs index 453d207112e..8d29203ec0e 100644 --- a/src/Aspire.Hosting.MongoDB/MongoDBContainerImageTags.cs +++ b/src/Aspire.Hosting.MongoDB/MongoDBContainerImageTags.cs @@ -7,7 +7,7 @@ internal static class MongoDBContainerImageTags { public const string Registry = "docker.io"; public const string Image = "library/mongo"; - public const string Tag = "7.0"; + public const string Tag = "8.0"; public const string MongoExpressRegistry = "docker.io"; public const string MongoExpressImage = "library/mongo-express"; public const string MongoExpressTag = "1.0"; diff --git a/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs b/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs index fa86dc6ae1f..5bd0e43b450 100644 --- a/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs +++ b/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs @@ -7,7 +7,7 @@ internal static class MySqlContainerImageTags { public const string Registry = "docker.io"; public const string Image = "library/mysql"; - public const string Tag = "9.0"; + public const string Tag = "9.1"; public const string PhpMyAdminImage = "library/phpmyadmin"; public const string PhpMyAdminTag = "5.2"; diff --git a/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs b/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs index 35b74e85622..9d1da42bac0 100644 --- a/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs +++ b/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs @@ -7,11 +7,11 @@ internal static class PostgresContainerImageTags { public const string Registry = "docker.io"; public const string Image = "library/postgres"; - public const string Tag = "16.4"; + public const string Tag = "17.0"; public const string PgAdminRegistry = "docker.io"; public const string PgAdminImage = "dpage/pgadmin4"; - public const string PgAdminTag = "8.11"; + public const string PgAdminTag = "8.12"; public const string PgWebRegistry = "docker.io"; public const string PgWebImage = "sosedoff/pgweb"; - public const string PgWebTag = "0.15.0"; + public const string PgWebTag = "0.16.1"; } diff --git a/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs b/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs index ef843c1e9a4..bfa50d71207 100644 --- a/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs +++ b/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs @@ -7,5 +7,5 @@ internal static class QdrantContainerImageTags { public const string Registry = "docker.io"; public const string Image = "qdrant/qdrant"; - public const string Tag = "v1.11.3"; + public const string Tag = "v1.12.1"; } diff --git a/src/Aspire.Hosting.RabbitMQ/RabbitMQContainerImageTags.cs b/src/Aspire.Hosting.RabbitMQ/RabbitMQContainerImageTags.cs index 2b5227d3542..e0f12b09465 100644 --- a/src/Aspire.Hosting.RabbitMQ/RabbitMQContainerImageTags.cs +++ b/src/Aspire.Hosting.RabbitMQ/RabbitMQContainerImageTags.cs @@ -7,6 +7,6 @@ internal static class RabbitMQContainerImageTags { public const string Registry = "docker.io"; public const string Image = "library/rabbitmq"; - public const string Tag = "3.13"; + public const string Tag = "4.0"; public const string TagManagement = $"{Tag}-management"; } diff --git a/src/Components/Aspire.Azure.AI.OpenAI/AspireAzureOpenAIExtensions.cs b/src/Components/Aspire.Azure.AI.OpenAI/AspireAzureOpenAIExtensions.cs index 78b7941be09..298a1ca3b06 100644 --- a/src/Components/Aspire.Azure.AI.OpenAI/AspireAzureOpenAIExtensions.cs +++ b/src/Components/Aspire.Azure.AI.OpenAI/AspireAzureOpenAIExtensions.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.ClientModel; using Aspire.Azure.AI.OpenAI; using Aspire.Azure.Common; -using Azure; using Azure.AI.OpenAI; using Azure.Core; using Azure.Core.Extensions; @@ -90,7 +90,7 @@ protected override IAzureClientBuilder $(NetCurrent) - 8.2.1 + 8.2.2 false diff --git a/tests/Shared/RepoTesting/Directory.Packages.Helix.props b/tests/Shared/RepoTesting/Directory.Packages.Helix.props index 67c6e832d03..ed8992d0ec7 100644 --- a/tests/Shared/RepoTesting/Directory.Packages.Helix.props +++ b/tests/Shared/RepoTesting/Directory.Packages.Helix.props @@ -3,83 +3,83 @@ - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + From 5fa9337a84a52e9bd185d04d156eccbdcf592f74 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:26:56 -0700 Subject: [PATCH 4/5] Allow Dashboard application to roll-forward (#6417) Co-authored-by: Jose Perez Rodriguez --- src/Aspire.Dashboard/Aspire.Dashboard.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Aspire.Dashboard/Aspire.Dashboard.csproj b/src/Aspire.Dashboard/Aspire.Dashboard.csproj index 5360e709f4c..3c11bb936e8 100644 --- a/src/Aspire.Dashboard/Aspire.Dashboard.csproj +++ b/src/Aspire.Dashboard/Aspire.Dashboard.csproj @@ -11,6 +11,12 @@ CS8002: Referenced assembly does not have a strong name --> $(NoWarn);CS1591;CS8002 + + + Major From d3beb59c5cf7f92136c49cdcd704accfd7267238 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 25 Oct 2024 12:41:31 -0700 Subject: [PATCH 5/5] Address PR Feedback by flowing extensions from main --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa6ba69a8df..9029bac6346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,17 +29,17 @@ https://github.com/microsoft/usvc-apiserver cc584ed90a91ef8b818f9537ffd1d11639c2448a - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 2d7ad3a50441dca3e5d90be59b82859410187d90 + + https://github.com/dotnet/extensions + 7fe79a39d7e28f46eaa51d82a3d433bff73bd3cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 2d7ad3a50441dca3e5d90be59b82859410187d90 + + https://github.com/dotnet/extensions + 7fe79a39d7e28f46eaa51d82a3d433bff73bd3cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 2d7ad3a50441dca3e5d90be59b82859410187d90 + + https://github.com/dotnet/extensions + 7fe79a39d7e28f46eaa51d82a3d433bff73bd3cd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3f00cf48520..24642005aaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,8 +39,8 @@ 9.0.0-beta.24516.2 9.0.0-beta.24516.2 9.0.0-beta.24516.2 - 9.0.0-preview.9.24518.1 - 8.10.0 + 9.0.0-preview.9.24524.6 + 9.0.0-preview.9.24524.6 8.0.0 8.0.2 8.0.2 @@ -60,7 +60,7 @@ 8.0.10 8.0.10 8.0.10 - 8.10.0 + 9.0.0-preview.9.24524.6 8.0.10 8.0.10