Skip to content

Commit 0093c26

Browse files
JohnMcPMSJohnMcPMS
authored
Update to latest MCP nuget (microsoft#5633)
## Change Update to the latest nuget available for the C# MCP SDK.
1 parent e000353 commit 0093c26

File tree

5 files changed

+59
-59
lines changed

5 files changed

+59
-59
lines changed

‎src/Directory.Packages.props‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<!--
55
!!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
6-
-->
7-
<WindowsSdkPackageVersion>10.0.26100.53</WindowsSdkPackageVersion>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
11-
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
12-
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
13-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
14-
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
15-
<PackageVersion Include="Microsoft.Msix.Utils" Version="2.1.1" />
16-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17-
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
18-
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
19-
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
20-
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1742" />
21-
<PackageVersion Include="ModelContextProtocol" Version="0.2.0-preview.3" />
22-
<PackageVersion Include="Moq" Version="4.18.2" />
23-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
24-
<PackageVersion Include="nunit" Version="3.12.0" />
25-
<PackageVersion Include="NUnit3TestAdapter" Version="3.15.1" />
26-
<PackageVersion Include="Octokit" Version="4.0.3" />
27-
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
28-
<PackageVersion Include="Semver" Version="2.3.0" />
29-
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
30-
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
31-
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
32-
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
33-
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
34-
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
35-
<PackageVersion Include="xunit" Version="2.4.2" />
36-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
37-
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
38-
</ItemGroup>
39-
</Project>
6+
-->
7+
<WindowsSdkPackageVersion>10.0.26100.53</WindowsSdkPackageVersion>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<PackageVersion Include="coverlet.collector" Version="3.1.2" />
11+
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
12+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
13+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
14+
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
15+
<PackageVersion Include="Microsoft.Msix.Utils" Version="2.1.1" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
17+
<PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.6" />
18+
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
19+
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
20+
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.26100.1742" />
21+
<PackageVersion Include="ModelContextProtocol" Version="0.3.0-preview.3" />
22+
<PackageVersion Include="Moq" Version="4.18.2" />
23+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
24+
<PackageVersion Include="nunit" Version="3.12.0" />
25+
<PackageVersion Include="NUnit3TestAdapter" Version="3.15.1" />
26+
<PackageVersion Include="Octokit" Version="4.0.3" />
27+
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
28+
<PackageVersion Include="Semver" Version="2.3.0" />
29+
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
30+
<PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
31+
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
32+
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
33+
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
34+
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
35+
<PackageVersion Include="xunit" Version="2.4.2" />
36+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
37+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
38+
</ItemGroup>
39+
</Project>

‎src/WinGetMCPServer/Exceptions/ToolResponseException.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ namespace WinGetMCPServer.Exceptions
1313
/// </summary>
1414
internal class ToolResponseException : Exception
1515
{
16-
public ToolResponseException(CallToolResponse toolResponse)
16+
public ToolResponseException(CallToolResult toolResponse)
1717
{
1818
this.Response = toolResponse;
1919
}
2020

21-
public CallToolResponse Response { get; private set; }
21+
public CallToolResult Response { get; private set; }
2222
}
2323
}

‎src/WinGetMCPServer/Response/PackageResponse.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ internal static class PackageResponse
2020
/// </summary>
2121
/// <param name="connectResult">The connect result.</param>
2222
/// <returns>The response.</returns>
23-
public static CallToolResponse ForConnectError(ConnectResult connectResult)
23+
public static CallToolResult ForConnectError(ConnectResult connectResult)
2424
{
25-
return new CallToolResponse()
25+
return new CallToolResult()
2626
{
2727
IsError = true,
28-
Content = [new Content() { Text = $"Failed when connecting to the package source with error: {connectResult.ExtendedErrorCode.Message} [0x{connectResult.ExtendedErrorCode.HResult:X8}]" }],
28+
Content = [new TextContentBlock() { Text = $"Failed when connecting to the package source with error: {connectResult.ExtendedErrorCode.Message} [0x{connectResult.ExtendedErrorCode.HResult:X8}]" }],
2929
};
3030
}
3131

@@ -34,25 +34,25 @@ public static CallToolResponse ForConnectError(ConnectResult connectResult)
3434
/// </summary>
3535
/// <param name="findResult">The find packages result.</param>
3636
/// <returns>The response.</returns>
37-
public static CallToolResponse ForFindError(FindPackagesResult findResult)
37+
public static CallToolResult ForFindError(FindPackagesResult findResult)
3838
{
39-
return new CallToolResponse()
39+
return new CallToolResult()
4040
{
4141
IsError = true,
42-
Content = [new Content() { Text = $"Failed when finding packages with reason {findResult.Status} and error: {findResult.ExtendedErrorCode.Message} [0x{findResult.ExtendedErrorCode.HResult:X8}]" }],
42+
Content = [new TextContentBlock() { Text = $"Failed when finding packages with reason {findResult.Status} and error: {findResult.ExtendedErrorCode.Message} [0x{findResult.ExtendedErrorCode.HResult:X8}]" }],
4343
};
4444
}
4545

4646
/// <summary>
4747
/// Creates a response that indicates the operation was cancelled before any changes were made.
4848
/// </summary>
4949
/// <returns>The response.</returns>
50-
public static CallToolResponse ForCancelBeforeSystemChange()
50+
public static CallToolResult ForCancelBeforeSystemChange()
5151
{
52-
return new CallToolResponse()
52+
return new CallToolResult()
5353
{
5454
IsError = true,
55-
Content = [new Content() { Text = $"The operation was cancelled before any system change was started" }],
55+
Content = [new TextContentBlock() { Text = $"The operation was cancelled before any system change was started" }],
5656
};
5757
}
5858

@@ -62,7 +62,7 @@ public static CallToolResponse ForCancelBeforeSystemChange()
6262
/// <param name="identifer">The identifier used when searching.</param>
6363
/// <param name="source">The source that was searched.</param>
6464
/// <returns>The response.</returns>
65-
public static CallToolResponse ForEmptyFind(string identifer, string? source)
65+
public static CallToolResult ForEmptyFind(string identifer, string? source)
6666
{
6767
PackageIdentityErrorResult result = new()
6868
{
@@ -81,7 +81,7 @@ public static CallToolResponse ForEmptyFind(string identifer, string? source)
8181
/// <param name="source">The source that was searched.</param>
8282
/// <param name="findResult">The result that contains multiple packages.</param>
8383
/// <returns>The response.</returns>
84-
public static CallToolResponse ForMultiFind(string identifer, string? source, FindPackagesResult findResult)
84+
public static CallToolResult ForMultiFind(string identifer, string? source, FindPackagesResult findResult)
8585
{
8686
PackageIdentityErrorResult result = new()
8787
{
@@ -101,7 +101,7 @@ public static CallToolResponse ForMultiFind(string identifer, string? source, Fi
101101
/// <param name="installResult">The install operation result.</param>
102102
/// <param name="findResult">The post-install package data.</param>
103103
/// <returns>The response.</returns>
104-
public static CallToolResponse ForInstallOperation(InstallResult installResult, FindPackagesResult? findResult)
104+
public static CallToolResult ForInstallOperation(InstallResult installResult, FindPackagesResult? findResult)
105105
{
106106
InstallOperationResult result = new InstallOperationResult();
107107

‎src/WinGetMCPServer/Response/ToolResponse.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public static void CheckGroupPolicy()
2525
{
2626
if (!GroupPolicy.GetInstance().IsEnabled(Policy.McpServer))
2727
{
28-
throw new ToolResponseException(new CallToolResponse()
28+
throw new ToolResponseException(new CallToolResult()
2929
{
3030
IsError = true,
31-
Content = [new Content() { Text = "The Windows Package Manager MCP server is disabled by group policy." }]
31+
Content = [new TextContentBlock() { Text = "The Windows Package Manager MCP server is disabled by group policy." }]
3232
});
3333
}
3434
}
@@ -39,7 +39,7 @@ public static void CheckGroupPolicy()
3939
/// <param name="value">The object to return in the response.</param>
4040
/// <param name="isError">Whether or not the response is an error.</param>
4141
/// <returns>The response.</returns>
42-
public static CallToolResponse FromObject(object value, bool isError = false)
42+
public static CallToolResult FromObject(object value, bool isError = false)
4343
{
4444
return FromObject(value, isError, GetDefaultJsonOptions());
4545
}
@@ -51,12 +51,12 @@ public static CallToolResponse FromObject(object value, bool isError = false)
5151
/// <param name="isError">Whether or not the response is an error.</param>
5252
/// <param name="jsonSerializerOptions">The JSON serializer options for serializing the object.</param>
5353
/// <returns>The response.</returns>
54-
public static CallToolResponse FromObject(object value, bool isError, JsonSerializerOptions jsonSerializerOptions)
54+
public static CallToolResult FromObject(object value, bool isError, JsonSerializerOptions jsonSerializerOptions)
5555
{
56-
return new CallToolResponse()
56+
return new CallToolResult()
5757
{
5858
IsError = isError,
59-
Content = [new Content() { Text = JsonSerializer.Serialize(value, GetDefaultJsonOptions()) }]
59+
Content = [new TextContentBlock() { Text = JsonSerializer.Serialize(value, GetDefaultJsonOptions()) }]
6060
};
6161
}
6262

‎src/WinGetMCPServer/WingetPackageTools.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public WingetPackageTools()
3535
ReadOnly = true,
3636
OpenWorld = false)]
3737
[Description("Find installed and available packages using WinGet")]
38-
public CallToolResponse FindPackages(
38+
public CallToolResult FindPackages(
3939
[Description("Find packages identified by this value")] string query)
4040
{
4141
try
@@ -77,7 +77,7 @@ public CallToolResponse FindPackages(
7777
Idempotent = false,
7878
OpenWorld = false)]
7979
[Description("Install or update a package using WinGet")]
80-
public async Task<CallToolResponse> InstallPackage(
80+
public async Task<CallToolResult> InstallPackage(
8181
[Description("The identifier of the WinGet package")] string identifier,
8282
IProgress<ProgressNotificationValue> progress,
8383
CancellationToken cancellationToken,

0 commit comments

Comments
 (0)