Merge pull request #3 from ThreeMammals/feature/use-ocelot-administra…

…tion updated to use latest ocelot and ocelot.administration
ThreeMammals · Aug 14, 2018 · 47c00f5 · 47c00f5
2 parents 450353b + b9e88e0
commit 47c00f5
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 14 deletions.
diff --git a/src/Ocelot.Provider.Rafty/FilePeersProvider.cs b/src/Ocelot.Provider.Rafty/FilePeersProvider.cs
@@ -8,6 +8,7 @@
     using Microsoft.Extensions.Options;
     using Middleware;
     using System.Collections.Generic;
+    using Administration;
 
     public class FilePeersProvider : IPeersProvider
     {

diff --git a/src/Ocelot.Provider.Rafty/HttpPeer.cs b/src/Ocelot.Provider.Rafty/HttpPeer.cs
@@ -11,6 +11,7 @@
     using Newtonsoft.Json;
     using System;
     using System.Collections.Generic;
+    using Administration;
 
     public class HttpPeer : IPeer
     {

diff --git a/src/Ocelot.Provider.Rafty/Ocelot.Provider.Rafty.csproj b/src/Ocelot.Provider.Rafty/Ocelot.Provider.Rafty.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
@@ -26,8 +26,9 @@
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ocelot" Version="10.0.1" />
-    <PackageReference Include="Rafty" Version="0.4.4" />
+    <PackageReference Include="Ocelot" Version="10.0.2"/>
+    <PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
+    <PackageReference Include="Rafty" Version="0.4.4"/>
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Ocelot.Provider.Rafty.AcceptanceTests/Ocelot.Provider.Rafty.AcceptanceTests.csproj b/test/Ocelot.Provider.Rafty.AcceptanceTests/Ocelot.Provider.Rafty.AcceptanceTests.csproj
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Ocelot" Version="10.0.1" />
+    <PackageReference Include="Ocelot" Version="10.0.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Ocelot.Provider.Rafty.Benchmarks/Ocelot.Provider.Rafty.Benchmarks.csproj b/test/Ocelot.Provider.Rafty.Benchmarks/Ocelot.Provider.Rafty.Benchmarks.csproj
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
-    <PackageReference Include="Ocelot" Version="10.0.1" />
+    <PackageReference Include="Ocelot" Version="10.0.2" />
     <PackageReference Include="Rafty" Version="0.4.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>

diff --git a/test/Ocelot.Provider.Rafty.IntegrationTests/Ocelot.Provider.Rafty.IntegrationTests.csproj b/test/Ocelot.Provider.Rafty.IntegrationTests/Ocelot.Provider.Rafty.IntegrationTests.csproj
@@ -16,12 +16,13 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
     <PackageReference Include="CacheManager.Core" Version="1.1.2" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Ocelot" Version="10.0.1" />
+    <PackageReference Include="Ocelot" Version="10.0.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Ocelot.Provider.Rafty.IntegrationTests/RaftTests.cs b/test/Ocelot.Provider.Rafty.IntegrationTests/RaftTests.cs
@@ -8,6 +8,7 @@
     using System.Net.Http.Headers;
     using System.Threading;
     using System.Threading.Tasks;
+    using Administration;
     using Configuration.File;
     using DependencyInjection;
     using global::Rafty.Infrastructure;

diff --git a/test/Ocelot.Provider.Rafty.ManualTest/Ocelot.Provider.Rafty.ManualTest.csproj b/test/Ocelot.Provider.Rafty.ManualTest/Ocelot.Provider.Rafty.ManualTest.csproj
@@ -25,6 +25,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
@@ -34,7 +35,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
     <PackageReference Include="Consul" Version="0.7.2.5" />
-    <PackageReference Include="Ocelot" Version="10.0.1" />
+    <PackageReference Include="Ocelot" Version="10.0.2" />
     <PackageReference Include="Polly" Version="6.0.1" />
     <PackageReference Include="Rafty" Version="0.4.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
@@ -44,4 +45,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Ocelot.Provider.Rafty\Ocelot.Provider.Rafty.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/test/Ocelot.Provider.Rafty.ManualTest/Program.cs b/test/Ocelot.Provider.Rafty.ManualTest/Program.cs
@@ -1,6 +1,7 @@
 namespace Ocelot.Provider.Rafty.ManualTest
 {
     using System.IO;
+    using Administration;
     using DependencyInjection;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.Configuration;

diff --git a/test/Ocelot.Provider.Rafty.UnitTests/Ocelot.Provider.Rafty.UnitTests.csproj b/test/Ocelot.Provider.Rafty.UnitTests/Ocelot.Provider.Rafty.UnitTests.csproj
@@ -36,12 +36,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Ocelot.Administration" Version="0.1.0"/>
     <PackageReference Include="CacheManager.Core" Version="1.1.2" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="Ocelot" Version="10.0.1" />
+    <PackageReference Include="Ocelot" Version="10.0.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/test/Ocelot.Provider.Rafty.UnitTests/OcelotAdministrationBuilderExtensionsTests.cs b/test/Ocelot.Provider.Rafty.UnitTests/OcelotAdministrationBuilderExtensionsTests.cs
@@ -1,15 +1,16 @@
-namespace Ocelot.Provider.Rafty.UnitTests.Properties
+namespace Ocelot.Provider.Rafty.UnitTests
 {
+    using System;
+    using System.Collections.Generic;
+    using Administration;
     using DependencyInjection;
+    using Microsoft.AspNetCore.Hosting;
+    using Microsoft.AspNetCore.Hosting.Internal;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Shouldly;
     using TestStack.BDDfy;
     using Xunit;
-    using Microsoft.AspNetCore.Hosting;
-    using Microsoft.AspNetCore.Hosting.Internal;
-    using System;
-    using System.Collections.Generic;
 
     public class OcelotAdministrationBuilderExtensionsTests
     {