Skip to content

Commit 60c4a2b

Browse files
CopilotCopilot
authored
Merge origin/main into dependabot Aspire search bump
2 parents 058f0f7 + 6ba6096 commit 60c4a2b

112 files changed

Lines changed: 3826 additions & 2206 deletions

File tree

Some content is hidden

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

‎.github/upgrades/prompts/SemanticKernelToAgentFramework.md‎

Lines changed: 82 additions & 78 deletions
Large diffs are not rendered by default.

‎.github/workflows/python-test-coverage-report.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88

99
permissions:
1010
contents: read
11+
actions: read
1112
pull-requests: write
1213

1314
jobs:
@@ -23,7 +24,7 @@ jobs:
2324
- name: Download coverage report
2425
uses: actions/download-artifact@v5
2526
with:
26-
github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
27+
github-token: ${{ github.token }}
2728
run-id: ${{ github.event.workflow_run.id }}
2829
path: ./python
2930
merge-multiple: true
@@ -35,13 +36,17 @@ jobs:
3536
# The PR number is needed to post the comment on the PR
3637
run: |
3738
PR_NUMBER=$(cat pr_number)
39+
if ! [[ "$PR_NUMBER" =~ ^[0-9]+$ ]]; then
40+
echo "::error::PR number file contains invalid content"
41+
exit 1
42+
fi
3843
echo "PR number: $PR_NUMBER"
3944
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
4045
- name: Pytest coverage comment
4146
id: coverageComment
4247
uses: MishaKav/pytest-coverage-comment@v1.1.57
4348
with:
44-
github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
49+
github-token: ${{ github.token }}
4550
issue-number: ${{ env.PR_NUMBER }}
4651
pytest-xml-coverage-path: python/python-coverage.xml
4752
title: "Python Test Coverage Report"

‎dotnet/Directory.Packages.props‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.Dapr" Version="9.9.0" />
1414
<PackageVersion Include="CommunityToolkit.Aspire.Hosting.NodeJS.Extensions" Version="9.9.0" />
1515
<PackageVersion Include="Aspire.Hosting.Azure.Search" Version="13.3.0" />
16+
<PackageVersion Include="MessagePack" Version="3.1.7" /> <!-- Transitive dependency of Aspire pinned to newer version due to vulnerability in 2.5.192 -->
1617
<PackageVersion Include="AWSSDK.BedrockAgent" Version="4.0.7.5" />
1718
<PackageVersion Include="AWSSDK.BedrockAgentRuntime" Version="4.0.8.5" />
1819
<PackageVersion Include="AWSSDK.BedrockRuntime" Version="4.0.14.5" />
@@ -50,10 +51,10 @@
5051
<PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
5152
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.2" />
5253
<PackageVersion Include="Markdig" Version="0.40.0" />
53-
<PackageVersion Include="Microsoft.Agents.AI.Abstractions" Version="1.0.0-preview.251009.1" />
54-
<PackageVersion Include="Microsoft.Agents.AI.OpenAI" Version="1.0.0-preview.251009.1" />
55-
<PackageVersion Include="Microsoft.Agents.AI.AzureAI" Version="1.0.0-preview.251009.1" />
56-
<PackageVersion Include="Microsoft.Agents.AI.Workflows" Version="1.0.0-preview.251009.1" />
54+
<PackageVersion Include="Microsoft.Agents.AI.Abstractions" Version="1.0.0" />
55+
<PackageVersion Include="Microsoft.Agents.AI.Foundry" Version="1.0.0" />
56+
<PackageVersion Include="Microsoft.Agents.AI.OpenAI" Version="1.0.0" />
57+
<PackageVersion Include="Microsoft.Agents.AI.Workflows" Version="1.0.0" />
5758
<PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.1.107-beta" />
5859
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
5960
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
@@ -106,7 +107,7 @@
106107
<PackageVersion Include="PdfPig" Version="0.1.13" />
107108
<PackageVersion Include="Pinecone.Client" Version="3.1.0" />
108109
<PackageVersion Include="Prompty.Core" Version="0.2.3-beta" />
109-
<PackageVersion Include="Scriban" Version="7.1.0" />
110+
<PackageVersion Include="Scriban" Version="7.2.0" />
110111
<PackageVersion Include="PuppeteerSharp" Version="20.2.5" />
111112
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.2" />
112113
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.16.0" />
@@ -136,7 +137,7 @@
136137
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.2" />
137138
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
138139
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
139-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
140+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.6" />
140141
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.2" />
141142
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
142143
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />

‎dotnet/nuget/nuget-package.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
4-
<VersionPrefix>1.76.0</VersionPrefix>
4+
<VersionPrefix>1.77.0</VersionPrefix>
55
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
66
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
77

88
<Configurations>Debug;Release;Publish</Configurations>
99
<IsPackable>true</IsPackable>
1010

1111
<!-- Package validation. Baseline Version should be the latest version available on NuGet. -->
12-
<PackageValidationBaselineVersion>1.75.0</PackageValidationBaselineVersion>
12+
<PackageValidationBaselineVersion>1.76.0</PackageValidationBaselineVersion>
1313
<!-- Validate assembly attributes only for Publish builds -->
1414
<NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
1515
<!-- Do not validate reference assemblies -->

‎dotnet/samples/AgentFrameworkMigration/AgentOrchestrations/Step01_Concurrent/AgentOrchestrations_Step01_Concurrent.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Agents.AI.Abstractions" />
14-
<PackageReference Include="Microsoft.Agents.AI.AzureAI" />
14+
<PackageReference Include="Microsoft.Agents.AI.OpenAI" />
1515
<PackageReference Include="Microsoft.Agents.AI.Workflows" />
1616
</ItemGroup>
1717

‎dotnet/samples/AgentFrameworkMigration/AgentOrchestrations/Step01_Concurrent/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ async Task AFConcurrentAgentWorkflow()
7979
var spanishAgent = GetAFTranslationAgent("Spanish", client);
8080
var concurrentAgentWorkflow = AgentWorkflowBuilder.BuildConcurrent([frenchAgent, spanishAgent]);
8181

82-
await using StreamingRun run = await InProcessExecution.StreamAsync(concurrentAgentWorkflow, "Hello, world!");
82+
await using StreamingRun run = await InProcessExecution.RunStreamingAsync(concurrentAgentWorkflow, "Hello, world!");
8383
await run.TrySendMessageAsync(new TurnToken(emitEvents: true));
8484

8585
string? lastExecutorId = null;
8686
await foreach (WorkflowEvent evt in run.WatchStreamAsync().ConfigureAwait(false))
8787
{
88-
if (evt is AgentRunUpdateEvent e)
88+
if (evt is AgentResponseUpdateEvent e)
8989
{
9090
if (string.IsNullOrEmpty(e.Update.Text))
9191
{

‎dotnet/samples/AgentFrameworkMigration/AgentOrchestrations/Step02_Sequential/AgentOrchestrations_Step02_Sequential.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Agents.AI.Abstractions" />
14-
<PackageReference Include="Microsoft.Agents.AI.AzureAI" />
14+
<PackageReference Include="Microsoft.Agents.AI.OpenAI" />
1515
<PackageReference Include="Microsoft.Agents.AI.Workflows" />
1616
</ItemGroup>
1717

‎dotnet/samples/AgentFrameworkMigration/AgentOrchestrations/Step02_Sequential/Program.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ async Task AFSequentialAgentWorkflow()
8282
var sequentialAgentWorkflow = AgentWorkflowBuilder.BuildSequential(
8383
[frenchAgent, spanishAgent, englishAgent]);
8484

85-
await using StreamingRun run = await InProcessExecution.StreamAsync(sequentialAgentWorkflow, "Hello, world!");
85+
await using StreamingRun run = await InProcessExecution.RunStreamingAsync(sequentialAgentWorkflow, "Hello, world!");
8686
await run.TrySendMessageAsync(new TurnToken(emitEvents: true));
8787

8888
string? lastExecutorId = null;
8989
await foreach (WorkflowEvent evt in run.WatchStreamAsync().ConfigureAwait(false))
9090
{
91-
if (evt is AgentRunUpdateEvent e)
91+
if (evt is AgentResponseUpdateEvent e)
9292
{
9393
if (string.IsNullOrEmpty(e.Update.Text))
9494
{

‎dotnet/samples/AgentFrameworkMigration/AgentOrchestrations/Step03_Handoff/AgentOrchestrations_Step03_Handoff.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.Agents.AI.Abstractions" />
14-
<PackageReference Include="Microsoft.Agents.AI.AzureAI" />
14+
<PackageReference Include="Microsoft.Agents.AI.OpenAI" />
1515
<PackageReference Include="Microsoft.Agents.AI.Workflows" />
1616
</ItemGroup>
1717

‎dotnet/samples/AgentFrameworkMigration/AgentOrchestrations/Step03_Handoff/Program.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Copyright (c) Microsoft. All rights reserved.
22

3+
#pragma warning disable MAAIW001 // Experimental: HandoffWorkflowBuilder
4+
35
using System.ComponentModel;
46
using System.Text.Json;
57
using Azure.AI.OpenAI;
@@ -207,13 +209,13 @@ async Task AFHandoffAgentWorkflow()
207209
Console.WriteLine($"User: {query}");
208210
messages.Add(new(ChatRole.User, query));
209211

210-
await using var run = await InProcessExecution.StreamAsync(handoffAgentWorkflow, messages);
212+
await using var run = await InProcessExecution.RunStreamingAsync(handoffAgentWorkflow, messages);
211213
await run.TrySendMessageAsync(new TurnToken(emitEvents: true));
212214

213215
string? lastExecutorId = null;
214216
await foreach (WorkflowEvent evt in run.WatchStreamAsync().ConfigureAwait(false))
215217
{
216-
if (evt is AgentRunUpdateEvent e)
218+
if (evt is AgentResponseUpdateEvent e)
217219
{
218220
if (string.IsNullOrEmpty(e.Update.Text) && e.Update.Contents.Count == 0)
219221
{

0 commit comments

Comments
 (0)