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

Upgrade Pivotal.Discovery.Client to Pivotal.Discovery.ClientCore (#369)

Browse Source
This commit is contained in:
Catcher Wong
2018-05-22 14:13:45 +08:00
committed by Tom Pallister
parent d01720c349
commit 32a258fd3f
9 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ocelot/DependencyInjection/OcelotBuilder.cs
View File

@ -45,8 +45,9 @@ namespace Ocelot.DependencyInjection
using Ocelot.Infrastructure.Consul;
using Butterfly.Client.Tracing;
using Ocelot.Middleware.Multiplexer;
using Pivotal.Discovery.Client;
using ServiceDiscovery.Providers;
using Steeltoe.Common.Discovery;
using Pivotal.Discovery.Client;
public class OcelotBuilder : IOcelotBuilder
{

2
src/Ocelot/Ocelot.csproj
View File

@ -54,8 +54,8 @@
<PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="1.1.2" />
<PackageReference Include="Consul" Version="0.7.2.4" />
<PackageReference Include="Polly" Version="6.0.1" />
<PackageReference Include="Pivotal.Discovery.Client" Version="1.1.0" />
<PackageReference Include="IdentityServer4" Version="2.2.0" />
<PackageReference Include="Rafty" Version="0.4.3" />
<PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
</ItemGroup>
</Project>

2
src/Ocelot/ServiceDiscovery/Providers/EurekaServiceDiscoveryProvider.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Pivotal.Discovery.Client;
using Steeltoe.Common.Discovery;
using Values;
public class EurekaServiceDiscoveryProvider : IServiceDiscoveryProvider

2
src/Ocelot/ServiceDiscovery/Providers/FakeEurekaDiscoveryClient.cs
View File

@ -2,7 +2,7 @@
{
using System.Collections.Generic;
using System.Threading.Tasks;
using Pivotal.Discovery.Client;
using Steeltoe.Common.Discovery;
public class FakeEurekaDiscoveryClient : IDiscoveryClient
{

6
src/Ocelot/ServiceDiscovery/ServiceDiscoveryProviderFactory.cs
View File

@ -7,9 +7,9 @@ using Ocelot.ServiceDiscovery.Providers;
using Ocelot.Values;
namespace Ocelot.ServiceDiscovery
{
using Pivotal.Discovery.Client;
{
using Steeltoe.Common.Discovery;
public class ServiceDiscoveryProviderFactory : IServiceDiscoveryProviderFactory
{
private readonly IOcelotLoggerFactory _factory;