Skip to content

Commit 4bcdd83

Browse files
fboucherfboucher
authored
Merge pull request #94 from fboucher/feature/migrate-to-ai-agent-framework
Migrates AI services to Agent Framework
2 parents 189df72 + 98251db commit 4bcdd83

23 files changed

+2067
-1186
lines changed

‎.gitignore‎

Lines changed: 505 additions & 499 deletions
Large diffs are not rendered by default.

‎Directory.Packages.props‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,51 @@
1-
<Project>
2-
<ItemGroup>
3-
<!-- Aspire packages -->
4-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.2" />
5-
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.0.2" />
6-
<PackageVersion Include="Aspire.Hosting.Docker" Version="13.0.2-preview.1.25603.5" />
7-
<PackageVersion Include="Aspire.Azure.Data.Tables" Version="13.0.2" />
8-
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="13.0.2" />
9-
10-
<!-- Azure packages -->
11-
<PackageVersion Include="Azure.Data.Tables" Version="12.11.0" />
12-
<PackageVersion Include="Azure.Storage.Blobs" Version="12.26.0" />
13-
14-
<!-- Microsoft packages -->
15-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
16-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
17-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
18-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
19-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
20-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
21-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
22-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.2" />
23-
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.13.2" />
24-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
25-
26-
<!-- OpenTelemetry packages -->
27-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
28-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
29-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
30-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
31-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
32-
33-
<!-- Other packages -->
34-
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
35-
<PackageVersion Include="Markdig" Version="0.44.0" />
36-
<PackageVersion Include="Reka.SDK" Version="0.1.1" />
37-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
38-
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
39-
40-
<!-- Test packages -->
41-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
42-
<PackageVersion Include="FluentAssertions" Version="8.8.0" />
43-
<PackageVersion Include="Moq" Version="4.20.72" />
44-
<PackageVersion Include="Testcontainers.Azurite" Version="4.9.0" />
45-
<PackageVersion Include="xunit" Version="2.9.3" />
46-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
47-
</ItemGroup>
48-
</Project>
1+
<Project>
2+
<ItemGroup>
3+
<!-- Aspire packages -->
4+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.2" />
5+
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.0.2" />
6+
<PackageVersion Include="Aspire.Hosting.Docker" Version="13.0.2-preview.1.25603.5" />
7+
<PackageVersion Include="Aspire.Azure.Data.Tables" Version="13.0.2" />
8+
<PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="13.0.2" />
9+
10+
<!-- Azure packages -->
11+
<PackageVersion Include="Azure.Data.Tables" Version="12.11.0" />
12+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.26.0" />
13+
14+
<!-- Microsoft packages -->
15+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
16+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.1" />
17+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
18+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
19+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
20+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
21+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
22+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
23+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
24+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.2" />
25+
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.13.2" />
26+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
27+
28+
<!-- OpenTelemetry packages -->
29+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
30+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
31+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
32+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
33+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
34+
35+
<!-- Other packages -->
36+
<PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
37+
<PackageVersion Include="Markdig" Version="0.44.0" />
38+
<PackageVersion Include="Microsoft.Agents.AI" Version="1.0.0-preview.260209.1" />
39+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.1.1-preview.1.25612.2" />
40+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
41+
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
42+
43+
<!-- Test packages -->
44+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
45+
<PackageVersion Include="FluentAssertions" Version="8.8.0" />
46+
<PackageVersion Include="Moq" Version="4.20.72" />
47+
<PackageVersion Include="Testcontainers.Azurite" Version="4.9.0" />
48+
<PackageVersion Include="xunit" Version="2.9.3" />
49+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
50+
</ItemGroup>
51+
</Project>

‎NoteBookmark.sln‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.Api.Tests", "s
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.AIServices", "src\NoteBookmark.AIServices\NoteBookmark.AIServices.csproj", "{D29D80A5-82EC-4350-B738-96BAF88EB9DD}"
1919
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
21+
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoteBookmark.AIServices.Tests", "src\NoteBookmark.AIServices.Tests\NoteBookmark.AIServices.Tests.csproj", "{13B6E1BC-4B32-4082-A080-FE443F598967}"
23+
EndProject
2024
Global
2125
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2226
Debug|Any CPU = Debug|Any CPU
@@ -111,10 +115,25 @@ Global
111115
{D29D80A5-82EC-4350-B738-96BAF88EB9DD}.Release|x64.Build.0 = Release|Any CPU
112116
{D29D80A5-82EC-4350-B738-96BAF88EB9DD}.Release|x86.ActiveCfg = Release|Any CPU
113117
{D29D80A5-82EC-4350-B738-96BAF88EB9DD}.Release|x86.Build.0 = Release|Any CPU
118+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Debug|Any CPU.Build.0 = Debug|Any CPU
120+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Debug|x64.ActiveCfg = Debug|Any CPU
121+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Debug|x64.Build.0 = Debug|Any CPU
122+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Debug|x86.ActiveCfg = Debug|Any CPU
123+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Debug|x86.Build.0 = Debug|Any CPU
124+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Release|Any CPU.ActiveCfg = Release|Any CPU
125+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Release|Any CPU.Build.0 = Release|Any CPU
126+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Release|x64.ActiveCfg = Release|Any CPU
127+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Release|x64.Build.0 = Release|Any CPU
128+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Release|x86.ActiveCfg = Release|Any CPU
129+
{13B6E1BC-4B32-4082-A080-FE443F598967}.Release|x86.Build.0 = Release|Any CPU
114130
EndGlobalSection
115131
GlobalSection(SolutionProperties) = preSolution
116132
HideSolutionNode = FALSE
117133
EndGlobalSection
134+
GlobalSection(NestedProjects) = preSolution
135+
{13B6E1BC-4B32-4082-A080-FE443F598967} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
136+
EndGlobalSection
118137
GlobalSection(ExtensibilityGlobals) = postSolution
119138
SolutionGuid = {D59FFF09-97C3-47EF-B64D-B014BFA22C80}
120139
EndGlobalSection

‎src/NoteBookmark.AIServices.Tests/NoteBookmark.AIServices.Tests.csproj‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
<IsTestProject>true</IsTestProject>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="coverlet.collector">
10+
<PrivateAssets>all</PrivateAssets>
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
</PackageReference>
13+
<PackageReference Include="FluentAssertions" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
17+
<PackageReference Include="Moq" />
18+
<PackageReference Include="xunit" />
19+
<PackageReference Include="xunit.runner.visualstudio">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<ProjectReference Include="..\NoteBookmark.AIServices\NoteBookmark.AIServices.csproj" />
27+
<ProjectReference Include="..\NoteBookmark.Domain\NoteBookmark.Domain.csproj" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<Using Include="Xunit" />
32+
<Using Include="FluentAssertions" />
33+
<Using Include="Moq" />
34+
</ItemGroup>
35+
36+
</Project>

0 commit comments

Comments
 (0)
⚡