From 6f65d9bab0f6fd2d2713234e87012c2329ababe2 Mon Sep 17 00:00:00 2001 From: TomPallister Date: Thu, 9 Mar 2017 17:00:15 +0000 Subject: [PATCH] upgraded to vs2017 --- configuration.json | 2 +- global.json | 7 +- .../ServiceCollectionExtensions.cs | 9 ++- src/Ocelot/Ocelot.csproj | 51 ++++++++++++++ src/Ocelot/Ocelot.xproj | 19 ------ src/Ocelot/project.json | 55 --------------- .../Ocelot.AcceptanceTests.csproj | 52 ++++++++++++++ .../Ocelot.AcceptanceTests.xproj | 22 ------ test/Ocelot.AcceptanceTests/project.json | 52 -------------- .../Ocelot.Benchmarks.csproj | 23 +++++++ .../Ocelot.Benchmarks/Ocelot.Benchmarks.xproj | 21 ------ test/Ocelot.Benchmarks/project.json | 23 ------- .../AdministrationTests.cs | 3 + .../Ocelot.IntegrationTests.csproj | 50 ++++++++++++++ .../Ocelot.IntegrationTests.xproj | 22 ------ test/Ocelot.IntegrationTests/project.json | 51 -------------- .../Ocelot.ManualTest.csproj | 39 +++++++++++ .../Ocelot.ManualTest/Ocelot.ManualTest.xproj | 25 ------- test/Ocelot.ManualTest/Startup.cs | 4 +- test/Ocelot.ManualTest/project.json | 67 ------------------- test/Ocelot.UnitTests/Ocelot.UnitTests.csproj | 44 ++++++++++++ test/Ocelot.UnitTests/Ocelot.UnitTests.xproj | 22 ------ test/Ocelot.UnitTests/project.json | 42 ------------ 23 files changed, 274 insertions(+), 431 deletions(-) create mode 100644 src/Ocelot/Ocelot.csproj delete mode 100644 src/Ocelot/Ocelot.xproj delete mode 100644 src/Ocelot/project.json create mode 100644 test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj delete mode 100644 test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.xproj delete mode 100644 test/Ocelot.AcceptanceTests/project.json create mode 100644 test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj delete mode 100644 test/Ocelot.Benchmarks/Ocelot.Benchmarks.xproj delete mode 100644 test/Ocelot.Benchmarks/project.json create mode 100644 test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj delete mode 100644 test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.xproj delete mode 100644 test/Ocelot.IntegrationTests/project.json create mode 100644 test/Ocelot.ManualTest/Ocelot.ManualTest.csproj delete mode 100644 test/Ocelot.ManualTest/Ocelot.ManualTest.xproj delete mode 100644 test/Ocelot.ManualTest/project.json create mode 100644 test/Ocelot.UnitTests/Ocelot.UnitTests.csproj delete mode 100644 test/Ocelot.UnitTests/Ocelot.UnitTests.xproj delete mode 100644 test/Ocelot.UnitTests/project.json diff --git a/configuration.json b/configuration.json index 6c4e9ae7..65b211fc 100755 --- a/configuration.json +++ b/configuration.json @@ -1 +1 @@ -{"ReRoutes":[{"DownstreamPathTemplate":"/","UpstreamPathTemplate":"/","UpstreamHttpMethod":"Get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"http","DownstreamHost":"localhost","DownstreamPort":51879,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null,"RateLimitOptions":{"ClientWhitelist":[],"EnableRateLimiting":false,"Period":null,"PeriodTimespan":0.0,"Limit":0}}],"GlobalConfiguration":{"RequestIdKey":null,"ServiceDiscoveryProvider":{"Provider":null,"Host":null,"Port":0},"AdministrationPath":null,"RateLimitOptions":{"ClientIdHeader":"ClientId","QuotaExceededMessage":null,"RateLimitCounterPrefix":"ocelot","DisableRateLimitHeaders":false,"HttpStatusCode":429}}} \ No newline at end of file +{"ReRoutes":[{"DownstreamPathTemplate":"/","UpstreamPathTemplate":"/","UpstreamHttpMethod":"get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"https","DownstreamHost":"localhost","DownstreamPort":80,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null,"RateLimitOptions":{"ClientWhitelist":[],"EnableRateLimiting":false,"Period":null,"PeriodTimespan":0.0,"Limit":0}},{"DownstreamPathTemplate":"/","UpstreamPathTemplate":"/test","UpstreamHttpMethod":"get","AuthenticationOptions":{"Provider":null,"ProviderRootUrl":null,"ScopeName":null,"RequireHttps":false,"AdditionalScopes":[],"ScopeSecret":null},"AddHeadersToRequest":{},"AddClaimsToRequest":{},"RouteClaimsRequirement":{},"AddQueriesToRequest":{},"RequestIdKey":null,"FileCacheOptions":{"TtlSeconds":0},"ReRouteIsCaseSensitive":false,"ServiceName":null,"DownstreamScheme":"https","DownstreamHost":"localhost","DownstreamPort":80,"QoSOptions":{"ExceptionsAllowedBeforeBreaking":0,"DurationOfBreak":0,"TimeoutValue":0},"LoadBalancer":null,"RateLimitOptions":{"ClientWhitelist":[],"EnableRateLimiting":false,"Period":null,"PeriodTimespan":0.0,"Limit":0}}],"GlobalConfiguration":{"RequestIdKey":"RequestId","ServiceDiscoveryProvider":{"Provider":"test","Host":"127.0.0.1","Port":0},"AdministrationPath":"/administration","RateLimitOptions":{"ClientIdHeader":"ClientId","QuotaExceededMessage":null,"RateLimitCounterPrefix":"ocelot","DisableRateLimitHeaders":false,"HttpStatusCode":429}}} \ No newline at end of file diff --git a/global.json b/global.json index ff8d898e..31a5f7fc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1 @@ - { - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-003133" - } -} +{"projects":["src","test"]} \ No newline at end of file diff --git a/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs b/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs index 508f8ad7..acf5ab62 100644 --- a/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs +++ b/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs @@ -38,6 +38,8 @@ using Ocelot.Responder; using Ocelot.ServiceDiscovery; using FileConfigurationProvider = Ocelot.Configuration.Provider.FileConfigurationProvider; using Ocelot.RateLimit; +using Ocelot.Controllers; +using System.Reflection; namespace Ocelot.DependencyInjection { @@ -109,10 +111,15 @@ namespace Ocelot.DependencyInjection } }).AddResourceOwnerValidator(); } - + + var assembly = typeof(FileConfigurationController).GetTypeInfo().Assembly; + services.AddMvcCore() + .AddApplicationPart(assembly) + .AddControllersAsServices() .AddAuthorization() .AddJsonFormatters(); + services.AddLogging(); services.AddSingleton(); services.AddSingleton(); diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj new file mode 100644 index 00000000..008708d5 --- /dev/null +++ b/src/Ocelot/Ocelot.csproj @@ -0,0 +1,51 @@ + + + + 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 + netcoreapp1.1 + Ocelot + Ocelot + API Gateway;.NET core + https://github.com/TomPallister/Ocelot + win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64 + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Ocelot/Ocelot.xproj b/src/Ocelot/Ocelot.xproj deleted file mode 100644 index 5f2a7cc5..00000000 --- a/src/Ocelot/Ocelot.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d6df4206-0dba-41d8-884d-c3e08290fdbb - Ocelot - .\obj - .\bin\ - v4.5 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Ocelot/project.json b/src/Ocelot/project.json deleted file mode 100644 index 93484a9d..00000000 --- a/src/Ocelot/project.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": "0.0.0-dev", - "title": "Ocelot", - "summary": "API Gateway created using .NET core.", - "projectUrl": "https://github.com/TomPallister/Ocelot", - "description": "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.", - "tags": [ - "API Gateway", - ".NET core" - ], - "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.AspNetCore.Http": "1.1.0", - "System.Text.RegularExpressions": "4.3.0", - "Microsoft.AspNetCore.Authentication.OAuth": "1.1.0", - "Microsoft.AspNetCore.Authentication.JwtBearer": "1.1.0", - "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0", - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Authentication.Google": "1.1.0", - "Microsoft.AspNetCore.Authentication.Facebook": "1.1.0", - "Microsoft.AspNetCore.Authentication.Twitter": "1.1.0", - "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0", - "Microsoft.AspNetCore.Authentication": "1.1.0", - "IdentityServer4.AccessTokenValidation": "1.0.2", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.NETCore.App": "1.1.0", - "CacheManager.Core": "0.9.2", - "CacheManager.Microsoft.Extensions.Configuration": "0.9.2", - "CacheManager.Microsoft.Extensions.Logging": "0.9.2", - "Consul": "0.7.2.1", - "Polly": "5.0.3", - "IdentityServer4": "1.0.1", - "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.1.0" - }, - "runtimes": { - "win10-x64": {}, - "osx.10.11-x64": {}, - "osx.10.12-x64": {}, - "win7-x64": {} - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - ] - } - } -} diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj new file mode 100644 index 00000000..ca7dd4e6 --- /dev/null +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -0,0 +1,52 @@ + + + + 0.0.0-dev + netcoreapp1.1 + Ocelot.AcceptanceTests + Ocelot.AcceptanceTests + true + osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 + 1.1.1 + false + false + false + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.xproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.xproj deleted file mode 100644 index 84e2327e..00000000 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f8c224fe-36be-45f5-9b0e-666d8f4a9b52 - Ocelot.AcceptanceTests - .\obj - .\bin\ - v4.5 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Ocelot.AcceptanceTests/project.json b/test/Ocelot.AcceptanceTests/project.json deleted file mode 100644 index 7739992a..00000000 --- a/test/Ocelot.AcceptanceTests/project.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": "0.0.0-dev", - - "buildOptions": { - "copyToOutput": { - "include": [ - "configuration.json" - ] - } - }, - - "testRunner": "xunit", - - "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.AspNetCore.Http": "1.1.0", - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "Ocelot": "0.0.0-dev", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Ocelot.ManualTest": "0.0.0-dev", - "Microsoft.AspNetCore.TestHost": "1.1.0", - "IdentityServer4": "1.0.1", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.0", - "Microsoft.NETCore.App": "1.1.0", - "Shouldly": "2.8.2", - "TestStack.BDDfy": "4.3.2", - "Consul": "0.7.2.1", - "Microsoft.Extensions.Caching.Memory": "1.1.0", - "xunit": "2.2.0-rc1-build3507" - }, - "runtimes": { - "osx.10.11-x64":{}, - "osx.10.12-x64":{}, - "win7-x64": {}, - "win10-x64": {} - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - ] - } - } -} diff --git a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj new file mode 100644 index 00000000..c2928a5c --- /dev/null +++ b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj @@ -0,0 +1,23 @@ + + + + 0.0.0-dev + netcoreapp1.1 + Ocelot.Benchmarks + Exe + Ocelot.Benchmarks + osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 + false + false + false + + + + + + + + + + + diff --git a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.xproj b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.xproj deleted file mode 100644 index 9a2d931f..00000000 --- a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 106b49e6-95f6-4a7b-b81c-96bfa74af035 - Ocelot.Benchmarks - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/test/Ocelot.Benchmarks/project.json b/test/Ocelot.Benchmarks/project.json deleted file mode 100644 index 615b9d0e..00000000 --- a/test/Ocelot.Benchmarks/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "0.0.0-dev", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Ocelot": "0.0.0-dev", - "BenchmarkDotNet": "0.10.2" - }, - "runtimes": { - "osx.10.11-x64":{}, - "osx.10.12-x64":{}, - "win7-x64": {}, - "win10-x64": {} - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - ] - } - } -} diff --git a/test/Ocelot.IntegrationTests/AdministrationTests.cs b/test/Ocelot.IntegrationTests/AdministrationTests.cs index 2f78e795..642493bb 100644 --- a/test/Ocelot.IntegrationTests/AdministrationTests.cs +++ b/test/Ocelot.IntegrationTests/AdministrationTests.cs @@ -245,6 +245,9 @@ namespace Ocelot.IntegrationTests var responseContent = response.Content.ReadAsStringAsync().Result; response.EnsureSuccessStatusCode(); _token = JsonConvert.DeserializeObject(responseContent); + var configPath = $"{adminPath}/.well-known/openid-configuration"; + response = _httpClient.GetAsync(configPath).Result; + response.EnsureSuccessStatusCode(); } private void GivenOcelotIsRunning() diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj new file mode 100644 index 00000000..95ab556d --- /dev/null +++ b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj @@ -0,0 +1,50 @@ + + + + 0.0.0-dev + netcoreapp1.1 + Ocelot.IntegrationTests + Ocelot.IntegrationTests + true + win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64 + 1.1.1 + false + false + false + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.xproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.xproj deleted file mode 100644 index ece2b3b5..00000000 --- a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d4575572-99ca-4530-8737-c296eda326f8 - Ocelot.IntegrationTests - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Ocelot.IntegrationTests/project.json b/test/Ocelot.IntegrationTests/project.json deleted file mode 100644 index 578f9a7f..00000000 --- a/test/Ocelot.IntegrationTests/project.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": "0.0.0-dev", - - "buildOptions": { - "copyToOutput": { - "include": [ - "configuration.json", - "appsettings.json" - ] - } - }, - - "testRunner": "xunit", - - "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.AspNetCore.Http": "1.1.0", - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "Ocelot": "0.0.0-dev", - "xunit": "2.2.0-beta2-build3300", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Ocelot.ManualTest": "0.0.0-dev", - "Microsoft.AspNetCore.TestHost": "1.1.0", - "IdentityServer4": "1.0.1", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.NETCore.App": "1.1.0", - "Shouldly": "2.8.2", - "TestStack.BDDfy": "4.3.2", - "Consul": "0.7.2.1" - }, - "runtimes": { - "win10-x64": {}, - "osx.10.11-x64": {}, - "osx.10.12-x64": {}, - "win7-x64": {} - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - ] - } - } -} diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj new file mode 100644 index 00000000..f541111f --- /dev/null +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj @@ -0,0 +1,39 @@ + + + + 0.0.0-dev + netcoreapp1.1 + true + Ocelot.ManualTest + Exe + Ocelot.ManualTest + osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 + 1.1.1 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.xproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.xproj deleted file mode 100644 index 16a89a50..00000000 --- a/test/Ocelot.ManualTest/Ocelot.ManualTest.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 02bbf4c5-517e-4157-8d21-4b8b9e118b7a - Ocelot.ManualTest - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - - - - - diff --git a/test/Ocelot.ManualTest/Startup.cs b/test/Ocelot.ManualTest/Startup.cs index 26adc927..b0cd318c 100644 --- a/test/Ocelot.ManualTest/Startup.cs +++ b/test/Ocelot.ManualTest/Startup.cs @@ -41,11 +41,11 @@ namespace Ocelot.ManualTest services.AddOcelot(Configuration); } - public async void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { loggerFactory.AddConsole(Configuration.GetSection("Logging")); - await app.UseOcelot(); + app.UseOcelot().Wait(); } } } diff --git a/test/Ocelot.ManualTest/project.json b/test/Ocelot.ManualTest/project.json deleted file mode 100644 index 5083532b..00000000 --- a/test/Ocelot.ManualTest/project.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": "0.0.0-dev", - - "dependencies": { - "Microsoft.AspNetCore.Http": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Ocelot": "0.0.0-dev", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.NETCore.App": "1.1.0", - "Consul": "0.7.2.1", - "Polly": "5.0.3", - "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.1.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" - }, - "runtimes": { - "osx.10.11-x64":{}, - "osx.10.12-x64":{}, - "win7-x64": {}, - "win10-x64": {} - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true, - "copyToOutput": { - "include": [ - "configuration.json" - ] - } - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "Areas/**/Views", - "appsettings.json", - "web.config", - "configuration.json" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj new file mode 100644 index 00000000..ba5b0a7c --- /dev/null +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -0,0 +1,44 @@ + + + + 0.0.0-dev + netcoreapp1.1 + Ocelot.UnitTests + Ocelot.UnitTests + true + osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64 + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.xproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.xproj deleted file mode 100644 index 0936ae02..00000000 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 54e84f1a-e525-4443-96ec-039cbd50c263 - Ocelot.UnitTests - .\obj - .\bin\ - v4.5 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Ocelot.UnitTests/project.json b/test/Ocelot.UnitTests/project.json deleted file mode 100644 index e0b93748..00000000 --- a/test/Ocelot.UnitTests/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "0.0.0-dev", - - "testRunner": "xunit", - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.AspNetCore.Authentication.OAuth": "1.1.0", - "Microsoft.AspNetCore.Cryptography.KeyDerivation": "1.1.0", - "Microsoft.AspNetCore.Http": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.TestHost": "1.1.0", - "Microsoft.DotNet.InternalAbstractions": "1.0.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.NETCore.App": "1.1.0", - "Moq": "4.6.38-alpha", - "Ocelot": "0.0.0-dev", - "Shouldly": "2.8.2", - "TestStack.BDDfy": "4.3.2", - "xunit": "2.2.0-rc1-build3507" - }, - "runtimes": { - "osx.10.11-x64":{}, - "osx.10.12-x64":{}, - "win7-x64": {}, - "win10-x64": {} - }, - "frameworks": { - "netcoreapp1.1": { - "imports": [ - ] - } - } -}