Files
agent-framework/dotnet/tests
T
alliscode a828f3463c Merge main into feature/responses-hosting - resolve conflicts
Resolved 3 conflicts (keep both sides):
- Directory.Packages.props: keep higher OpenTelemetry versions (1.15.0/1.14.0)
- agent-framework-dotnet.slnx: keep both Evaluation folder and FoundryHostedAgents entries
- Foundry.csproj: keep both Evaluation support and AgentServer.Responses packages

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
a828f3463c · 2026-04-21 09:50:03 -07:00
History
..