Skip to content

Commit 6b67250

Browse files
committed
Fix build errors, warnings, messages after rebasing
1 parent bd2da05 commit 6b67250

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

test/Ocelot.Benchmarks/JsonSerializerBenchmark.cs

-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ public void MicrosoftDeserializeBigData()
7676
// |==============================================================================================================================================|
7777
// | MicrosoftSerializeBigData | 1000 | 646.4 us | 12.72 us | 20.90 us | 645.7 us | 1,546.9 | 110.3516 | 110.3516 | 110.3516 | 350.02 KB |
7878
// | NewtonsoftSerializeBigData | 1000 | 1,033.4 us | 19.37 us | 42.53 us | 1,022.8 us | 967.7 | 109.3750 | 109.3750 | 109.3750 | 837.82 KB |
79-
80-
8179
public class User
8280
{
8381
public Guid UserId { get; set; }

test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2626
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
2727
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0-dev-02301" />
28-
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
2928
<PackageReference Include="Bogus" Version="35.5.1" />
3029
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3130
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">

test/Ocelot.UnitTests/DependencyInjection/OcelotBuilderTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,9 @@ private void CstorShouldUseDefaultBuilderToInitMvcCoreBuilder()
324324
.GetType().Name.ShouldBe("AuthorizationApplicationModelProvider");
325325

326326
// use system text json
327-
_serviceProvider.GetServices<IActionResultExecutor<JsonResult>>()
328-
.FirstOrDefault(s => s.GetType().Name == "SystemTextJsonResultExecutor")
329-
.ShouldNotBeNull();
327+
_serviceProvider.GetServices<IActionResultExecutor<JsonResult>>()
328+
.FirstOrDefault(s => s.GetType().Name == "SystemTextJsonResultExecutor")
329+
.ShouldNotBeNull();
330330
}
331331

332332
[Fact]

test/Ocelot.UnitTests/JsonSerializerOptionsFactoryTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,3 @@ public void should_json_path_nested_null()
6868
result.ShouldBeEquivalentTo(new List<string> { "Nice post!", "Interesting." });
6969
}
7070
}
71-

0 commit comments

Comments
 (0)