Skip to content

Commit

Permalink
Fix build errors, warnings, messages after rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
raman-m committed Dec 20, 2024
1 parent bd2da05 commit 6b67250
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 7 deletions.
2 changes: 0 additions & 2 deletions test/Ocelot.Benchmarks/JsonSerializerBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ public void MicrosoftDeserializeBigData()
// |==============================================================================================================================================|
// | 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 |
// | 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 |


public class User
{
public Guid UserId { get; set; }
Expand Down
1 change: 0 additions & 1 deletion test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0-dev-02301" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.11" />
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,9 @@ private void CstorShouldUseDefaultBuilderToInitMvcCoreBuilder()
.GetType().Name.ShouldBe("AuthorizationApplicationModelProvider");

// use system text json
_serviceProvider.GetServices<IActionResultExecutor<JsonResult>>()
.FirstOrDefault(s => s.GetType().Name == "SystemTextJsonResultExecutor")
.ShouldNotBeNull();
_serviceProvider.GetServices<IActionResultExecutor<JsonResult>>()
.FirstOrDefault(s => s.GetType().Name == "SystemTextJsonResultExecutor")
.ShouldNotBeNull();
}

[Fact]
Expand Down
1 change: 0 additions & 1 deletion test/Ocelot.UnitTests/JsonSerializerOptionsFactoryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,3 @@ public void should_json_path_nested_null()
result.ShouldBeEquivalentTo(new List<string> { "Nice post!", "Interesting." });
}
}

0 comments on commit 6b67250

Please sign in to comment.