Skip to content

Commit 5e1a5b6

Browse files
authored
Merge pull request #1389 from microsoft/dev/andarno/bumpAspNetTests
Bump Microsoft.AspNetCore packages
2 parents 6a24100 + d1e2d69 commit 5e1a5b6

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"packageRules": [
99
{
1010
"matchPackageNames": [ "Microsoft.AspNetCore.TestHost" ],
11-
"allowedVersions": "<2.3"
11+
"allowedVersions": "<2.4"
1212
},
1313
{
1414
"matchJsonata": [ "sharedVariableName='RoslynVersion'" ],

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.15.8" />
1616
<PackageVersion Include="MessagePack" Version="$(MessagePackVersion)" />
1717
<PackageVersion Include="MessagePackAnalyzer" Version="$(MessagePackVersion)" />
18-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
19-
<PackageVersion Include="Microsoft.AspNetCore" Version="2.3.0" />
18+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="2.3.9" />
19+
<PackageVersion Include="Microsoft.AspNetCore" Version="2.3.9" />
2020
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
2121
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(RoslynVersion)" />
2222
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynVersion)" />

test/StreamJsonRpc.Tests/AsyncEnumerableTests.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,7 @@ protected class Client : IClient
813813
}
814814

815815
[JsonConverter(typeof(ThrowingJsonConverter<UnserializableType>))]
816+
[System.Text.Json.Serialization.JsonConverter(typeof(ThrowingSystemTextJsonConverter<UnserializableType>))]
816817
[MessagePackFormatter(typeof(ThrowingMessagePackFormatter<UnserializableType>))]
817818
[NBMP.MessagePackConverter(typeof(ThrowingMessagePackNerdbankConverter<UnserializableType>))]
818819
protected class UnserializableType
@@ -857,4 +858,17 @@ public override void Write(ref NBMP.MessagePackWriter writer, in T? value, NBMP.
857858
throw new Exception();
858859
}
859860
}
861+
862+
protected class ThrowingSystemTextJsonConverter<T> : System.Text.Json.Serialization.JsonConverter<T>
863+
{
864+
public override T? Read(ref System.Text.Json.Utf8JsonReader reader, Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
865+
{
866+
throw new Exception();
867+
}
868+
869+
public override void Write(System.Text.Json.Utf8JsonWriter writer, T value, System.Text.Json.JsonSerializerOptions options)
870+
{
871+
throw new Exception();
872+
}
873+
}
860874
}

0 commit comments

Comments
 (0)