diff --git a/Ocelot.sln b/Ocelot.sln index 30e4b2c9..c9e11134 100644 --- a/Ocelot.sln +++ b/Ocelot.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.8 +VisualStudioVersion = 15.0.26730.15 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CFB79B7-C9DC-45A4-9A75-625D92471702}" EndProject diff --git a/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs b/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs index b4c1503a..cdfd5284 100644 --- a/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs +++ b/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs @@ -1,5 +1,6 @@ using System; using IdentityServer4.AccessTokenValidation; +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Ocelot.Responses; diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj index 358fec09..59bef209 100644 --- a/src/Ocelot/Ocelot.csproj +++ b/src/Ocelot/Ocelot.csproj @@ -1,21 +1,21 @@  + Exe + netcoreapp2.0 + 2.0.0 This project is aimed at people using .NET running a micro services / service orientated architecture that need a unified point of entry into their system. In particular I want easy integration with IdentityServer reference and bearer tokens. We have been unable to find this in my current workplace without having to write our own Javascript middlewares to handle the IdentityServer reference tokens. We would rather use the IdentityServer code that already exists to do this. Ocelot is a bunch of middlewares in a specific order. Ocelot manipulates the HttpRequest object into a state specified by its configuration until it reaches a request builder middleware where it creates a HttpRequestMessage object which is used to make a request to a downstream service. The middleware that makes the request is the last thing in the Ocelot pipeline. It does not call the next middleware. The response from the downstream service is stored in a per request scoped repository and retrived as the requests goes back up the Ocelot pipeline. There is a piece of middleware that maps the HttpResponseMessage onto the HttpResponse object and that is returned to the client. That is basically it with a bunch of other features. Ocelot 0.0.0-dev - netcoreapp2.0 - 1.6.1 Ocelot Ocelot API Gateway;.NET core https://github.com/TomPallister/Ocelot - https://github.com/TomPallister/Ocelot + https://github.com/TomPallister/Ocelot win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64 - 1.1.1 false false - True + True false Tom Pallister @@ -36,13 +36,13 @@ - - - - - - - + + + + + + + diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index df8d0994..baa1c1c2 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -3,12 +3,12 @@ 0.0.0-dev netcoreapp2.0 + 2.0.0 Ocelot.AcceptanceTests Exe Ocelot.AcceptanceTests true osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 - 1.1.1 false false false @@ -31,7 +31,7 @@ - + @@ -42,9 +42,9 @@ - + - + diff --git a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj index 3fa0b857..232305d4 100644 --- a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj +++ b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj @@ -3,6 +3,7 @@ 0.0.0-dev netcoreapp2.0 + 2.0.0 Ocelot.Benchmarks Exe Ocelot.Benchmarks @@ -17,7 +18,7 @@ - + diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj index 252d1364..ffabc693 100644 --- a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj +++ b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj @@ -3,12 +3,12 @@ 0.0.0-dev netcoreapp2.0 + 2.0.0 Ocelot.IntegrationTests Exe Ocelot.IntegrationTests true win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64 - 1.1.1 false false false @@ -31,21 +31,21 @@ - + - - - - - - - + + + + + + + - - + + - + diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj index b4b1c57e..3370c15d 100644 --- a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj @@ -3,12 +3,12 @@ 0.0.0-dev netcoreapp2.0 + 2.0.0 true Ocelot.ManualTest Exe Ocelot.ManualTest osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 - 1.1.1 @@ -23,15 +23,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj index a631fae3..6edf87ae 100644 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -3,12 +3,12 @@ 0.0.0-dev netcoreapp2.0 + 2.0.0 Ocelot.UnitTests Ocelot.UnitTests Exe true osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 - 1.1.1 false false false @@ -33,18 +33,18 @@ - + - - - - - - - - - + + + + + + + + +