modelcontextprotocol/csharp-sdk
Watch
1
0
Fork
You've already forked csharp-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Add net10.0 assets and run some fixers (#875)

Browse source
This commit is contained in:
Stephen Toub 2025-10-15 15:27:43 -04:00 • committed by GitHub
commit bfc0980ef5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 168 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ModelContextProtocol.Core/Protocol/ProgressToken.cs
View file

@ -11,15 +11,12 @@ namespace ModelContextProtocol.Protocol;
[JsonConverter(typeof(Converter))]
public readonly struct ProgressToken : IEquatable<ProgressToken>
{
/// <summary>The token, either a string or a boxed long or null.</summary>
private readonly object? _token;
/// <summary>Initializes a new instance of the <see cref="ProgressToken"/> with a specified value.</summary>
/// <param name="value">The required ID value.</param>
public ProgressToken(string value)
{
Throw.IfNull(value);
_token = value;
Token = value;
}
/// <summary>Initializes a new instance of the <see cref="ProgressToken"/> with a specified value.</summary>
@ -27,27 +24,27 @@ public readonly struct ProgressToken : IEquatable<ProgressToken>
public ProgressToken(long value)
{
// Box the long. Progress tokens are almost always strings in practice, so this should be rare.
_token = value;
Token = value;
}
/// <summary>Gets the underlying object for this token.</summary>
/// <remarks>This will either be a <see cref="string"/>, a boxed <see cref="long"/>, or <see langword="null"/>.</remarks>
public object? Token => _token;
public object? Token { get; }
/// <inheritdoc />
public override string? ToString() =>
_token is string stringValue ? stringValue :
_token is long longValue ? longValue.ToString(CultureInfo.InvariantCulture) :
Token is string stringValue ? stringValue :
Token is long longValue ? longValue.ToString(CultureInfo.InvariantCulture) :
null;
/// <inheritdoc />
public bool Equals(ProgressToken other) => Equals(_token, other._token);
public bool Equals(ProgressToken other) => Equals(Token, other.Token);
/// <inheritdoc />
public override bool Equals(object? obj) => obj is ProgressToken other && Equals(other);
/// <inheritdoc />
public override int GetHashCode() => _token?.GetHashCode() ?? 0;
public override int GetHashCode() => Token?.GetHashCode() ?? 0;
/// <inheritdoc />
public static bool operator ==(ProgressToken left, ProgressToken right) => left.Equals(right);
@ -77,7 +74,7 @@ public readonly struct ProgressToken : IEquatable<ProgressToken>
{
Throw.IfNull(writer);
switch (value._token)
switch (value.Token)
{
case string str:
writer.WriteStringValue(str);

19
src/ModelContextProtocol.Core/Protocol/RequestId.cs
View file

@ -11,15 +11,12 @@ namespace ModelContextProtocol.Protocol;
[JsonConverter(typeof(Converter))]
public readonly struct RequestId : IEquatable<RequestId>
{
/// <summary>The id, either a string or a boxed long or null.</summary>
private readonly object? _id;
/// <summary>Initializes a new instance of the <see cref="RequestId"/> with a specified value.</summary>
/// <param name="value">The required ID value.</param>
public RequestId(string value)
{
Throw.IfNull(value);
_id = value;
Id = value;
}
/// <summary>Initializes a new instance of the <see cref="RequestId"/> with a specified value.</summary>
@ -27,27 +24,27 @@ public readonly struct RequestId : IEquatable<RequestId>
public RequestId(long value)
{
// Box the long. Request IDs are almost always strings in practice, so this should be rare.
_id = value;
Id = value;
}
/// <summary>Gets the underlying object for this id.</summary>
/// <remarks>This will either be a <see cref="string"/>, a boxed <see cref="long"/>, or <see langword="null"/>.</remarks>
public object? Id => _id;
public object? Id { get; }
/// <inheritdoc />
public override string ToString() =>
_id is string stringValue ? stringValue :
_id is long longValue ? longValue.ToString(CultureInfo.InvariantCulture) :
Id is string stringValue ? stringValue :
Id is long longValue ? longValue.ToString(CultureInfo.InvariantCulture) :
string.Empty;
/// <inheritdoc />
public bool Equals(RequestId other) => Equals(_id, other._id);
public bool Equals(RequestId other) => Equals(Id, other.Id);
/// <inheritdoc />
public override bool Equals(object? obj) => obj is RequestId other && Equals(other);
/// <inheritdoc />
public override int GetHashCode() => _id?.GetHashCode() ?? 0;
public override int GetHashCode() => Id?.GetHashCode() ?? 0;
/// <inheritdoc />
public static bool operator ==(RequestId left, RequestId right) => left.Equals(right);
@ -77,7 +74,7 @@ public readonly struct RequestId : IEquatable<RequestId>
{
Throw.IfNull(writer);
switch (value._id)
switch (value.Id)
{
case string str:
writer.WriteStringValue(str);