Skip to content

Commit f7c7e3a

Browse files
committed
refactor paths, add test projects for Grpc runtime and client
1 parent 127a2e5 commit f7c7e3a

File tree

65 files changed

+113
-1165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+113
-1165
lines changed

dotnet/AutoGen.sln

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloAgentState", "samples\
4444
EndProject
4545
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello.Shared", "samples\Hello\Hello.Shared\Hello.Shared.csproj", "{F16058BE-1BE9-79AE-119E-A220BC6AADED}"
4646
EndProject
47-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Contracts", "src\Microsoft.AutoGen\Core\Microsoft.AutoGen.Contracts.csproj", "{1222A7E7-F9C7-D89F-4953-EE063A7FDE49}"
48-
EndProject
49-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core", "src\Microsoft.AutoGen\Client\Microsoft.AutoGen.Core.csproj", "{03E150AA-3B93-B2AA-3141-1AE4A3481115}"
50-
EndProject
51-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Runtime.Grpc", "src\Microsoft.AutoGen\DistributedRuntime\Microsoft.AutoGen.Runtime.Grpc.csproj", "{F8726BFF-8D62-BFAB-D000-BFAA8B55649B}"
52-
EndProject
5347
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevTeam.ServiceDefaults", "samples\dev-team\DevTeam.ServiceDefaults\DevTeam.ServiceDefaults.csproj", "{E55D9022-21A9-DE0A-A739-A0D02D46BA69}"
5448
EndProject
5549
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Autogen.Tests.Shared", "test\Microsoft.Autogen.Tests.Shared\Microsoft.Autogen.Tests.Shared.csproj", "{B0DD1ED1-9EB6-4BF8-8CA8-8E1316A11423}"
5650
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Autogen.AgentHost", "src\Microsoft.AutoGen\AgentHost\Microsoft.Autogen.AgentHost\Microsoft.Autogen.AgentHost.csproj", "{BDAC766C-7BAF-4890-AC4D-6569D063A208}"
58-
EndProject
5951
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core.Grpc", "src\Microsoft.AutoGen\Microsoft.AutoGen.Core.Grpc\Microsoft.AutoGen.Core.Grpc.csproj", "{AC738109-3DF8-4D84-82BA-59CEE5C5A0F3}"
6052
EndProject
6153
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core.Tests", "test\Microsoft.AutoGen.Core.Tests\Microsoft.AutoGen.Core.Tests.csproj", "{3128E700-5AC5-4929-BFDC-ABC8A3146BAD}"
6254
EndProject
55+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Autogen.AgentHost", "src\Microsoft.AutoGen\Microsoft.Autogen.AgentHost\Microsoft.Autogen.AgentHost.csproj", "{A0FB9409-23F6-FE25-554A-01F820496BAA}"
56+
EndProject
57+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Contracts", "src\Microsoft.AutoGen\Microsoft.AutoGen.Contracts\Microsoft.AutoGen.Contracts.csproj", "{EAE90E4B-00E2-5574-702F-916AE1F57D44}"
58+
EndProject
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core", "src\Microsoft.AutoGen\Microsoft.AutoGen.Core\Microsoft.AutoGen.Core.csproj", "{39F81896-5417-6181-12C2-4E609EB0A485}"
60+
EndProject
61+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Runtime.Grpc", "src\Microsoft.AutoGen\Microsoft.AutoGen.Runtime.Grpc\Microsoft.AutoGen.Runtime.Grpc.csproj", "{6EF624FB-4247-138B-67FC-9ECC925FC4FA}"
62+
EndProject
63+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core.Grpc.Tests", "test\Microsoft.AutoGen.Core.Grpc.Tests\Microsoft.AutoGen.Core.Grpc.Tests.csproj", "{FCCE32DE-8162-47F3-835D-2EF78D4381C3}"
64+
EndProject
65+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Runtime.Grpc.Tests", "test\Microsoft.AutoGen.Runtime.Grpc.Tests\Microsoft.AutoGen.Runtime.Grpc.Tests.csproj", "{8881C07D-5B57-4D7A-81D2-65A727315A2F}"
66+
EndProject
6367
Global
6468
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6569
Debug|Any CPU = Debug|Any CPU
@@ -102,18 +106,6 @@ Global
102106
{F16058BE-1BE9-79AE-119E-A220BC6AADED}.Debug|Any CPU.Build.0 = Debug|Any CPU
103107
{F16058BE-1BE9-79AE-119E-A220BC6AADED}.Release|Any CPU.ActiveCfg = Release|Any CPU
104108
{F16058BE-1BE9-79AE-119E-A220BC6AADED}.Release|Any CPU.Build.0 = Release|Any CPU
105-
{1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106-
{1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Debug|Any CPU.Build.0 = Debug|Any CPU
107-
{1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Release|Any CPU.ActiveCfg = Release|Any CPU
108-
{1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Release|Any CPU.Build.0 = Release|Any CPU
109-
{03E150AA-3B93-B2AA-3141-1AE4A3481115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110-
{03E150AA-3B93-B2AA-3141-1AE4A3481115}.Debug|Any CPU.Build.0 = Debug|Any CPU
111-
{03E150AA-3B93-B2AA-3141-1AE4A3481115}.Release|Any CPU.ActiveCfg = Release|Any CPU
112-
{03E150AA-3B93-B2AA-3141-1AE4A3481115}.Release|Any CPU.Build.0 = Release|Any CPU
113-
{F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114-
{F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Debug|Any CPU.Build.0 = Debug|Any CPU
115-
{F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Release|Any CPU.ActiveCfg = Release|Any CPU
116-
{F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Release|Any CPU.Build.0 = Release|Any CPU
117109
{E55D9022-21A9-DE0A-A739-A0D02D46BA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118110
{E55D9022-21A9-DE0A-A739-A0D02D46BA69}.Debug|Any CPU.Build.0 = Debug|Any CPU
119111
{E55D9022-21A9-DE0A-A739-A0D02D46BA69}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -122,10 +114,6 @@ Global
122114
{B0DD1ED1-9EB6-4BF8-8CA8-8E1316A11423}.Debug|Any CPU.Build.0 = Debug|Any CPU
123115
{B0DD1ED1-9EB6-4BF8-8CA8-8E1316A11423}.Release|Any CPU.ActiveCfg = Release|Any CPU
124116
{B0DD1ED1-9EB6-4BF8-8CA8-8E1316A11423}.Release|Any CPU.Build.0 = Release|Any CPU
125-
{BDAC766C-7BAF-4890-AC4D-6569D063A208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126-
{BDAC766C-7BAF-4890-AC4D-6569D063A208}.Debug|Any CPU.Build.0 = Debug|Any CPU
127-
{BDAC766C-7BAF-4890-AC4D-6569D063A208}.Release|Any CPU.ActiveCfg = Release|Any CPU
128-
{BDAC766C-7BAF-4890-AC4D-6569D063A208}.Release|Any CPU.Build.0 = Release|Any CPU
129117
{AC738109-3DF8-4D84-82BA-59CEE5C5A0F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
130118
{AC738109-3DF8-4D84-82BA-59CEE5C5A0F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
131119
{AC738109-3DF8-4D84-82BA-59CEE5C5A0F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -134,6 +122,30 @@ Global
134122
{3128E700-5AC5-4929-BFDC-ABC8A3146BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
135123
{3128E700-5AC5-4929-BFDC-ABC8A3146BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
136124
{3128E700-5AC5-4929-BFDC-ABC8A3146BAD}.Release|Any CPU.Build.0 = Release|Any CPU
125+
{A0FB9409-23F6-FE25-554A-01F820496BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126+
{A0FB9409-23F6-FE25-554A-01F820496BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
127+
{A0FB9409-23F6-FE25-554A-01F820496BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
128+
{A0FB9409-23F6-FE25-554A-01F820496BAA}.Release|Any CPU.Build.0 = Release|Any CPU
129+
{EAE90E4B-00E2-5574-702F-916AE1F57D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
130+
{EAE90E4B-00E2-5574-702F-916AE1F57D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
131+
{EAE90E4B-00E2-5574-702F-916AE1F57D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
132+
{EAE90E4B-00E2-5574-702F-916AE1F57D44}.Release|Any CPU.Build.0 = Release|Any CPU
133+
{39F81896-5417-6181-12C2-4E609EB0A485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
134+
{39F81896-5417-6181-12C2-4E609EB0A485}.Debug|Any CPU.Build.0 = Debug|Any CPU
135+
{39F81896-5417-6181-12C2-4E609EB0A485}.Release|Any CPU.ActiveCfg = Release|Any CPU
136+
{39F81896-5417-6181-12C2-4E609EB0A485}.Release|Any CPU.Build.0 = Release|Any CPU
137+
{6EF624FB-4247-138B-67FC-9ECC925FC4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
138+
{6EF624FB-4247-138B-67FC-9ECC925FC4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
139+
{6EF624FB-4247-138B-67FC-9ECC925FC4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
140+
{6EF624FB-4247-138B-67FC-9ECC925FC4FA}.Release|Any CPU.Build.0 = Release|Any CPU
141+
{FCCE32DE-8162-47F3-835D-2EF78D4381C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
142+
{FCCE32DE-8162-47F3-835D-2EF78D4381C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
143+
{FCCE32DE-8162-47F3-835D-2EF78D4381C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
144+
{FCCE32DE-8162-47F3-835D-2EF78D4381C3}.Release|Any CPU.Build.0 = Release|Any CPU
145+
{8881C07D-5B57-4D7A-81D2-65A727315A2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
146+
{8881C07D-5B57-4D7A-81D2-65A727315A2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
147+
{8881C07D-5B57-4D7A-81D2-65A727315A2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
148+
{8881C07D-5B57-4D7A-81D2-65A727315A2F}.Release|Any CPU.Build.0 = Release|Any CPU
137149
EndGlobalSection
138150
GlobalSection(SolutionProperties) = preSolution
139151
HideSolutionNode = FALSE
@@ -150,14 +162,16 @@ Global
150162
{8F7560CF-EEBB-4333-A69F-838CA40FD85D} = {7EB336C2-7C0A-4BC8-80C6-A3173AB8DC45}
151163
{64EF61E7-00A6-4E5E-9808-62E10993A0E5} = {7EB336C2-7C0A-4BC8-80C6-A3173AB8DC45}
152164
{F16058BE-1BE9-79AE-119E-A220BC6AADED} = {7EB336C2-7C0A-4BC8-80C6-A3173AB8DC45}
153-
{1222A7E7-F9C7-D89F-4953-EE063A7FDE49} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
154-
{03E150AA-3B93-B2AA-3141-1AE4A3481115} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
155-
{F8726BFF-8D62-BFAB-D000-BFAA8B55649B} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
156165
{E55D9022-21A9-DE0A-A739-A0D02D46BA69} = {05B9C173-6441-4DCA-9AC4-E897EF75F331}
157166
{B0DD1ED1-9EB6-4BF8-8CA8-8E1316A11423} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
158-
{BDAC766C-7BAF-4890-AC4D-6569D063A208} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
159167
{AC738109-3DF8-4D84-82BA-59CEE5C5A0F3} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
160168
{3128E700-5AC5-4929-BFDC-ABC8A3146BAD} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
169+
{A0FB9409-23F6-FE25-554A-01F820496BAA} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
170+
{EAE90E4B-00E2-5574-702F-916AE1F57D44} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
171+
{39F81896-5417-6181-12C2-4E609EB0A485} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
172+
{6EF624FB-4247-138B-67FC-9ECC925FC4FA} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}
173+
{FCCE32DE-8162-47F3-835D-2EF78D4381C3} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
174+
{8881C07D-5B57-4D7A-81D2-65A727315A2F} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}
161175
EndGlobalSection
162176
GlobalSection(ExtensibilityGlobals) = postSolution
163177
SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B}

dotnet/samples/Hello/HelloAIAgents/HelloAIAgents.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Client\Microsoft.AutoGen.Core.csproj" />
15+
<ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Microsoft.AutoGen.Core\Microsoft.AutoGen.Core.csproj" />
1616
<ProjectReference Include="..\Hello.Shared\Hello.Shared.csproj" />
1717
</ItemGroup>
1818
</Project>

dotnet/samples/Hello/HelloAgent/HelloAgent.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Client\Microsoft.AutoGen.Core.csproj" />
18+
<ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Microsoft.AutoGen.Core\Microsoft.AutoGen.Core.csproj" />
1919
<ProjectReference Include="..\Hello.Shared\Hello.Shared.csproj" />
2020
</ItemGroup>
2121
</Project>

dotnet/samples/Hello/HelloAgentState/HelloAgentState.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Client\Microsoft.AutoGen.Core.csproj" />
15+
<ProjectReference Include="..\..\..\src\Microsoft.AutoGen\Microsoft.AutoGen.Core\Microsoft.AutoGen.Core.csproj" />
1616
<ProjectReference Include="..\Hello.Shared\Hello.Shared.csproj" />
1717
</ItemGroup>
1818
</Project>

dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/InferenceAgent.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/SKAiAgent.cs

Lines changed: 0 additions & 89 deletions
This file was deleted.

dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs

Lines changed: 0 additions & 64 deletions
This file was deleted.

dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)