tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 06:18:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Squash some warnings (#278)

Browse Source 
* squash SA1649 warnings (file/type name mismatch)

* squash SA1127 warnings (generic constraint on own line)

* squash SA1507 warnings (multiple blank lines)

* squash package analysis warnings re: summary text

It's not actually possible to provide a summary right now as per
https://github.com/NuGet/Home/issues/4587

* squash missing castle.core reference warning

* squash obsolete method warnings re: AddOcelotBaseUrl
This commit is contained in:
Simon Jefford
2018-03-16 17:48:11 +00:00
committed by Tom Pallister
parent f7c23d3384
commit c1b315173f
8 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
View File

@ -50,9 +50,4 @@
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Butterfly.Client.AspNetCore" Version="0.0.8" />
</ItemGroup>
<ItemGroup>
<Reference Include="Castle.Core">
<HintPath>..\..\..\..\Users\TGP\.nuget\packages\castle.core\4.2.1\lib\netstandard1.3\Castle.Core.dll</HintPath>
</Reference>
</ItemGroup>
</Project>

2
test/Ocelot.IntegrationTests/RaftTests.cs
View File

@ -342,7 +342,9 @@ namespace Ocelot.IntegrationTests
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true, reloadOnChange: true);
config.AddJsonFile("configuration.json");
config.AddJsonFile("peers.json", optional: true, reloadOnChange: true);
#pragma warning disable CS0618
config.AddOcelotBaseUrl(url);
#pragma warning restore CS0618
config.AddEnvironmentVariables();
})
.ConfigureServices(x =>

3
test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
View File

@ -22,9 +22,10 @@ namespace Ocelot.UnitTests.DependencyInjection
private void GivenTheBaseUrl(string baseUrl)
{
#pragma warning disable CS0618
var builder = new ConfigurationBuilder()
.AddOcelotBaseUrl(baseUrl);
#pragma warning restore CS0618
_configuration = builder.Build();
}

12
test/Ocelot.UnitTests/DependencyInjection/OcelotBuilderTests.cs
View File

@ -223,12 +223,14 @@ namespace Ocelot.UnitTests.DependencyInjection
_ocelotBuilder.AddAdministration("/administration", options);
}
private void AddTransientGlobalDelegatingHandler<T>() where T : DelegatingHandler
private void AddTransientGlobalDelegatingHandler<T>()
where T : DelegatingHandler
{
_ocelotBuilder.AddTransientDelegatingHandler<T>(true);
}
private void AddSpecificTransientDelegatingHandler<T>() where T : DelegatingHandler
private void AddSpecificTransientDelegatingHandler<T>()
where T : DelegatingHandler
{
_ocelotBuilder.AddTransientDelegatingHandler<T>();
}
@ -298,12 +300,14 @@ namespace Ocelot.UnitTests.DependencyInjection
}
}
private void AddGlobalDelegatingHandler<T>() where T : DelegatingHandler
private void AddGlobalDelegatingHandler<T>()
where T : DelegatingHandler
{
_ocelotBuilder.AddSingletonDelegatingHandler<T>(true);
}
private void AddSpecificDelegatingHandler<T>() where T : DelegatingHandler
private void AddSpecificDelegatingHandler<T>()
where T : DelegatingHandler
{
_ocelotBuilder.AddSingletonDelegatingHandler<T>();
}

1
test/Ocelot.UnitTests/Request/Mapper/RequestMapperTests.cs
View File

@ -163,7 +163,6 @@
.BDDfy();
}
[Fact]
public void should_not_add_content_headers()
{