Merge branch 'release/13.5.0'

src/Ocelot.Provider.Eureka/EurekaMiddlewareConfigurationProvider.cs

@@ -5,7 +5,7 @@
     using Configuration.Repository;
     using Microsoft.Extensions.DependencyInjection;
     using Middleware;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Discovery.Client;
 
     public class EurekaMiddlewareConfigurationProvider
     {

src/Ocelot.Provider.Eureka/Ocelot.Provider.Eureka.csproj

@@ -29,7 +29,7 @@
     <ProjectReference Include="..\Ocelot\Ocelot.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Pivotal.Discovery.ClientCore" Version="2.0.1" />
+    <PackageReference Include="Steeltoe.Discovery.ClientCore" Version="2.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Ocelot.Provider.Eureka/OcelotBuilderExtensions.cs

@@ -5,7 +5,7 @@
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Middleware;
-    using Pivotal.Discovery.Client;
+    using Steeltoe.Discovery.Client;
     using ServiceDiscovery;
 
     public static class OcelotBuilderExtensions

src/Ocelot.Provider.Kubernetes/IKubeApiClientFactory.cs

@@ -1,7 +1,4 @@
 using KubeClient;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Ocelot.Provider.Kubernetes
 {

src/Ocelot.Provider.Kubernetes/KubeApiClientFactory.cs

@@ -10,7 +10,7 @@ namespace Ocelot.Provider.Kubernetes
             {
                 ApiEndPoint = config.ApiEndPoint
             };
-            if(!string.IsNullOrEmpty(config?.AccessToken))
+            if (!string.IsNullOrEmpty(config?.AccessToken))
             {
                 option.AccessToken = config.AccessToken;
                 option.AuthStrategy = config.AuthStrategy;

src/Ocelot.Provider.Kubernetes/KubeProvider.cs

@@ -3,7 +3,6 @@ using KubeClient.Models;
 using Ocelot.Logging;
 using Ocelot.ServiceDiscovery.Providers;
 using Ocelot.Values;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

src/Ocelot.Provider.Kubernetes/KubeRegistryConfiguration.cs

@@ -1,7 +1,5 @@
 using KubeClient;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Ocelot.Provider.Kubernetes
 {

src/Ocelot.Provider.Kubernetes/Ocelot.Provider.Kubernetes.csproj

@@ -16,7 +16,7 @@
     <RuntimeIdentifiers>win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64</RuntimeIdentifiers>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <Version>0.0.0-dev</Version>
     <Authors>geffzhang</Authors>

src/Ocelot.Provider.Kubernetes/PollKube.cs

@@ -1,9 +1,7 @@
 using Ocelot.Logging;
 using Ocelot.ServiceDiscovery.Providers;
 using Ocelot.Values;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -47,4 +45,3 @@ namespace Ocelot.Provider.Kubernetes
         }
     }
 }
-