Skip to content

Commit e4bc725

Browse files
Updated to system.reactive, collections.immutable and nerdbank.streams
1 parent aacb0ba commit e4bc725

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

Directory.Build.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
<PackageReference Update="XunitXml.TestLogger" Version="3.0.70" />
3636
<PackageReference Update="coverlet.collector" Version="3.1.2" />
3737
<PackageReference Update="coverlet.msbuild" Version="3.1.2" />
38-
<PackageReference Update="System.Reactive" Version="4.4.1" />
39-
<PackageReference Update="System.Collections.Immutable" Version="1.7.1" />
38+
<PackageReference Update="System.Reactive" Version="5.0.0" />
39+
<PackageReference Update="System.Collections.Immutable" Version="5.0.0" />
4040
<PackageReference Update="System.Threading.Channels" Version="4.7.1" />
4141
<PackageReference Update="Microsoft.Reactive.Testing" Version="4.4.1" />
4242
<PackageReference Update="MediatR" Version="8.1.0" />
4343
<PackageReference Update="Bogus" Version="34.0.1" />
4444
<PackageReference Update="Snapper" Version="2.3.1" />
4545
<PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
46-
<PackageReference Update="Nerdbank.Streams" Version="2.6.81" />
46+
<PackageReference Update="Nerdbank.Streams" Version="2.8.57" />
4747
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
4848
<PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
4949
<PackageReference Update="DryIoc.Internal" Version="4.8.6" />

src/JsonRpc.Generation/JsonRpc.Generation.csproj

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

src/JsonRpc/Serialization/Converters/EnumLikeStringConverter.cs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,27 @@
44

55
namespace OmniSharp.Extensions.JsonRpc.Serialization.Converters
66
{
7-
internal class EnumLikeStringConverter : JsonConverter<IEnumLikeString>
7+
internal class EnumLikeStringConverter : JsonConverter<IEnumLikeString?>
88
{
9-
public override void WriteJson(JsonWriter writer, IEnumLikeString value, JsonSerializer serializer) => new JValue(value.ToString()).WriteTo(writer);
9+
public override void WriteJson(JsonWriter writer, IEnumLikeString? value, JsonSerializer serializer)
10+
{
11+
new JValue(value?.ToString()).WriteTo(writer);
12+
}
1013

11-
public override IEnumLikeString ReadJson(
12-
JsonReader reader, Type objectType, IEnumLikeString existingValue,
14+
public override IEnumLikeString? ReadJson(
15+
JsonReader reader, Type objectType, IEnumLikeString? existingValue,
1316
bool hasExistingValue,
1417
JsonSerializer serializer
15-
) =>
16-
( reader.TokenType, Nullable.GetUnderlyingType(objectType) ) switch {
17-
(JsonToken.String, null) => (IEnumLikeString) Activator.CreateInstance(objectType, (string) reader.Value),
18-
(JsonToken.String, { } realType) => (IEnumLikeString) Activator.CreateInstance(realType, (string) reader.Value),
19-
(_, { }) => (IEnumLikeString) Activator.CreateInstance(objectType, null),
18+
)
19+
{
20+
return ( reader.TokenType, Nullable.GetUnderlyingType(objectType) ) switch
21+
{
22+
(JsonToken.String, null) => (IEnumLikeString)Activator.CreateInstance(objectType, (string)reader.Value),
23+
(JsonToken.String, { } realType) => (IEnumLikeString)Activator.CreateInstance(realType, (string)reader.Value),
24+
(_, { }) => (IEnumLikeString)Activator.CreateInstance(objectType, null),
2025
_ => null
2126
};
27+
}
2228

2329
public override bool CanRead => true;
2430
}

0 commit comments

Comments
 (0)