Skip to content

Commit c108c06

Browse files
glorious-beardglorious-beard
authored
Merge branch 'main' into expand-chat-prompt-parser
2 parents f8fc243 + aaf7aa6 commit c108c06

File tree

65 files changed

+1109
-446
lines changed

Some content is hidden

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

65 files changed

+1109
-446
lines changed

‎dotnet/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<PackageVersion Include="EntityFramework" Version="6.5.1" />
3030
<PackageVersion Include="FastBertTokenizer" Version="1.0.28" />
3131
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
32-
<PackageVersion Include="mcpdotnet" Version="1.0.1.3" />
32+
<PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.1.25171.12" />
3333
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
34-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.13" />
34+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
3535
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
3636
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
3737
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />

‎dotnet/SK-dotnet.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatWithAgent.ServiceDefaul
498498
EndProject
499499
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatWithAgent.Web", "samples\Demos\AgentFrameworkWithAspire\ChatWithAgent.Web\ChatWithAgent.Web.csproj", "{543879BF-E2CD-6521-8322-8FBCD6EC57A0}"
500500
EndProject
501-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelContextProtocol", "samples\Demos\ModelContextProtocol\ModelContextProtocol.csproj", "{B16AC373-3DA8-4505-9510-110347CD635D}"
502-
EndProject
503501
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructuredDataPlugin", "samples\Demos\StructuredDataPlugin\StructuredDataPlugin.csproj", "{BEDAC050-016A-46F4-9173-339C46DFD3ED}"
504502
EndProject
505503
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugins.StructuredData.EntityFramework", "src\Plugins\Plugins.StructuredData.EntityFramework\Plugins.StructuredData.EntityFramework.csproj", "{0C81C377-3CDC-46A8-BED1-4B50BDA2202E}"
@@ -508,6 +506,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlServerIntegrationTests",
508506
EndProject
509507
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PineconeIntegrationTests", "src\VectorDataIntegrationTests\PineconeIntegrationTests\PineconeIntegrationTests.csproj", "{E9A74E0C-BC02-4DDD-A487-89847EDF8026}"
510508
EndProject
509+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModelContextProtocolPlugin", "samples\Demos\ModelContextProtocolPlugin\ModelContextProtocolPlugin.csproj", "{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}"
510+
EndProject
511511
Global
512512
GlobalSection(SolutionConfigurationPlatforms) = preSolution
513513
Debug|Any CPU = Debug|Any CPU
@@ -1373,12 +1373,6 @@ Global
13731373
{543879BF-E2CD-6521-8322-8FBCD6EC57A0}.Publish|Any CPU.Build.0 = Release|Any CPU
13741374
{543879BF-E2CD-6521-8322-8FBCD6EC57A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
13751375
{543879BF-E2CD-6521-8322-8FBCD6EC57A0}.Release|Any CPU.Build.0 = Release|Any CPU
1376-
{B16AC373-3DA8-4505-9510-110347CD635D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1377-
{B16AC373-3DA8-4505-9510-110347CD635D}.Debug|Any CPU.Build.0 = Debug|Any CPU
1378-
{B16AC373-3DA8-4505-9510-110347CD635D}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
1379-
{B16AC373-3DA8-4505-9510-110347CD635D}.Publish|Any CPU.Build.0 = Debug|Any CPU
1380-
{B16AC373-3DA8-4505-9510-110347CD635D}.Release|Any CPU.ActiveCfg = Release|Any CPU
1381-
{B16AC373-3DA8-4505-9510-110347CD635D}.Release|Any CPU.Build.0 = Release|Any CPU
13821376
{BEDAC050-016A-46F4-9173-339C46DFD3ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13831377
{BEDAC050-016A-46F4-9173-339C46DFD3ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
13841378
{BEDAC050-016A-46F4-9173-339C46DFD3ED}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1403,6 +1397,12 @@ Global
14031397
{E9A74E0C-BC02-4DDD-A487-89847EDF8026}.Publish|Any CPU.Build.0 = Release|Any CPU
14041398
{E9A74E0C-BC02-4DDD-A487-89847EDF8026}.Release|Any CPU.ActiveCfg = Release|Any CPU
14051399
{E9A74E0C-BC02-4DDD-A487-89847EDF8026}.Release|Any CPU.Build.0 = Release|Any CPU
1400+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1401+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}.Debug|Any CPU.Build.0 = Debug|Any CPU
1402+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}.Publish|Any CPU.ActiveCfg = Release|Any CPU
1403+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}.Publish|Any CPU.Build.0 = Release|Any CPU
1404+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}.Release|Any CPU.ActiveCfg = Release|Any CPU
1405+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654}.Release|Any CPU.Build.0 = Release|Any CPU
14061406
EndGlobalSection
14071407
GlobalSection(SolutionProperties) = preSolution
14081408
HideSolutionNode = FALSE
@@ -1589,11 +1589,11 @@ Global
15891589
{758457BF-87EF-D8A0-4045-9F03D3DAD0BF} = {41AC66EE-B656-4CDF-A512-C7259C2F6CF7}
15901590
{8C6EC8E2-4DC1-5B2E-F22A-CB4FD96DEF50} = {41AC66EE-B656-4CDF-A512-C7259C2F6CF7}
15911591
{543879BF-E2CD-6521-8322-8FBCD6EC57A0} = {41AC66EE-B656-4CDF-A512-C7259C2F6CF7}
1592-
{B16AC373-3DA8-4505-9510-110347CD635D} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
15931592
{BEDAC050-016A-46F4-9173-339C46DFD3ED} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
15941593
{0C81C377-3CDC-46A8-BED1-4B50BDA2202E} = {D6D598DF-C17C-46F4-B2B9-CDE82E2DE132}
15951594
{A5E6193C-8431-4C6E-B674-682CB41EAA0C} = {4F381919-F1BE-47D8-8558-3187ED04A84F}
15961595
{E9A74E0C-BC02-4DDD-A487-89847EDF8026} = {4F381919-F1BE-47D8-8558-3187ED04A84F}
1596+
{801C9CE4-53AF-D2DB-E0D6-9A6BB47E9654} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
15971597
EndGlobalSection
15981598
GlobalSection(ExtensibilityGlobals) = postSolution
15991599
SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83}

‎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.43.0</VersionPrefix>
4+
<VersionPrefix>1.44.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.42.0</PackageValidationBaselineVersion>
12+
<PackageValidationBaselineVersion>1.43.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/AgentFrameworkWithAspire/ChatWithAgent.AppHost/Properties/launchSettings.json

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

‎dotnet/samples/Demos/ModelContextProtocol/McpDotNetExtensions.cs

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

‎dotnet/samples/Demos/ModelContextProtocol/Program.cs

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

‎dotnet/samples/Demos/ModelContextProtocol/ModelContextProtocol.csproj renamed to ‎dotnet/samples/Demos/ModelContextProtocolPlugin/ModelContextProtocolPlugin.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,17 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<UserSecretsId>5ee045b0-aea3-4f08-8d31-32d1a6f8fed0</UserSecretsId>
9-
<NoWarn>$(NoWarn);CA2249;CS0612</NoWarn>
9+
<NoWarn>$(NoWarn);CA2249;CS0612;SKEXP0001;VSTHRD111;CA2007</NoWarn>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="mcpdotnet" />
13+
<PackageReference Include="ModelContextProtocol" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
1515
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
1616
<PackageReference Include="Microsoft.Extensions.Logging" />
1717
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
1919
</ItemGroup>
20-
21-
<ItemGroup>
22-
<None Update="SimpleToolsConsole.json">
23-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
24-
</None>
25-
</ItemGroup>
2620

2721
<ItemGroup>
2822
<ProjectReference Include="..\..\..\src\Connectors\Connectors.AzureOpenAI\Connectors.AzureOpenAI.csproj" />

0 commit comments

Comments
 (0)