Skip to content

Commit 189f0db

Browse files
TaoChenOSUTaoChenOSU
committed
Merge branch 'main' into py-update-azureaiagent
2 parents 5ed0a26 + 6f80214 commit 189f0db

162 files changed

Lines changed: 12226 additions & 3975 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.

‎dotnet/Directory.Packages.props‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@
3939
<PackageVersion Include="Grpc.AspNetCore.Web" Version="2.70.0" />
4040
<PackageVersion Include="Grpc.Net.Client" Version="2.70.0" />
4141
<PackageVersion Include="Grpc.Tools" Version="2.71.0" />
42+
<PackageVersion Include="JmesPath.Net" Version="1.0.330" />
43+
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.2" />
4244
<PackageVersion Include="Handlebars.Net.Helpers" Version="2.4.10" />
4345
<PackageVersion Include="Handlebars.Net" Version="2.1.6" />
4446
<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
45-
<PackageVersion Include="JsonSchema.Net" Version="5.4.2" />
47+
<PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
4648
<PackageVersion Include="Markdig" Version="0.40.0" />
4749
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
4850
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
@@ -66,7 +68,7 @@
6668
<PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="1.21.0" />
6769
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
6870
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
69-
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.13" />
71+
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.14" />
7072
<PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
7173
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
7274
<PackageVersion Include="Npgsql" Version="8.0.6" />
@@ -98,10 +100,10 @@
98100
<PackageVersion Include="Microsoft.DeepDev.TokenizerLib" Version="1.3.3" />
99101
<PackageVersion Include="SharpToken" Version="2.0.3" />
100102
<!-- Microsoft.Extensions.* -->
101-
<PackageVersion Include="Microsoft.Extensions.AI" Version="9.5.0-preview.1.25262.9" />
102-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0-preview.1.25262.9" />
103-
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.5.0-preview.1.25262.9" />
104-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25262.9" />
103+
<PackageVersion Include="Microsoft.Extensions.AI" Version="9.5.0" />
104+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.5.0" />
105+
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.5.0-preview.1.25265.7" />
106+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
105107
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
106108
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
107109
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />

‎dotnet/docs/EXPERIMENTS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ You can use the following diagnostic IDs to ignore warnings or errors for a part
8383
| SKEXP0070 | Amazon AI connector | | | | | |
8484
| | | | | | | |
8585
| SKEXP0080 | Process Framework |
86+
| SKEXP0081 | Process Framework - Foundry Process
8687
| | | | | | | |
8788
| SKEXP0101 | Experiment with Assistants |
8889
| SKEXP0101 | Experiment with Flow Orchestration |

‎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.50.0</VersionPrefix>
4+
<VersionPrefix>1.51.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.49.0</PackageValidationBaselineVersion>
12+
<PackageValidationBaselineVersion>1.50.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/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/AuthorRoleExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using System;
44
using Microsoft.SemanticKernel.ChatCompletion;
5-
using ModelContextProtocol.Protocol.Types;
5+
using ModelContextProtocol.Protocol;
66

77
namespace MCPClient;
88

‎dotnet/samples/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/ChatMessageContentExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System;
44
using System.Linq;
55
using Microsoft.SemanticKernel;
6-
using ModelContextProtocol.Protocol.Types;
6+
using ModelContextProtocol.Protocol;
77

88
namespace MCPClient;
99

‎dotnet/samples/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/ContentExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using System;
44
using Microsoft.SemanticKernel;
5-
using ModelContextProtocol.Protocol.Types;
5+
using ModelContextProtocol.Protocol;
66

77
namespace MCPClient;
88

‎dotnet/samples/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/PromptResultExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq;
55
using Microsoft.SemanticKernel;
66
using Microsoft.SemanticKernel.ChatCompletion;
7-
using ModelContextProtocol.Protocol.Types;
7+
using ModelContextProtocol.Protocol;
88

99
namespace MCPClient;
1010

‎dotnet/samples/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/ReadResourceResultExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using Microsoft.SemanticKernel;
66
using Microsoft.SemanticKernel.ChatCompletion;
7-
using ModelContextProtocol.Protocol.Types;
7+
using ModelContextProtocol.Protocol;
88

99
namespace MCPClient;
1010

‎dotnet/samples/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/RoleExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
using System;
44
using Microsoft.SemanticKernel.ChatCompletion;
5-
using ModelContextProtocol.Protocol.Types;
5+
using ModelContextProtocol.Protocol;
66

77
namespace MCPClient;
88

‎dotnet/samples/Demos/ModelContextProtocolClientServer/MCPClient/Extensions/SamplingMessageExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Collections.Generic;
44
using System.Linq;
55
using Microsoft.SemanticKernel;
6-
using ModelContextProtocol.Protocol.Types;
6+
using ModelContextProtocol.Protocol;
77

88
namespace MCPClient;
99

0 commit comments

Comments
 (0)