Rysweet dotnet folder moves (#3693)

* add service defaults to Host * add otel to app host * ran format * remove HelloAgents * moving things around to fit the folder structure/naming conventions --------- Co-authored-by: Xiaoyun Zhang <[email protected]>
microsoft · Oct 9, 2024 · 8e37cef · 8e37cef
1 parent 64365b6
commit 8e37cef
Show file tree

Hide file tree

Showing 42 changed files with 54 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ git switch staging-dev
 # Build the project
 cd dotnet && dotnet build AutoGen.sln
 # In your source code, add AutoGen to your project
-dotnet add <your.csproj> reference <path to your checkout of autogen>/dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj
+dotnet add <your.csproj> reference <path to your checkout of autogen>/dotnet/src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj
 ```
 
 Then, define and run your first agent:

diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln
@@ -78,16 +78,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.OpenAI", "src\AutoG
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoGen.OpenAI.Tests", "test\AutoGen.OpenAI.Tests\AutoGen.OpenAI.Tests.csproj", "{42A8251C-E7B3-47BB-A82E-459952EBE132}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents", "src\Microsoft.AutoGen.Agents\Microsoft.AutoGen.Agents.csproj", "{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Client", "src\Microsoft.AutoGen.Agents.Client\Microsoft.AutoGen.Agents.Client.csproj", "{6DA7A583-DFDD-489A-884F-D12C58022A05}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.CloudEvents", "src\Microsoft.AutoGen.Agents.Extensions\CloudEvents\Microsoft.AutoGen.Agents.Extensions.CloudEvents.csproj", "{C1E69C6D-066E-42E4-83C6-D9A4C84A6670}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Extensions.SemanticKernel", "src\Microsoft.AutoGen.Agents.Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj", "{F520E059-9B54-4B79-8716-FEF09447C928}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Runtime", "src\Microsoft.AutoGen.Agents.Runtime\Microsoft.AutoGen.Agents.Runtime.csproj", "{FEF07BCC-DBE3-4592-9FD2-565A091F19DC}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AgentChat", "AgentChat", "{4BB66E06-37D8-45A0-9B97-DE590AFBA340}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AgentChat", "AgentChat", "{C7A2D42D-9277-47AC-862B-D86DF9D6AD48}"
@@ -114,6 +104,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello", "samples\Hello\Hell
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "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}"
+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}"
+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}"
+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}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -260,26 +260,6 @@ Global
 		{42A8251C-E7B3-47BB-A82E-459952EBE132}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42A8251C-E7B3-47BB-A82E-459952EBE132}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42A8251C-E7B3-47BB-A82E-459952EBE132}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DA7A583-DFDD-489A-884F-D12C58022A05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DA7A583-DFDD-489A-884F-D12C58022A05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DA7A583-DFDD-489A-884F-D12C58022A05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DA7A583-DFDD-489A-884F-D12C58022A05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1E69C6D-066E-42E4-83C6-D9A4C84A6670}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F520E059-9B54-4B79-8716-FEF09447C928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F520E059-9B54-4B79-8716-FEF09447C928}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F520E059-9B54-4B79-8716-FEF09447C928}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F520E059-9B54-4B79-8716-FEF09447C928}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEF07BCC-DBE3-4592-9FD2-565A091F19DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7228A701-C79D-4E15-BF45-48D11F721A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7228A701-C79D-4E15-BF45-48D11F721A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7228A701-C79D-4E15-BF45-48D11F721A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -308,6 +288,22 @@ Global
 		{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32AF1495-4068-4048-A34A-FCA1E110F02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32AF1495-4068-4048-A34A-FCA1E110F02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32AF1495-4068-4048-A34A-FCA1E110F02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32AF1495-4068-4048-A34A-FCA1E110F02E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B1701A5-BEA2-4844-863B-0275ECCCD11D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDD6787A-EE6A-4A8E-872F-CDA97A824D08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEEC175F-8752-4040-9226-8F5FEC7563B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -348,11 +344,6 @@ Global
 		{143725E2-206C-4D37-93E4-9EDF699826B2} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
 		{3AF1CBEC-2877-41E9-92AE-3A391B2AA9E8} = {4BB66E06-37D8-45A0-9B97-DE590AFBA340}
 		{42A8251C-E7B3-47BB-A82E-459952EBE132} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
-		{F716F5EA-DE34-4B3D-82F8-64B0B5C4A795} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
-		{6DA7A583-DFDD-489A-884F-D12C58022A05} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
-		{C1E69C6D-066E-42E4-83C6-D9A4C84A6670} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
-		{F520E059-9B54-4B79-8716-FEF09447C928} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
-		{FEF07BCC-DBE3-4592-9FD2-565A091F19DC} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
 		{4BB66E06-37D8-45A0-9B97-DE590AFBA340} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
 		{C7A2D42D-9277-47AC-862B-D86DF9D6AD48} = {FBFEAD1F-29EB-4D99-A672-0CD8473E10B9}
 		{616F30DF-1F41-4047-BAA4-64BA03BF5AEA} = {FBFEAD1F-29EB-4D99-A672-0CD8473E10B9}
@@ -363,6 +354,11 @@ Global
 		{D9F65DFD-368B-47DB-8BB5-0C74DED7F439} = {616F30DF-1F41-4047-BAA4-64BA03BF5AEA}
 		{6C9135E6-9D15-4D86-B3F4-9666DB87060A} = {FBFEAD1F-29EB-4D99-A672-0CD8473E10B9}
 		{F70C6FD7-9615-4EDD-8D55-5460FCC5A46D} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+		{143BF45F-1091-458C-A772-DAD5C57B72FA} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
+		{32AF1495-4068-4048-A34A-FCA1E110F02E} = {143BF45F-1091-458C-A772-DAD5C57B72FA}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B}

diff --git a/dotnet/samples/Hello/Hello.csproj b/dotnet/samples/Hello/Hello.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AutoGen.Agents.Client\Microsoft.AutoGen.Agents.Client.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AutoGen.Agents.Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AutoGen.Agents\Client\Microsoft.AutoGen.Agents.Client.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AutoGen.Agents\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj b/dotnet/samples/dev-team/DevTeam.AgentHost/DevTeam.AgentHost.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
    <ItemGroup>
-    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents.Runtime/Microsoft.AutoGen.Agents.Runtime.csproj" />
+    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Runtime/Microsoft.AutoGen.Agents.Runtime.csproj" />
     <ProjectReference Include="../../../src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
   </ItemGroup>
 

diff --git a/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj b/dotnet/samples/dev-team/DevTeam.Agents/DevTeam.Agents.csproj
@@ -8,11 +8,11 @@
 
   <ItemGroup>
 
-    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj" />
+    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
 
     <ProjectReference Include="../../../src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
     <ProjectReference Include="..\DevTeam.Shared\DevTeam.Shared.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.AutoGen.Agents.Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj b/dotnet/samples/dev-team/DevTeam.Backend/DevTeam.Backend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj" />
+    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -31,7 +31,7 @@
   <ItemGroup>
     <ProjectReference Include="../../../src/Microsoft.AutoGen.ServiceDefaults/Microsoft.AutoGen.ServiceDefaults.csproj" />
     <ProjectReference Include="..\DevTeam.Shared\DevTeam.Shared.csproj" />
-    <ProjectReference Include="..\..\..\src\Microsoft.AutoGen.Agents.Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj" />
+    <ProjectReference Include="..\..\..\src\Microsoft.AutoGen.Agents\Extensions\SemanticKernel\Microsoft.AutoGen.Agents.Extensions.SemanticKernel.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj b/dotnet/samples/dev-team/DevTeam.Shared/DevTeam.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj" />
+    <ProjectReference Include="../../../src/Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/...en.Agents/Microsoft.AutoGen.Agents.csproj → ...rosoft.AutoGen.Agents.Abstractions.csproj b/...en.Agents/Microsoft.AutoGen.Agents.csproj → ...rosoft.AutoGen.Agents.Abstractions.csproj
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Protobuf Include="..\..\..\protos\agent_worker.proto" GrpcServices="Client;Server" Link="Protos\agent_worker.proto" />
-    <Protobuf Include="..\..\..\protos\cloudevent.proto" GrpcServices="Client;Server" Link="Protos\cloudevent.proto" />
-    <Protobuf Include="..\..\..\protos\agent_events.proto" GrpcServices="Client;Server" Link="Protos\agent_events.proto" />
-    <Protobuf Include="..\..\..\protos\agent_states.proto" GrpcServices="Client;Server" Link="Protos\agent_states.proto" />
+    <Protobuf Include="..\..\..\..\protos\agent_worker.proto" GrpcServices="Client;Server" Link="Protos\agent_worker.proto" />
+    <Protobuf Include="..\..\..\..\protos\cloudevent.proto" GrpcServices="Client;Server" Link="Protos\cloudevent.proto" />
+    <Protobuf Include="..\..\..\..\protos\agent_events.proto" GrpcServices="Client;Server" Link="Protos\agent_events.proto" />
+    <Protobuf Include="..\..\..\..\protos\agent_states.proto" GrpcServices="Client;Server" Link="Protos\agent_states.proto" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...rosoft.AutoGen.Agents.Client/AgentBase.cs → ...rosoft.AutoGen.Agents/Client/AgentBase.cs b/...rosoft.AutoGen.Agents.Client/AgentBase.cs → ...rosoft.AutoGen.Agents/Client/AgentBase.cs
diff --git a/...oGen.Agents.Client/AgentBaseExtensions.cs → ...oGen.Agents/Client/AgentBaseExtensions.cs b/...oGen.Agents.Client/AgentBaseExtensions.cs → ...oGen.Agents/Client/AgentBaseExtensions.cs
diff --git a/...soft.AutoGen.Agents.Client/AgentClient.cs → ...soft.AutoGen.Agents/Client/AgentClient.cs b/...soft.AutoGen.Agents.Client/AgentClient.cs → ...soft.AutoGen.Agents/Client/AgentClient.cs
diff --git a/...oft.AutoGen.Agents.Client/AgentContext.cs → ...oft.AutoGen.Agents/Client/AgentContext.cs b/...oft.AutoGen.Agents.Client/AgentContext.cs → ...oft.AutoGen.Agents/Client/AgentContext.cs
diff --git a/...icrosoft.AutoGen.Agents.Client/AgentId.cs → ...icrosoft.AutoGen.Agents/Client/AgentId.cs b/...icrosoft.AutoGen.Agents.Client/AgentId.cs → ...icrosoft.AutoGen.Agents/Client/AgentId.cs
diff --git a/...toGen.Agents.Client/AgentWorkerRuntime.cs → ...toGen.Agents/Client/AgentWorkerRuntime.cs b/...toGen.Agents.Client/AgentWorkerRuntime.cs → ...toGen.Agents/Client/AgentWorkerRuntime.cs
diff --git a/...n.Agents.Client/Agents/AIAgent/AiAgent.cs → ...n.Agents/Client/Agents/AIAgent/AiAgent.cs b/...n.Agents.Client/Agents/AIAgent/AiAgent.cs → ...n.Agents/Client/Agents/AIAgent/AiAgent.cs
diff --git a/...ents/IOAgent/ConsoleAgent/ConsoleAgent.cs → ...ents/IOAgent/ConsoleAgent/ConsoleAgent.cs b/...ents/IOAgent/ConsoleAgent/ConsoleAgent.cs → ...ents/IOAgent/ConsoleAgent/ConsoleAgent.cs
diff --git a/...ent/Agents/IOAgent/FileAgent/FileAgent.cs → ...ent/Agents/IOAgent/FileAgent/FileAgent.cs b/...ent/Agents/IOAgent/FileAgent/FileAgent.cs → ...ent/Agents/IOAgent/FileAgent/FileAgent.cs
diff --git a/...n.Agents.Client/Agents/IOAgent/IOAgent.cs → ...n.Agents/Client/Agents/IOAgent/IOAgent.cs b/...n.Agents.Client/Agents/IOAgent/IOAgent.cs → ...n.Agents/Client/Agents/IOAgent/IOAgent.cs
diff --git a/...Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs → ...Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs b/...Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs → ...Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
diff --git a/...rc/Microsoft.AutoGen.Agents.Client/App.cs → ...rc/Microsoft.AutoGen.Agents/Client/App.cs b/...rc/Microsoft.AutoGen.Agents.Client/App.cs → ...rc/Microsoft.AutoGen.Agents/Client/App.cs
@@ -1,6 +1,7 @@
 using Google.Protobuf;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AutoGen.Agents.Client;
 
@@ -14,6 +15,7 @@ public static async ValueTask<WebApplication> StartAsync(AgentTypes? agentTypes
         // start the server runtime
         RuntimeApp ??= await Runtime.Host.StartAsync(local);
         var clientBuilder = WebApplication.CreateBuilder();
+        clientBuilder.AddServiceDefaults();
         var appBuilder = clientBuilder.AddAgentWorker();
         agentTypes ??= AgentTypes.GetAgentTypesFromAssembly()
                    ?? throw new InvalidOperationException("No agent types found in the assembly");

diff --git a/...en.Agents.Client/HostBuilderExtensions.cs → ...en.Agents/Client/HostBuilderExtensions.cs b/...en.Agents.Client/HostBuilderExtensions.cs → ...en.Agents/Client/HostBuilderExtensions.cs
diff --git a/...ft.AutoGen.Agents.Client/IAgentContext.cs → ...ft.AutoGen.Agents/Client/IAgentContext.cs b/...ft.AutoGen.Agents.Client/IAgentContext.cs → ...ft.AutoGen.Agents/Client/IAgentContext.cs
diff --git a/...oGen.Agents.Client/IAgentWorkerRuntime.cs → ...oGen.Agents/Client/IAgentWorkerRuntime.cs b/...oGen.Agents.Client/IAgentWorkerRuntime.cs → ...oGen.Agents/Client/IAgentWorkerRuntime.cs
diff --git a/...nt/Microsoft.AutoGen.Agents.Client.csproj → ...nt/Microsoft.AutoGen.Agents.Client.csproj b/...nt/Microsoft.AutoGen.Agents.Client.csproj → ...nt/Microsoft.AutoGen.Agents.Client.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="../Microsoft.AutoGen.Agents/Microsoft.AutoGen.Agents.csproj" />
-		<ProjectReference Include="..\Microsoft.AutoGen.Agents.Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
+		<ProjectReference Include="../Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj" />
+		<ProjectReference Include="..\Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...sions/CloudEvents/CloudEventExtensions.cs → ...sions/CloudEvents/CloudEventExtensions.cs b/...sions/CloudEvents/CloudEventExtensions.cs → ...sions/CloudEvents/CloudEventExtensions.cs
diff --git a/...oGen.Agents.Extensions.CloudEvents.csproj → ...oGen.Agents.Extensions.CloudEvents.csproj b/...oGen.Agents.Extensions.CloudEvents.csproj → ...oGen.Agents.Extensions.CloudEvents.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="../../Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj" />
+    <ProjectReference Include="../../../Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/...xtensions/CloudEvents/Protos/states.proto → ...xtensions/CloudEvents/Protos/states.proto b/...xtensions/CloudEvents/Protos/states.proto → ...xtensions/CloudEvents/Protos/states.proto
diff --git a/...n.Agents.Extensions.SemanticKernel.csproj → ...n.Agents.Extensions.SemanticKernel.csproj b/...n.Agents.Extensions.SemanticKernel.csproj → ...n.Agents.Extensions.SemanticKernel.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="../../Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj" />
+    <ProjectReference Include="../../../Microsoft.AutoGen.Agents/Client/Microsoft.AutoGen.Agents.Client.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/...s/SemanticKernel/Options/OpenAIOptions.cs → ...s/SemanticKernel/Options/OpenAIOptions.cs b/...s/SemanticKernel/Options/OpenAIOptions.cs → ...s/SemanticKernel/Options/OpenAIOptions.cs
diff --git a/...s/SemanticKernel/Options/QdrantOptions.cs → ...s/SemanticKernel/Options/QdrantOptions.cs b/...s/SemanticKernel/Options/QdrantOptions.cs → ...s/SemanticKernel/Options/QdrantOptions.cs
diff --git a/...Kernel/SemanticKernelHostingExtensions.cs → ...Kernel/SemanticKernelHostingExtensions.cs b/...Kernel/SemanticKernelHostingExtensions.cs → ...Kernel/SemanticKernelHostingExtensions.cs
diff --git a/...AutoGen.Agents.Runtime/AgentStateGrain.cs → ...AutoGen.Agents/Runtime/AgentStateGrain.cs b/...AutoGen.Agents.Runtime/AgentStateGrain.cs → ...AutoGen.Agents/Runtime/AgentStateGrain.cs
diff --git a/...s.Runtime/AgentWorkerHostingExtensions.cs → ...s/Runtime/AgentWorkerHostingExtensions.cs b/...s.Runtime/AgentWorkerHostingExtensions.cs → ...s/Runtime/AgentWorkerHostingExtensions.cs
diff --git a/...gents.Runtime/AgentWorkerRegistryGrain.cs → ...gents/Runtime/AgentWorkerRegistryGrain.cs b/...gents.Runtime/AgentWorkerRegistryGrain.cs → ...gents/Runtime/AgentWorkerRegistryGrain.cs
diff --git a/.../Microsoft.AutoGen.Agents.Runtime/Host.cs → .../Microsoft.AutoGen.Agents/Runtime/Host.cs b/.../Microsoft.AutoGen.Agents.Runtime/Host.cs → .../Microsoft.AutoGen.Agents/Runtime/Host.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Hosting;
 
 namespace Microsoft.AutoGen.Agents.Runtime;
 
@@ -7,6 +8,7 @@ public static class Host
     public static async Task<WebApplication> StartAsync(bool local = false)
     {
         var builder = WebApplication.CreateBuilder();
+        builder.AddServiceDefaults();
         if (local)
         {
             builder.AddLocalAgentService();

diff --git a/...utoGen.Agents.Runtime/IAgentStateGrain.cs → ...utoGen.Agents/Runtime/IAgentStateGrain.cs b/...utoGen.Agents.Runtime/IAgentStateGrain.cs → ...utoGen.Agents/Runtime/IAgentStateGrain.cs
diff --git a/...ents.Runtime/IAgentWorkerRegistryGrain.cs → ...ents/Runtime/IAgentWorkerRegistryGrain.cs b/...ents.Runtime/IAgentWorkerRegistryGrain.cs → ...ents/Runtime/IAgentWorkerRegistryGrain.cs
diff --git a/....AutoGen.Agents.Runtime/IWorkerGateway.cs → ....AutoGen.Agents/Runtime/IWorkerGateway.cs b/....AutoGen.Agents.Runtime/IWorkerGateway.cs → ....AutoGen.Agents/Runtime/IWorkerGateway.cs
diff --git a/...e/Microsoft.AutoGen.Agents.Runtime.csproj → ...e/Microsoft.AutoGen.Agents.Runtime.csproj b/...e/Microsoft.AutoGen.Agents.Runtime.csproj → ...e/Microsoft.AutoGen.Agents.Runtime.csproj
@@ -13,7 +13,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="../Microsoft.AutoGen.Agents/Microsoft.AutoGen.Agents.csproj" />
+		<ProjectReference Include="../Abstractions/Microsoft.AutoGen.Agents.Abstractions.csproj" />
+		<ProjectReference Include="..\..\Microsoft.AutoGen.ServiceDefaults\Microsoft.AutoGen.ServiceDefaults.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/...t.AutoGen.Agents.Runtime/WorkerGateway.cs → ...t.AutoGen.Agents/Runtime/WorkerGateway.cs b/...t.AutoGen.Agents.Runtime/WorkerGateway.cs → ...t.AutoGen.Agents/Runtime/WorkerGateway.cs
diff --git a/...en.Agents.Runtime/WorkerGatewayService.cs → ...en.Agents/Runtime/WorkerGatewayService.cs b/...en.Agents.Runtime/WorkerGatewayService.cs → ...en.Agents/Runtime/WorkerGatewayService.cs
diff --git a/...Agents.Runtime/WorkerProcessConnection.cs → ...Agents/Runtime/WorkerProcessConnection.cs b/...Agents.Runtime/WorkerProcessConnection.cs → ...Agents/Runtime/WorkerProcessConnection.cs