Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
12d91c0
Update Microsoft.Agents.AI.AzureAI for Azure.AI.Projects SDK 2.0.0
rogerbarreto Feb 17, 2026
b5b7fc4
Merge branch 'microsoft:main' into features/ai-project-2.0.0-update
rogerbarreto Feb 25, 2026
14f28dc
Update Azure.AI.Projects to 2.0.0-beta.1 from NuGet.org
rogerbarreto Feb 25, 2026
14aa96d
Move s_modelWriterOptionsWire field before methods that use it
rogerbarreto Feb 25, 2026
437310a
Merge remote-tracking branch 'origin/main' into features/ai-project-2…
rogerbarreto Feb 26, 2026
cc78ab2
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Feb 27, 2026
98963e1
Fix flaky test: prevent spurious workflow_invoke Activity on timeout …
rogerbarreto Feb 27, 2026
6ce7f01
Fix epoch race condition causing unit tests to hang on net10.0 and ne…
rogerbarreto Feb 27, 2026
945ca7b
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Mar 2, 2026
4f9c3db
Revert "Fix epoch race condition causing unit tests to hang on net10.…
rogerbarreto Mar 2, 2026
c8dd8fd
Revert "Fix flaky test: prevent spurious workflow_invoke Activity on …
rogerbarreto Mar 2, 2026
95af21c
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Mar 2, 2026
d694f41
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Mar 3, 2026
ca6e016
Skip hanging multi-turn declarative integration tests
rogerbarreto Mar 3, 2026
fd5d87d
Remove unused using directive in IntegrationTest.cs
rogerbarreto Mar 3, 2026
3e2e022
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Mar 3, 2026
a6fa011
Restore Azure.AI.Projects 2.0.0-beta.1 version bump
rogerbarreto Mar 3, 2026
a977774
Merge branch 'main' of https://github.com/microsoft/agent-framework i…
rogerbarreto Mar 3, 2026
5b07934
Merge branch 'features/ai-project-2.0.0-update' of https://github.com…
rogerbarreto Mar 3, 2026
8aa1d0e
Address merge conflict
rogerbarreto Mar 3, 2026
f65203c
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Mar 3, 2026
927325d
Skip flaky WorkflowRunActivity_IsStopped_Streaming_OffThread_MultiTur…
rogerbarreto Mar 3, 2026
9306e31
Merge branch 'main' into features/ai-project-2.0.0-update
rogerbarreto Mar 3, 2026
67247b3
Skip CheckSystem test cases temporarily
rogerbarreto Mar 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dotnet/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="13.0.0" />
<!-- Azure.* -->
<PackageVersion Include="Azure.AI.Projects" Version="1.2.0-beta.5" />
<PackageVersion Include="Azure.AI.Projects.OpenAI" Version="1.0.0-beta.5" />
<PackageVersion Include="Azure.AI.Projects" Version="2.0.0-beta.1" />
<PackageVersion Include="Azure.AI.Projects.OpenAI" Version="2.0.0-beta.1" />
<PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.8" />
<PackageVersion Include="Azure.AI.OpenAI" Version="2.8.0-beta.1" />
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
Expand All @@ -35,7 +35,7 @@
<!-- System.* -->
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.3" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageVersion Include="System.ClientModel" Version="1.8.1" />
<PackageVersion Include="System.ClientModel" Version="1.9.0" />
<PackageVersion Include="System.CodeDom" Version="10.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-rc.2.25502.107" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

// Submit the red team run to the service
Console.WriteLine("Submitting red team run...");
RedTeam redTeamRun = await aiProjectClient.RedTeams.CreateAsync(redTeamConfig);
RedTeam redTeamRun = await aiProjectClient.RedTeams.CreateAsync(redTeamConfig, options: null);

Console.WriteLine($"Red team run created: {redTeamRun.Name}");
Console.WriteLine($"Status: {redTeamRun.Status}");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Use the memory search tool to recall relevant information from previous interact
AIProjectClient aiProjectClient = new(new Uri(endpoint), new AzureCliCredential());

// Create the Memory Search tool configuration
MemorySearchTool memorySearchTool = new(memoryStoreName, userScope)
MemorySearchPreviewTool memorySearchTool = new(memoryStoreName, userScope)
{
// Optional: Configure how quickly new memories are indexed (in seconds)
UpdateDelay = 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ private static async Task<AgentVersion> CreateWorkflowAsync(AIProjectClient agen
{
string workflowYaml = File.ReadAllText("MathChat.yaml");

#pragma warning disable AAIP001 // WorkflowAgentDefinition is experimental
WorkflowAgentDefinition workflowAgentDefinition = WorkflowAgentDefinition.FromYaml(workflowYaml);
#pragma warning restore AAIP001

return
await agentClient.CreateAgentAsync(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static partial class AzureAIProjectChatClientExtensions
/// <exception cref="InvalidOperationException">The agent with the specified name was not found.</exception>
/// <remarks>
/// When instantiating a <see cref="ChatClientAgent"/> by using an <see cref="AgentReference"/>, minimal information will be available about the agent in the instance level, and any logic that relies
/// on <see cref="AIAgent.GetService(Type, object?)"/> to retrieve information about the agent like <see cref="AgentVersion" /> will receive <see langword="null"/> as the result.
/// on <see cref="AIAgent.GetService{TService}(object?)"/> to retrieve information about the agent like <see cref="AgentVersion" /> will receive <see langword="null"/> as the result.
/// </remarks>
public static ChatClientAgent AsAIAgent(
this AIProjectClient aiProjectClient,
Expand Down Expand Up @@ -355,28 +355,27 @@ public static Task<ChatClientAgent> CreateAIAgentAsync(
private static readonly ModelReaderWriterOptions s_modelWriterOptionsWire = new("W");

/// <summary>
/// Asynchronously retrieves an agent record by name using the Protocol method with user-agent header.
/// Asynchronously retrieves an agent record by name using the protocol method to inject user-agent headers.
/// </summary>
private static async Task<AgentRecord> GetAgentRecordByNameAsync(AIProjectClient aiProjectClient, string agentName, CancellationToken cancellationToken)
{
ClientResult protocolResponse = await aiProjectClient.Agents.GetAgentAsync(agentName, cancellationToken.ToRequestOptions(false)).ConfigureAwait(false);
var rawResponse = protocolResponse.GetRawResponse();
AgentRecord? result = ModelReaderWriter.Read<AgentRecord>(rawResponse.Content, s_modelWriterOptionsWire, AzureAIProjectsOpenAIContext.Default);
return ClientResult.FromOptionalValue(result, rawResponse).Value!
?? throw new InvalidOperationException($"Agent with name '{agentName}' not found.");
return result ?? throw new InvalidOperationException($"Agent with name '{agentName}' not found.");
}

/// <summary>
/// Asynchronously creates an agent version using the Protocol method with user-agent header.
/// Asynchronously creates an agent version using the protocol method to inject user-agent headers.
/// </summary>
private static async Task<AgentVersion> CreateAgentVersionWithProtocolAsync(AIProjectClient aiProjectClient, string agentName, AgentVersionCreationOptions creationOptions, CancellationToken cancellationToken)
{
using BinaryContent protocolRequest = BinaryContent.Create(ModelReaderWriter.Write(creationOptions, ModelReaderWriterOptions.Json, AzureAIProjectsContext.Default));
ClientResult protocolResponse = await aiProjectClient.Agents.CreateAgentVersionAsync(agentName, protocolRequest, cancellationToken.ToRequestOptions(false)).ConfigureAwait(false);

BinaryData serializedOptions = ModelReaderWriter.Write(creationOptions, s_modelWriterOptionsWire, AzureAIProjectsContext.Default);
BinaryContent content = BinaryContent.Create(serializedOptions);
ClientResult protocolResponse = await aiProjectClient.Agents.CreateAgentVersionAsync(agentName, content, foundryFeatures: null, cancellationToken.ToRequestOptions(false)).ConfigureAwait(false);
var rawResponse = protocolResponse.GetRawResponse();
AgentVersion? result = ModelReaderWriter.Read<AgentVersion>(rawResponse.Content, s_modelWriterOptionsWire, AzureAIProjectsOpenAIContext.Default);
return ClientResult.FromValue(result, rawResponse).Value!;
return result ?? throw new InvalidOperationException($"Failed to create agent version for agent '{agentName}'.");
}

private static async Task<ChatClientAgent> CreateAIAgentAsync(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft. All rights reserved.
// Copyright (c) Microsoft. All rights reserved.

using System.Collections.Generic;
using System.Linq;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft. All rights reserved.
// Copyright (c) Microsoft. All rights reserved.

using System.Threading.Tasks;
using AgentConformance.IntegrationTests.Support;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Microsoft. All rights reserved.
// Copyright (c) Microsoft. All rights reserved.

using System;
using System.Collections.Generic;
Expand Down
Loading
Loading