diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln
index d15dd8d530f1..6b3038b6152e 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 17
VisualStudioVersion = 17.8.34322.80
MinimumVisualStudioVersion = 10.0.40219.1
@@ -100,19 +101,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
spelling.dic = spelling.dic
EndProjectSection
EndProject
-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}"
EndProject
Project("{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}"
EndProject
Global
GlobalSection(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 CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = 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}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B}
diff --git a/dotnet/Directory.Build.props b/dotnet/Directory.Build.props
index 6dac23748f35..d61d6f4c799a 100644
--- a/dotnet/Directory.Build.props
+++ b/dotnet/Directory.Build.props
@@ -32,6 +32,10 @@
$(NoWarn);CA1829
+
+
+
+
@@ -40,6 +44,7 @@
+
diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
index eb519d4abdeb..74949f880b18 100644
--- a/dotnet/Directory.Packages.props
+++ b/dotnet/Directory.Packages.props
@@ -7,19 +7,19 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
@@ -30,29 +30,29 @@
-
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
@@ -71,7 +71,7 @@
-
+
@@ -79,28 +79,31 @@
-
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj
index 093dc4fda06e..103248897ae0 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 @@
-
+
diff --git a/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj b/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj
index d06a884f3b45..7b911ca0f44f 100644
--- a/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj
+++ b/dotnet/src/AutoGen.DotnetInteractive/AutoGen.DotnetInteractive.csproj
@@ -20,6 +20,7 @@
+
@@ -34,6 +35,7 @@
+
diff --git a/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj b/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj
index 3866d60177da..d7578c0180dd 100644
--- a/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj
+++ b/dotnet/src/AutoGen.SourceGenerator/AutoGen.SourceGenerator.csproj
@@ -9,7 +9,9 @@
35954224-b94e-4024-b0ef-7ba7cf80c0d8
$(GetTargetPathDependsOn);GetDependencyTargetPaths
false
+ false
$(NoWarn);NU5128
+ $(NoWarn);RS1036
$(DefineConstants);LAUNCH_DEBUGGER
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.csproj
index 2bb1de50dc5e..fe480940cbda 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 @@
-
+
net8.0
@@ -21,7 +21,7 @@
-
+
-
\ No newline at end of file
+
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.csproj
index a0f369821571..03f5602fe1a5 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 @@
-
-
+
+
-
-
+
+
diff --git a/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents/Extensions/SemanticKernel/SemanticKernelHostingExtensions.cs
index c224a52aaab8..9b83acf1fd9f 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 IHostApplicationBuilder ConfigureSemanticKernel(this IHostApplicat
o.ChatDeploymentOrModelId = "gpt-4o";
});
- builder.Services.Configure(o =>
+ builder.Services.Configure(o =>
{
- o.Retry.NetworkTimeout = TimeSpan.FromMinutes(5);
+ o.NetworkTimeout = TimeSpan.FromMinutes(5);
});
builder.Services.AddOptions().Bind(builder.Configuration.GetSection("Qdrant"))
@@ -58,8 +58,8 @@ private static ISemanticTextMemory CreateMemory(IServiceProvider provider)
var 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 @@ private static Kernel CreateKernel(IServiceProvider provider)
// Chat
if (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 Image
if (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 @@ private static Kernel CreateKernel(IServiceProvider provider)
// Embeddings
if (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.csproj
index 5eb1e274d4c7..1d2400522b56 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 @@
-
+
diff --git a/dotnet/test/AutoGen.Gemini.Tests/ApprovalTests/FunctionContractExtensionTests.ItGenerateGetWeatherToolTest.approved.txt b/dotnet/test/AutoGen.Gemini.Tests/ApprovalTests/FunctionContractExtensionTests.ItGenerateGetWeatherToolTest.approved.txt
index d7ec585cb205..938e59d61867 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.csproj
index 5a249472f2f8..b5112d20aa60 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 @@
%(ParentFile)%(ParentExtension)
-