Skip to content

Commit 9595272

Browse files
authored
Merge branch 'main' into googlevertext
2 parents d1cdc62 + 820c6af commit 9595272

File tree

155 files changed

+4229
-1908
lines changed

Some content is hidden

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

155 files changed

+4229
-1908
lines changed

.github/.linkspector.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ignorePatterns:
1212
- pattern: "https:\/\/platform.openai.com"
1313
- pattern: "http:\/\/localhost"
1414
- pattern: "http:\/\/127.0.0.1"
15+
- pattern: "https:\/\/localhost"
16+
- pattern: "https:\/\/127.0.0.1"
1517
- pattern: "0001-spec.md"
1618
- pattern: "0001-madr-architecture-decisions.md"
1719
- pattern: "https://api.powerplatform.com/.default"

.github/workflows/dotnet-build-and-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
.
7575
.github
7676
dotnet
77+
python
7778
workflow-samples
7879
7980
- name: Setup dotnet

docs/FAQS.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ To download nightly builds follow the following steps:
2323
<configuration>
2424
<packageSources>
2525
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
26-
<add key="github" value="https://nuget.pkg.github.com/microsoft/index.json" />
26+
<add key="GitHubMicrosoft" value="https://nuget.pkg.github.com/microsoft/index.json" />
2727
</packageSources>
2828
2929
<packageSourceMapping>
3030
<packageSource key="nuget.org">
3131
<package pattern="*" />
3232
</packageSource>
33-
<packageSource key="github">
33+
<packageSource key="GitHubMicrosoft">
3434
<package pattern="*nightly"/>
3535
</packageSource>
3636
</packageSourceMapping>
3737
3838
<packageSourceCredentials>
39-
<github>
40-
<add key="Username" value="<Your GitHub Id>" />
41-
<add key="ClearTextPassword" value="<Your Personal Access Token>" />
42-
</github>
39+
<GitHubMicrosoft>
40+
<add key="Username" value="<Your GitHub Id>" />
41+
<add key="ClearTextPassword" value="<Your Personal Access Token>" />
42+
</GitHubMicrosoft>
4343
</packageSourceCredentials>
4444
</configuration>
4545
```

dotnet/Directory.Packages.props

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireAppHostSdkVersion)" />
1616
<PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(AspireAppHostSdkVersion)" />
1717
<PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(AspireAppHostSdkVersion)" />
18-
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.8.0" />
18+
<PackageVersion Include="CommunityToolkit.Aspire.OllamaSharp" Version="9.9.0" />
1919
<!-- Azure.* -->
2020
<PackageVersion Include="Azure.AI.Agents.Persistent" Version="1.2.0-beta.7" />
2121
<PackageVersion Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
@@ -68,13 +68,15 @@
6868
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
6969
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireAppHostSdkVersion)" />
7070
<PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="9.7.0" />
71-
<!-- Vector Stores -->
71+
<!-- Semantic Kernel -->
7272
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
73-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.66.0-preview" />
74-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.66.0-preview" />
7573
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Core" Version="1.66.0" />
7674
<PackageVersion Include="Microsoft.SemanticKernel.Agents.OpenAI" Version="1.66.0-preview" />
7775
<PackageVersion Include="Microsoft.SemanticKernel.Agents.AzureAI" Version="1.66.0-preview" />
76+
<PackageVersion Include="Microsoft.SemanticKernel.Plugins.OpenApi" Version="1.66.0" />
77+
<!-- Vector Stores -->
78+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.66.0-preview" />
79+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.66.0-preview" />
7880
<!-- Agent SDKs -->
7981
<PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.2.41" />
8082
<!-- A2A -->
@@ -84,7 +86,7 @@
8486
<PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
8587
<!-- Inference SDKs -->
8688
<PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
87-
<PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.4.1" />
89+
<PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.4.2" />
8890
<PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
8991
<PackageVersion Include="OllamaSharp" Version="5.4.8" />
9092
<PackageVersion Include="OpenAI" Version="2.6.0" />

dotnet/agent-framework-dotnet.slnx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<File Path="samples/GettingStarted/Agents/README.md" />
4848
<Project Path="samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj" />
4949
<Project Path="samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj" />
50-
<Project Path="samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj" />
50+
<Project Path="samples/GettingStarted/Agents/Agent_Step03.1_UsingFunctionTools/Agent_Step03.1_UsingFunctionTools.csproj" />
51+
<Project Path="samples/GettingStarted/Agents/Agent_Step03.2_UsingFunctionTools_FromOpenAPI/Agent_Step03.2_UsingFunctionTools_FromOpenAPI.csproj" />
5152
<Project Path="samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
5253
<Project Path="samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
5354
<Project Path="samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
@@ -66,6 +67,10 @@
6667
<Project Path="samples/GettingStarted/Agents/Agent_Step19_Mem0Provider/Agent_Step19_Mem0Provider.csproj" />
6768
<Project Path="samples/GettingStarted/Agents/Agent_Step20_BackgroundResponsesWithToolsAndPersistence/Agent_Step20_BackgroundResponsesWithToolsAndPersistence.csproj" />
6869
</Folder>
70+
<Folder Name="/Samples/GettingStarted/DevUI/">
71+
<File Path="samples/GettingStarted/DevUI/README.md" />
72+
<Project Path="samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj" />
73+
</Folder>
6974
<Folder Name="/Samples/GettingStarted/AgentWithOpenAI/">
7075
<File Path="samples/GettingStarted/AgentWithOpenAI/README.md" />
7176
<Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj" />
@@ -150,8 +155,8 @@
150155
<Project Path="samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/08_WriterCriticWorkflow.csproj" />
151156
</Folder>
152157
<Folder Name="/Samples/Catalog/">
153-
<Project Path="samples/Catalog/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
154158
<Project Path="samples/Catalog/AgentsInWorkflows/AgentsInWorkflows.csproj" />
159+
<Project Path="samples/Catalog/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
155160
<Project Path="samples/Catalog/DeepResearchAgent/DeepResearchAgent.csproj" />
156161
</Folder>
157162
<Folder Name="/Solution Items/">
@@ -279,6 +284,7 @@
279284
<Project Path="src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj" />
280285
<Project Path="src/Microsoft.Agents.AI.AzureAI.Persistent/Microsoft.Agents.AI.AzureAI.Persistent.csproj" />
281286
<Project Path="src/Microsoft.Agents.AI.CopilotStudio/Microsoft.Agents.AI.CopilotStudio.csproj" />
287+
<Project Path="src/Microsoft.Agents.AI.DevUI/Microsoft.Agents.AI.DevUI.csproj" />
282288
<Project Path="src/Microsoft.Agents.AI.Hosting.A2A.AspNetCore/Microsoft.Agents.AI.Hosting.A2A.AspNetCore.csproj" />
283289
<Project Path="src/Microsoft.Agents.AI.Hosting.A2A/Microsoft.Agents.AI.Hosting.A2A.csproj" />
284290
<Project Path="src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.csproj" />
@@ -304,8 +310,8 @@
304310
</Folder>
305311
<Folder Name="/Tests/UnitTests/">
306312
<Project Path="tests/Microsoft.Agents.AI.A2A.UnitTests/Microsoft.Agents.AI.A2A.UnitTests.csproj" />
307-
<Project Path="tests/Microsoft.Agents.AI.AGUI.UnitTests/Microsoft.Agents.AI.AGUI.UnitTests.csproj" />
308313
<Project Path="tests/Microsoft.Agents.AI.Abstractions.UnitTests/Microsoft.Agents.AI.Abstractions.UnitTests.csproj" />
314+
<Project Path="tests/Microsoft.Agents.AI.AGUI.UnitTests/Microsoft.Agents.AI.AGUI.UnitTests.csproj" />
309315
<Project Path="tests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests/Microsoft.Agents.AI.AzureAI.Persistent.UnitTests.csproj" />
310316
<Project Path="tests/Microsoft.Agents.AI.Hosting.A2A.Tests/Microsoft.Agents.AI.Hosting.A2A.Tests.csproj" Id="2a1c544d-237d-4436-8732-ba0c447ac06b" />
311317
<Project Path="tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests.csproj" />

dotnet/nuget/nuget-package.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<PropertyGroup>
33
<!-- Central version prefix - applies to all nuget packages. -->
44
<VersionPrefix>1.0.0</VersionPrefix>
5-
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251104.1</PackageVersion>
6-
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251104.1</PackageVersion>
7-
<GitTag>1.0.0-preview.251104.1</GitTag>
5+
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251105.1</PackageVersion>
6+
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251105.1</PackageVersion>
7+
<GitTag>1.0.0-preview.251105.1</GitTag>
88

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

dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Agent_Step03_UsingFunctionTools.csproj renamed to dotnet/samples/GettingStarted/Agents/Agent_Step03.1_UsingFunctionTools/Agent_Step03.1_UsingFunctionTools.csproj

File renamed without changes.

dotnet/samples/GettingStarted/Agents/Agent_Step03_UsingFunctionTools/Program.cs renamed to dotnet/samples/GettingStarted/Agents/Agent_Step03.1_UsingFunctionTools/Program.cs

File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net9.0</TargetFramework>
6+
7+
<Nullable>enable</Nullable>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Azure.AI.OpenAI" />
13+
<PackageReference Include="Azure.Identity" />
14+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
15+
<PackageReference Include="Microsoft.SemanticKernel.Plugins.OpenApi" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<ProjectReference Include="..\..\..\..\src\Microsoft.Agents.AI.OpenAI\Microsoft.Agents.AI.OpenAI.csproj" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<None Update="OpenAPISpec.json">
24+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25+
</None>
26+
</ItemGroup>
27+
28+
</Project>

0 commit comments

Comments
 (0)