A programming framework for agentic AI
updating dependencies and build to ensure works with net9 (#3800)
Ryan Sweet0214299de506
diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.slnindex d15dd8d53..6b3038b61 100644--- a/dotnet/AutoGen.sln+++ b/dotnet/AutoGen.sln@@ -1,4 +1,5 @@-Microsoft Visual Studio Solution File, Format Version 12.00++Microsoft Visual Studio Solution File, Format Version 12.00# Visual Studio Version 17VisualStudioVersion = 17.8.34322.80MinimumVisualStudioVersion = 10.0.40219.1@@ -100,19 +101,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solutionspelling.dic = spelling.dicEndProjectSectionEndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello", "samples\Hello\Hello.csproj", "{6C9135E6-9D15-4D86-B3F4-9666DB87060A}"+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hello", "samples\Hello\Hello.csproj", "{6C9135E6-9D15-4D86-B3F4-9666DB87060A}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.ServiceDefaults", "src\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj", "{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}"+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.ServiceDefaults", "src\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj", "{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}"EndProjectProject("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AutoGen.Agents", "Microsoft.AutoGen.Agents", "{143BF45F-1091-458C-A772-DAD5C57B72FA}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Runtime", "src\Microsoft.AutoGen.Agents\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj", "{32AF1495-4068-4048-A34A-FCA1E110F02E}"+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Runtime", "src\Microsoft.AutoGen.Agents\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj", "{32AF1495-4068-4048-A34A-FCA1E110F02E}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Extensions.SemanticKernel", "src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj", "{2B1701A5-BEA2-4844-863B-0275ECCCD11D}"+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.SemanticKernel", "src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj", "{2B1701A5-BEA2-4844-863B-0275ECCCD11D}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Extensions.CloudEvents", "src\Microsoft.AutoGen.Agents\Extensions\CloudEvents\Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj", "{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}"+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.CloudEvents", "src\Microsoft.AutoGen.Agents\Extensions\CloudEvents\Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj", "{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}"EndProject-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents.Client", "src\Microsoft.AutoGen.Agents\Client\Microsoft.AutoGen.Agents.Client.csproj", "{CEEC175F-8752-4040-9226-8F5FEC7563B8}"+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Client", "src\Microsoft.AutoGen.Agents\Client\Microsoft.AutoGen.Agents.Client.csproj", "{CEEC175F-8752-4040-9226-8F5FEC7563B8}"+EndProject+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Abstractions", "src\Microsoft.AutoGen.Agents\Abstractions\Microsoft.AutoGen.Agents.Abstractions.csproj", "{8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}"EndProjectGlobalGlobalSection(SolutionConfigurationPlatforms) = preSolution@@ -304,6 +307,10 @@ Global{CEEC175F-8752-4040-9226-8F5FEC7563B8}.Debug|Any CPU.Build.0 = Debug|Any CPU{CEEC175F-8752-4040-9226-8F5FEC7563B8}.Release|Any CPU.ActiveCfg = Release|Any CPU{CEEC175F-8752-4040-9226-8F5FEC7563B8}.Release|Any CPU.Build.0 = Release|Any CPU+ {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8}.Release|Any CPU.Build.0 = Release|Any CPUEndGlobalSectionGlobalSection(SolutionProperties) = preSolutionHideSolutionNode = FALSE@@ -359,6 +366,7 @@ Global{2B1701A5-BEA2-4844-863B-0275ECCCD11D} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}{FDD6787A-EE6A-4A8E-872F-CDA97A824D08} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}{CEEC175F-8752-4040-9226-8F5FEC7563B8} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}+ {8960A02A-A139-4E54-BF98-B8F9C4A0FFE8} = {143BF45F-1091-458C-A772-DAD5C57B72FA}EndGlobalSectionGlobalSection(ExtensibilityGlobals) = postSolutionSolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B}diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.propsindex 6dac23748..d61d6f4c7 100644--- a/dotnet/Directory.Build.props+++ b/dotnet/Directory.Build.props@@ -32,6 +32,10 @@<NoWarn>$(NoWarn);CA1829</NoWarn></PropertyGroup>+ <ItemGroup>+ <PackageReference Include="System.Text.Json" />+ </ItemGroup>+<ItemGroup Condition="'$(IsTestProject)' == 'true'"><PackageReference Include="ApprovalTests" /><PackageReference Include="FluentAssertions" />@@ -40,6 +44,7 @@<PackageReference Include="xunit.runner.console" /><PackageReference Include="xunit.runner.visualstudio" /><PackageReference Include="Moq" />+ <PackageReference Include="System.Data.SqlClient" /></ItemGroup><ItemGroup Condition="'$(IsTestProject)' == 'true'">diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.propsindex eb519d4ab..74949f880 100644--- a/dotnet/Directory.Packages.props+++ b/dotnet/Directory.Packages.props@@ -7,19 +7,19 @@<ItemGroup><PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.1" /><PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="8.0.1-preview.8.24267.1" />- <PackageVersion Include="Aspire.Hosting.AppHost" Version="8.2.0" />- <PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="8.2.0" />- <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="8.2.0" />+ <PackageVersion Include="Aspire.Hosting.AppHost" Version="8.2.1" />+ <PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="8.2.1" />+ <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="8.2.1" /><PackageVersion Include="Aspire.Hosting.NodeJs" Version="8.2.0" />- <PackageVersion Include="Aspire.Hosting.Orleans" Version="8.2.0" />- <PackageVersion Include="Aspire.Hosting.Qdrant" Version="8.2.0" />+ <PackageVersion Include="Aspire.Hosting.Orleans" Version="8.2.1" />+ <PackageVersion Include="Aspire.Hosting.Qdrant" Version="8.2.1" /><PackageVersion Include="Aspire.Hosting.Redis" Version="8.2.0" /><PackageVersion Include="Azure.AI.OpenAI" Version=" 2.1.0-beta.1" /><PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.1" />- <PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />- <PackageVersion Include="Azure.Identity" Version="1.12.0" />+ <PackageVersion Include="Azure.Data.Tables" Version="12.9.1" />+ <PackageVersion Include="Azure.Identity" Version="1.13.0" /><PackageVersion Include="Azure.ResourceManager.ContainerInstance" Version="1.2.1" />- <PackageVersion Include="Azure.Storage.Files.Shares" Version="12.18.0" />+ <PackageVersion Include="Azure.Storage.Files.Shares" Version="12.20.1" /><PackageVersion Include="CloudNative.CloudEvents.SystemTextJson" Version="2.7.1" /><PackageVersion Include="Elsa" Version="3.1.3" /><PackageVersion Include="Elsa.EntityFrameworkCore" Version="3.1.3" />@@ -30,29 +30,29 @@<PackageVersion Include="Elsa.Workflows.Core" Version="3.1.3" /><PackageVersion Include="Elsa.Workflows.Designer" Version="3.0.0-preview.727" /><PackageVersion Include="Elsa.Workflows.Management" Version="3.1.3" />- <PackageVersion Include="Grpc.AspNetCore" Version="2.65.0" />+ <PackageVersion Include="Grpc.AspNetCore" Version="2.66.0" /><PackageVersion Include="Grpc.Core" Version="2.46.6" />- <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.65.0" />- <PackageVersion Include="Grpc.Tools" Version="2.65.0" />+ <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.66.0" />+ <PackageVersion Include="Grpc.Tools" Version="2.67.0" /><PackageVersion Include="Grpc.Net.Client" Version="2.65.0" />- <PackageVersion Include="Google.Protobuf" Version="3.27.3" />+ <PackageVersion Include="Google.Protobuf" Version="3.28.2" /><PackageVersion Include="Microsoft.AspNetCore.App" Version="8.0.4" /><PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" /><PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" /><PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />- <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.4" />+ <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.6" /><PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" /><PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" /><PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" /><PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" /><PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />- <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />- <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />- <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />- <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />+ <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />+ <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />+ <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />+ <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" /><PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" /><PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />- <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.2" />+ <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.2.1" /><PackageVersion Include="Microsoft.Orleans.Clustering.Cosmos" Version="8.2.0" /><PackageVersion Include="Microsoft.Orleans.Persistence.Cosmos" Version="8.2.0" /><PackageVersion Include="Microsoft.Orleans.Reminders" Version="8.2.0" />@@ -71,7 +71,7 @@<PackageVersion Include="Microsoft.SemanticKernel.Plugins.Web" Version="$(MicrosoftSemanticKernelExperimentalVersion)" /><PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /><PackageVersion Include="Octokit" Version="13.0.1" />- <PackageVersion Include="Octokit.Webhooks.AspNetCore" Version="2.2.2" />+ <PackageVersion Include="Octokit.Webhooks.AspNetCore" Version="2.4.0" /><PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" /><PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" /><PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />@@ -79,28 +79,31 @@<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" /><PackageVersion Include="OrleansDashboard" Version="8.2.0" /><PackageVersion Include="PdfPig" Version="0.1.9-alpha-20240324-e7896" />- <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />+ <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" /><PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />- <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.6.3" />- <PackageVersion Include="System.Memory.Data" Version="8.0.0" />- <PackageVersion Include="JsonSchema.Net.Generation" Version="4.3.0.2" />+ <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />+ <PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />+ <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.7.1" />+ <PackageVersion Include="System.IO.Packaging" Version="8.0.1" />+ <PackageVersion Include="System.Memory.Data" Version="8.0.1" />+ <PackageVersion Include="JsonSchema.Net.Generation" Version="4.5.1" /><PackageVersion Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.24229.4" /><PackageVersion Include="Microsoft.DotNet.Interactive.Jupyter" Version="1.0.0-beta.24229.4" /><PackageVersion Include="Microsoft.DotNet.Interactive.PackageManagement" Version="1.0.0-beta.24229.4" />- <PackageVersion Include="Google.Cloud.AIPlatform.V1" Version="3.0.0" />+ <PackageVersion Include="Google.Cloud.AIPlatform.V1" Version="3.9.0" /><PackageVersion Include="OpenAI" Version="2.1.0-beta.1" /><PackageVersion Include="System.CodeDom" Version="5.0.0" />- <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.0" />+ <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" /><PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" /><PackageVersion Include="ApprovalTests" Version="6.0.0" />- <PackageVersion Include="FluentAssertions" Version="6.8.0" />- <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />- <PackageVersion Include="xunit" Version="2.4.2" />- <PackageVersion Include="xunit.runner.console" Version="2.4.2" />- <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.2" />- <PackageVersion Include="Moq" Version="4.20.70" />- <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.4" />- <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.4" />-+ <PackageVersion Include="FluentAssertions" Version="6.12.1" />+ <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />+ <PackageVersion Include="xunit" Version="2.9.2" />+ <PackageVersion Include="xunit.runner.console" Version="2.9.2" />+ <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />+ <PackageVersion Include="Moq" Version="4.20.72" />+ <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.5" />+ <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />+ <PackageVersion Include="System.Text.Json" Version="8.0.5" /></ItemGroup></Project>\ No newline at end of filediff --git a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csprojindex 093dc4fda..103248897 100644--- a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj+++ b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj@@ -1,4 +1,4 @@-<Project Sdk="Microsoft.NET.Sdk">+<Project Sdk="Microsoft.NET.Sdk"><ItemGroup><ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />diff --git a/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj b/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csprojindex d06a884f3..7b911ca0f 100644--- a/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj+++ b/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj@@ -20,6 +20,7 @@<ItemGroup><PackageReference Include="Microsoft.DotNet.Interactive" />+ <PackageReference Include="System.Formats.Asn1" /></ItemGroup><ItemGroup>@@ -34,6 +35,7 @@<ItemGroup><ProjectReference Include="..\AutoGen.Core\AutoGen.Core.csproj" />+ <PackageReference Include="System.IO.Packaging" /><ProjectReference Include="..\AutoGen.SourceGenerator\AutoGen.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" /></ItemGroup>diff --git a/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj b/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csprojindex 3866d6017..d7578c018 100644--- a/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj+++ b/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj@@ -9,7 +9,9 @@<UserSecretsId>35954224-b94e-4024-b0ef-7ba7cf80c0d8</UserSecretsId><GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn><LaunchDebugger>false</LaunchDebugger>+ <EnforceExtendedAnalyzerRules>false</EnforceExtendedAnalyzerRules><NoWarn>$(NoWarn);NU5128</NoWarn>+ <NoWarn>$(NoWarn);RS1036</NoWarn><DefineConstants Condition="'$(LaunchDebugger)' == 'true'">$(DefineConstants);LAUNCH_DEBUGGER</DefineConstants></PropertyGroup>diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csprojindex 2bb1de50d..fe480940c 100644--- a/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj+++ b/dotnet/src/Microsoft.AutoGen.Agents/Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj@@ -1,4 +1,4 @@-<Project Sdk="Microsoft.NET.Sdk">+<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup><TargetFramework>net8.0</TargetFramework>@@ -21,7 +21,7 @@<PackageReference Include="Grpc.AspNetCore" /><PackageReference Include="Grpc.Net.ClientFactory" /><PackageReference Include="Grpc.Tools" PrivateAssets="All" />- <PackageReference Include="Microsoft.SemanticKernel" VersionOverride="1.15.1" />+ <PackageReference Include="Microsoft.SemanticKernel" /></ItemGroup>-</Project>\ No newline at end of file+</Project>diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csprojindex a0f369821..03f5602fe 100644--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj+++ b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj@@ -11,11 +11,11 @@</PropertyGroup><ItemGroup>- <PackageReference Include="Azure.AI.OpenAI" VersionOverride="1.0.0-beta.17" />- <PackageReference Include="Microsoft.SemanticKernel" VersionOverride="1.15.1" />+ <PackageReference Include="Azure.AI.OpenAI" />+ <PackageReference Include="Microsoft.SemanticKernel" />- <PackageReference Include="Microsoft.SemanticKernel.Connectors.Qdrant" VersionOverride="1.15.1-alpha" />- <PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" VersionOverride="1.15.1-alpha" />+ <PackageReference Include="Microsoft.SemanticKernel.Connectors.Qdrant" />+ <PackageReference Include="Microsoft.SemanticKernel.Plugins.Memory" /></ItemGroup></Project>diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.csindex c224a52aa..9b83acf1f 100644--- a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs+++ b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs@@ -26,9 +26,9 @@ public static class SemanticKernelHostingExtensionso.ChatDeploymentOrModelId = "gpt-4o";});- builder.Services.Configure<OpenAIClientOptions>(o =>+ builder.Services.Configure<AzureOpenAIClientOptions>(o =>{- o.Retry.NetworkTimeout = TimeSpan.FromMinutes(5);+ o.NetworkTimeout = TimeSpan.FromMinutes(5);});builder.Services.AddOptions<QdrantOptions>().Bind(builder.Configuration.GetSection("Qdrant"))@@ -58,8 +58,8 @@ public static class SemanticKernelHostingExtensionsvar memoryBuilder = new MemoryBuilder();return memoryBuilder.WithLoggerFactory(loggerFactory).WithQdrantMemoryStore(qdrantHttpClient, qdrantConfig.VectorSize, qdrantConfig.Endpoint)- .WithAzureOpenAITextEmbeddingGeneration(openAiConfig.EmbeddingsDeploymentOrModelId, openAiConfig.EmbeddingsEndpoint, openAiConfig.EmbeddingsApiKey)- .Build();+ .WithOpenAITextEmbeddingGeneration(openAiConfig.EmbeddingsDeploymentOrModelId, openAiConfig.EmbeddingsApiKey)+ .Build();}private static Kernel CreateKernel(IServiceProvider provider)@@ -70,21 +70,19 @@ public static class SemanticKernelHostingExtensions// Chatif (openAiConfig.ChatEndpoint.Contains(".azure", StringComparison.OrdinalIgnoreCase)){- var openAIClient = new OpenAIClient(new Uri(openAiConfig.ChatEndpoint), new Azure.AzureKeyCredential(openAiConfig.ChatApiKey));- builder.Services.AddAzureOpenAIChatCompletion(openAiConfig.ChatDeploymentOrModelId, openAIClient);+ //var openAIClient = new OpenAIClient(new Uri(openAiConfig.ChatEndpoint), new Azure.AzureKeyCredential(openAiConfig.ChatApiKey));+ builder.Services.AddAzureOpenAIChatCompletion(deploymentName: openAiConfig.ChatDeploymentOrModelId, apiKey: openAiConfig.ChatApiKey, endpoint: openAiConfig.ChatEndpoint);}else{- var openAIClient = new OpenAIClient(openAiConfig.ChatApiKey);- builder.Services.AddOpenAIChatCompletion(openAiConfig.ChatDeploymentOrModelId, openAIClient);+ builder.Services.AddOpenAIChatCompletion(apiKey: openAiConfig.ChatApiKey, modelId: openAiConfig.ChatDeploymentOrModelId);}// Text to Imageif (openAiConfig.ImageEndpoint.Contains(".azure", StringComparison.OrdinalIgnoreCase)){ArgumentException.ThrowIfNullOrEmpty(openAiConfig.ImageDeploymentOrModelId);- var openAIClient = new OpenAIClient(new Uri(openAiConfig.ImageEndpoint), new Azure.AzureKeyCredential(openAiConfig.ImageApiKey));- builder.Services.AddAzureOpenAITextToImage(openAiConfig.ImageDeploymentOrModelId, openAIClient);+ builder.Services.AddAzureOpenAITextToImage(openAiConfig.ImageApiKey, openAiConfig.ImageDeploymentOrModelId, openAiConfig.ImageEndpoint);}else{@@ -94,13 +92,11 @@ public static class SemanticKernelHostingExtensions// Embeddingsif (openAiConfig.EmbeddingsEndpoint.Contains(".azure", StringComparison.OrdinalIgnoreCase)){- var openAIClient = new OpenAIClient(new Uri(openAiConfig.EmbeddingsEndpoint), new Azure.AzureKeyCredential(openAiConfig.EmbeddingsApiKey));- builder.Services.AddAzureOpenAITextEmbeddingGeneration(openAiConfig.EmbeddingsDeploymentOrModelId, openAIClient);+ builder.Services.AddAzureOpenAITextEmbeddingGeneration(openAiConfig.EmbeddingsDeploymentOrModelId, openAiConfig.EmbeddingsApiKey, openAiConfig.EmbeddingsEndpoint);}else{- var openAIClient = new OpenAIClient(openAiConfig.EmbeddingsApiKey);- builder.Services.AddOpenAITextEmbeddingGeneration(openAiConfig.EmbeddingsDeploymentOrModelId, openAIClient);+ builder.Services.AddOpenAITextEmbeddingGeneration(modelId: openAiConfig.EmbeddingsDeploymentOrModelId);}return builder.Build();diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csprojindex 5eb1e274d..1d2400522 100644--- a/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj+++ b/dotnet/src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj@@ -13,7 +13,7 @@</PropertyGroup><ItemGroup>- <ProjectReference Include="../Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj" />+ <ProjectReference Include="..\Abstractions\Microsoft.AutoGen.Agents.Abstractions.csproj" /><ProjectReference Include="..\..\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj" /></ItemGroup>diff --git a/dotnet/test/AutoGen.Gemini.Tests/ApprovalTests/FunctionContractExtensionTests.ItGenerateGetWeatherToolTest.approved.txt b/dotnet/test/AutoGen.Gemini.Tests/ApprovalTests/FunctionContractExtensionTests.ItGenerateGetWeatherToolTest.approved.txtindex d7ec585cb..938e59d61 100644--- a/dotnet/test/AutoGen.Gemini.Tests/ApprovalTests/FunctionContractExtensionTests.ItGenerateGetWeatherToolTest.approved.txt+++ b/dotnet/test/AutoGen.Gemini.Tests/ApprovalTests/FunctionContractExtensionTests.ItGenerateGetWeatherToolTest.approved.txt@@ -5,10 +5,10 @@"type": "OBJECT","properties": {"city": {- "type": "STRING",- "description": "city",- "title": "city"-}+ "type": "STRING",+ "description": "city",+ "title": "city"+ }},"required": ["city"diff --git a/dotnet/test/AutoGen.OpenAI.V1.Tests/AutoGen.OpenAI.V1.Tests.csproj b/dotnet/test/AutoGen.OpenAI.V1.Tests/AutoGen.OpenAI.V1.Tests.csprojindex 5a249472f..b5112d20a 100644--- a/dotnet/test/AutoGen.OpenAI.V1.Tests/AutoGen.OpenAI.V1.Tests.csproj+++ b/dotnet/test/AutoGen.OpenAI.V1.Tests/AutoGen.OpenAI.V1.Tests.csproj@@ -21,5 +21,4 @@<DependentUpon>%(ParentFile)%(ParentExtension)</DependentUpon></None></ItemGroup>-</Project>