From 0c1ec1c3e2d8288c2b6435e1a4192cb3c18c665c Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 18 Oct 2024 10:10:13 -0700 Subject: [PATCH 01/14] Updating package dependencies --- Directory.Packages.props | 106 ++++++++++++++++++++------------------- eng/Version.Details.xml | 94 ++++++++++++++++++++-------------- eng/Versions.props | 44 ++++++++-------- 3 files changed, 133 insertions(+), 111 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 7eb3e45bdc7..ca1d72e0dfe 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,29 +10,29 @@ - - - - + + + + - + - - + + - + - - - - - - - + + + + + + + @@ -93,41 +93,41 @@ - + - + - - - - - + + + + + - - - - + + + + - + - - - - - - - + + + + + + + - + - + - + @@ -144,24 +144,24 @@ - - + + - - + + - - - - - - - - - + + + + + + + + + @@ -170,10 +170,12 @@ - - + + + + \ 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 From 3da80f88aaa3841c15c89f0defd756542602a7cb Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 18 Oct 2024 10:21:47 -0700 Subject: [PATCH 02/14] Updating Docker tags --- .../ElasticsearchContainerImageTags.cs | 2 +- src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs | 2 +- src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs | 2 +- src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs | 2 +- src/Aspire.Hosting.MongoDB/MongoDBContainerImageTags.cs | 2 +- src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs | 2 +- src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs | 6 +++--- src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs | 2 +- src/Aspire.Hosting.RabbitMQ/RabbitMQContainerImageTags.cs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) 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"; } From 43acf70fbbdb3328ff2ac930e8941b2f99adbfff Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 12:53:08 -0500 Subject: [PATCH 03/14] Update Directory.Packages.props --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ca1d72e0dfe..1870fd9fe81 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -19,7 +19,7 @@ - + From 8d03e2de47fdbab73435a9bbcccfc4813c7cc135 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 12:54:15 -0500 Subject: [PATCH 04/14] Use test containers property --- Directory.Packages.props | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1870fd9fe81..e17f577c7d1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,7 @@ true true - 3.9.0 + 3.10.0 @@ -153,15 +153,15 @@ - - - - - - - - - + + + + + + + + + From 76ce2dd81635166a9ec7cc1f377b9271c375544d Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 18 Oct 2024 11:17:03 -0700 Subject: [PATCH 05/14] Update configuration schema --- .../Aspire.Azure.AI.OpenAI/ConfigurationSchema.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json b/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json index b092dce4d33..ca39f1e57a9 100644 --- a/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json @@ -31,14 +31,14 @@ "ClientOptions": { "type": "object", "properties": { - "ApplicationId": { - "type": "string", - "description": "An optional application ID to use as part of the request User-Agent header." - }, "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", "description": "The timeout applied to an individual network operation." + }, + "UserAgentApplicationId": { + "type": "string", + "description": "An optional application ID to use as part of the request User-Agent header." } }, "description": "Defines the scenario-independent, client-level options for the Azure-specific OpenAI client." From 754149fffaaa00b77c98d639840050da5d91a708 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 13:30:13 -0500 Subject: [PATCH 06/14] Revert "Update configuration schema" This reverts commit 76ce2dd81635166a9ec7cc1f377b9271c375544d. --- .../Aspire.Azure.AI.OpenAI/ConfigurationSchema.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json b/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json index ca39f1e57a9..b092dce4d33 100644 --- a/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json +++ b/src/Components/Aspire.Azure.AI.OpenAI/ConfigurationSchema.json @@ -31,14 +31,14 @@ "ClientOptions": { "type": "object", "properties": { + "ApplicationId": { + "type": "string", + "description": "An optional application ID to use as part of the request User-Agent header." + }, "NetworkTimeout": { "type": "string", "pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$", "description": "The timeout applied to an individual network operation." - }, - "UserAgentApplicationId": { - "type": "string", - "description": "An optional application ID to use as part of the request User-Agent header." } }, "description": "Defines the scenario-independent, client-level options for the Azure-specific OpenAI client." From a88c93d3a16b21b4853885d800e41cb2cc2aa6f5 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 13:42:20 -0500 Subject: [PATCH 07/14] Revert MongoDB dependency back to 2.x --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index e17f577c7d1..c1e1203f100 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -109,7 +109,7 @@ - + @@ -178,4 +178,4 @@ - \ No newline at end of file + From db864026a643d49996b79c6835f292d386602d4a Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 14:32:06 -0500 Subject: [PATCH 08/14] Fix build error --- playground/bicep/BicepSample.ApiService/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; From 9169662a49da772254bf0c6b6e10d0a3003321a1 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 14:49:36 -0500 Subject: [PATCH 09/14] Set an upper bound on MongoDB.Driver Contributes to #6380 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c1e1203f100..b63fb6cbd46 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -109,7 +109,7 @@ - + From 1876bd645f753c49a0e7fa1f957a6422c9c2023f Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 15:19:56 -0500 Subject: [PATCH 10/14] Revert Microsoft.FluentUI.AspNetCore.Components update --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b63fb6cbd46..2891dcb5997 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -106,8 +106,8 @@ - - + + From 9f33f86e114efda1131ebeab4dc126544e537e61 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 15:20:51 -0500 Subject: [PATCH 11/14] Remove unnecessary old system http and regex packages --- Directory.Packages.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2891dcb5997..f5dbedf3d7b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -175,7 +175,5 @@ - - From 40dad9770637462fa106ce519bfaa3bef7abd26d Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 18 Oct 2024 17:57:49 -0500 Subject: [PATCH 12/14] Fix OpenAI Tests --- .../Aspire.Azure.AI.OpenAI/AspireAzureOpenAIExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Date: Sat, 19 Oct 2024 08:16:23 -0700 Subject: [PATCH 13/14] Fixing end-to-end tests --- .../Aspire.EndToEnd.Tests.csproj | 2 +- .../Directory.Packages.Helix.props | 134 +++++++++--------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj b/tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj index 1293b39076d..06c0e62d4f3 100644 --- a/tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj +++ b/tests/Aspire.EndToEnd.Tests/Aspire.EndToEnd.Tests.csproj @@ -2,7 +2,7 @@ $(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 6344123756c5583421ceeeb24a5c4e6b9a73ebf8 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Sat, 19 Oct 2024 16:46:10 -0500 Subject: [PATCH 14/14] Update Azurite version --- src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)