Skip to content

Commit 85fcd23

Browse files
dmytrostrukdmytrostruk
committed
Revert "Merge from main"
This reverts commit b8206a8.
1 parent b8206a8 commit 85fcd23

File tree

231 files changed

+4595
-20111
lines changed

Some content is hidden

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

231 files changed

+4595
-20111
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ name: dotnet-build-and-test
88
on:
99
workflow_dispatch:
1010
pull_request:
11-
branches: ["main", "feature*"]
11+
branches: ["main"]
1212
merge_group:
13-
branches: ["main", "feature*"]
13+
branches: ["main"]
1414
push:
15-
branches: ["main", "feature*"]
15+
branches: ["main"]
1616
schedule:
1717
- cron: "0 0 * * *" # Run at midnight UTC daily
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
4040
- name: Pytest coverage comment
4141
id: coverageComment
42-
uses: MishaKav/pytest-coverage-comment@v1.1.59
42+
uses: MishaKav/pytest-coverage-comment@v1.1.57
4343
with:
4444
github-token: ${{ secrets.GH_ACTIONS_PR_WRITE }}
4545
issue-number: ${{ env.PR_NUMBER }}

‎docs/assets/Agentic-framework_high-res.png‎

-590 KB
Binary file not shown.

‎dotnet/Directory.Packages.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
4545
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
4646
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
47-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
47+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
4848
<!-- Microsoft.AspNetCore.* -->
4949
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
5050
<PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="9.0.4" />
@@ -68,15 +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 -->
72-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.67.0-preview" />
73-
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.67.0-preview" />
7471
<!-- Semantic Kernel -->
75-
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.67.0" />
76-
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Core" Version="1.67.0" />
77-
<PackageVersion Include="Microsoft.SemanticKernel.Agents.OpenAI" Version="1.67.0-preview" />
78-
<PackageVersion Include="Microsoft.SemanticKernel.Agents.AzureAI" Version="1.67.0-preview" />
79-
<PackageVersion Include="Microsoft.SemanticKernel.Plugins.OpenApi" Version="1.67.0" />
72+
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
73+
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Core" Version="1.66.0" />
74+
<PackageVersion Include="Microsoft.SemanticKernel.Agents.OpenAI" Version="1.66.0-preview" />
75+
<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" />
8080
<!-- Agent SDKs -->
8181
<PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.2.41" />
8282
<!-- A2A -->
@@ -86,7 +86,7 @@
8686
<PackageVersion Include="ModelContextProtocol" Version="0.4.0-preview.3" />
8787
<!-- Inference SDKs -->
8888
<PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
89-
<PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.4.6" />
89+
<PackageVersion Include="AWSSDK.Extensions.Bedrock.MEAI" Version="4.0.4.2" />
9090
<PackageVersion Include="Microsoft.ML.OnnxRuntimeGenAI" Version="0.10.0" />
9191
<PackageVersion Include="OllamaSharp" Version="5.4.8" />
9292
<PackageVersion Include="OpenAI" Version="2.6.0" />
@@ -104,8 +104,8 @@
104104
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.10" />
105105
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
106106
<PackageVersion Include="Moq" Version="[4.18.4]" />
107-
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Abstractions" Version="1.67.0" />
108-
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Yaml" Version="1.67.0-beta" />
107+
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Abstractions" Version="1.66.0" />
108+
<PackageVersion Include="Microsoft.SemanticKernel.Agents.Yaml" Version="1.66.0-beta" />
109109
<PackageVersion Include="xunit" Version="2.9.3" />
110110
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
111111
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
@@ -135,7 +135,7 @@
135135
<PrivateAssets>all</PrivateAssets>
136136
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
137137
</PackageReference>
138-
<PackageVersion Include="Roslynator.Analyzers" Version="[4.14.1]" />
138+
<PackageVersion Include="Roslynator.Analyzers" Version="[4.14.0]" />
139139
<PackageReference Include="Roslynator.Analyzers">
140140
<PrivateAssets>all</PrivateAssets>
141141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎dotnet/agent-framework-dotnet.slnx‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
</Folder>
2121
<Folder Name="/Samples/AGUIClientServer/">
2222
<Project Path="samples/AGUIClientServer/AGUIClient/AGUIClient.csproj" />
23-
<Project Path="samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj" />
2423
<Project Path="samples/AGUIClientServer/AGUIServer/AGUIServer.csproj" />
2524
</Folder>
2625
<Folder Name="/Samples/GettingStarted/">
@@ -48,7 +47,8 @@
4847
<File Path="samples/GettingStarted/Agents/README.md" />
4948
<Project Path="samples/GettingStarted/Agents/Agent_Step01_Running/Agent_Step01_Running.csproj" />
5049
<Project Path="samples/GettingStarted/Agents/Agent_Step02_MultiturnConversation/Agent_Step02_MultiturnConversation.csproj" />
51-
<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" />
5252
<Project Path="samples/GettingStarted/Agents/Agent_Step04_UsingFunctionToolsWithApprovals/Agent_Step04_UsingFunctionToolsWithApprovals.csproj" />
5353
<Project Path="samples/GettingStarted/Agents/Agent_Step05_StructuredOutput/Agent_Step05_StructuredOutput.csproj" />
5454
<Project Path="samples/GettingStarted/Agents/Agent_Step06_PersistedConversations/Agent_Step06_PersistedConversations.csproj" />
@@ -58,22 +58,20 @@
5858
<Project Path="samples/GettingStarted/Agents/Agent_Step10_AsMcpTool/Agent_Step10_AsMcpTool.csproj" />
5959
<Project Path="samples/GettingStarted/Agents/Agent_Step11_UsingImages/Agent_Step11_UsingImages.csproj" />
6060
<Project Path="samples/GettingStarted/Agents/Agent_Step12_AsFunctionTool/Agent_Step12_AsFunctionTool.csproj" />
61-
<Project Path="samples/GettingStarted/Agents/Agent_Step13_BackgroundResponsesWithToolsAndPersistence/Agent_Step13_BackgroundResponsesWithToolsAndPersistence.csproj" />
61+
<Project Path="samples/GettingStarted/Agents/Agent_Step13_Memory/Agent_Step13_Memory.csproj" />
6262
<Project Path="samples/GettingStarted/Agents/Agent_Step14_Middleware/Agent_Step14_Middleware.csproj" />
6363
<Project Path="samples/GettingStarted/Agents/Agent_Step15_Plugins/Agent_Step15_Plugins.csproj" />
6464
<Project Path="samples/GettingStarted/Agents/Agent_Step16_ChatReduction/Agent_Step16_ChatReduction.csproj" />
6565
<Project Path="samples/GettingStarted/Agents/Agent_Step17_BackgroundResponses/Agent_Step17_BackgroundResponses.csproj" />
66+
<Project Path="samples/GettingStarted/Agents/Agent_Step18_TextSearchRag/Agent_Step18_TextSearchRag.csproj" />
67+
<Project Path="samples/GettingStarted/Agents/Agent_Step19_Mem0Provider/Agent_Step19_Mem0Provider.csproj" />
68+
<Project Path="samples/GettingStarted/Agents/Agent_Step20_BackgroundResponsesWithToolsAndPersistence/Agent_Step20_BackgroundResponsesWithToolsAndPersistence.csproj" />
69+
<Project Path="samples/GettingStarted/Agents/Agent_Step21_ChatHistoryMemoryProvider/Agent_Step21_ChatHistoryMemoryProvider.csproj" />
6670
</Folder>
6771
<Folder Name="/Samples/GettingStarted/DevUI/">
6872
<File Path="samples/GettingStarted/DevUI/README.md" />
6973
<Project Path="samples/GettingStarted/DevUI/DevUI_Step01_BasicUsage/DevUI_Step01_BasicUsage.csproj" />
7074
</Folder>
71-
<Folder Name="/Samples/GettingStarted/AgentWithMemory/">
72-
<File Path="samples/GettingStarted/AgentWithMemory/README.md" />
73-
<Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step01_ChatHistoryMemory/AgentWithMemory_Step01_ChatHistoryMemory.csproj" />
74-
<Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step02_MemoryUsingMem0/AgentWithMemory_Step02_MemoryUsingMem0.csproj" />
75-
<Project Path="samples/GettingStarted/AgentWithMemory/AgentWithMemory_Step03_CustomMemory/AgentWithMemory_Step03_CustomMemory.csproj" />
76-
</Folder>
7775
<Folder Name="/Samples/GettingStarted/AgentWithOpenAI/">
7876
<File Path="samples/GettingStarted/AgentWithOpenAI/README.md" />
7977
<Project Path="samples/GettingStarted/AgentWithOpenAI/Agent_OpenAI_Step01_Running/Agent_OpenAI_Step01_Running.csproj" />
@@ -82,8 +80,7 @@
8280
<Folder Name="/Samples/GettingStarted/AgentWithRAG/">
8381
<File Path="samples/GettingStarted/AgentWithRAG/README.md" />
8482
<Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step01_BasicTextRAG/AgentWithRAG_Step01_BasicTextRAG.csproj" />
85-
<Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_CustomVectorStoreRAG/AgentWithRAG_Step02_CustomVectorStoreRAG.csproj" />
86-
<Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step03_CustomRAGDataSource/AgentWithRAG_Step03_CustomRAGDataSource.csproj" />
83+
<Project Path="samples/GettingStarted/AgentWithRAG/AgentWithRAG_Step02_ExternalDataSourceRAG/AgentWithRAG_Step02_ExternalDataSourceRAG.csproj" />
8784
</Folder>
8885
<Folder Name="/Samples/GettingStarted/ModelContextProtocol/">
8986
<File Path="samples/GettingStarted/ModelContextProtocol/README.md" />
@@ -158,10 +155,10 @@
158155
<Project Path="samples/GettingStarted/Workflows/_Foundational/07_MixedWorkflowAgentsAndExecutors/07_MixedWorkflowAgentsAndExecutors.csproj" />
159156
<Project Path="samples/GettingStarted/Workflows/_Foundational/08_WriterCriticWorkflow/08_WriterCriticWorkflow.csproj" />
160157
</Folder>
161-
<Folder Name="/Samples/HostedAgents/">
162-
<Project Path="samples/HostedAgents/AgentsInWorkflows/AgentsInWorkflows.csproj" />
163-
<Project Path="samples/HostedAgents/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
164-
<Project Path="samples/HostedAgents/DeepResearchAgent/DeepResearchAgent.csproj" />
158+
<Folder Name="/Samples/Catalog/">
159+
<Project Path="samples/Catalog/AgentsInWorkflows/AgentsInWorkflows.csproj" />
160+
<Project Path="samples/Catalog/AgentWithTextSearchRag/AgentWithTextSearchRag.csproj" />
161+
<Project Path="samples/Catalog/DeepResearchAgent/DeepResearchAgent.csproj" />
165162
</Folder>
166163
<Folder Name="/Solution Items/">
167164
<File Path=".editorconfig" />

‎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).251110.2</PackageVersion>
6-
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251110.2</PackageVersion>
7-
<GitTag>1.0.0-preview.251110.2</GitTag>
5+
<PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix).251107.1</PackageVersion>
6+
<PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)-preview.251107.1</PackageVersion>
7+
<GitTag>1.0.0-preview.251107.1</GitTag>
88

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

‎dotnet/samples/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
launchSettings.json

‎dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServer.csproj‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎dotnet/samples/AGUIClientServer/AGUIDojoServer/AGUIDojoServerSerializerContext.cs‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎dotnet/samples/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs‎

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)