mirror of
https://github.com/nsnail/Ocelot.git
synced 2025-04-22 20:12:51 +08:00
upgraded to vs2017
This commit is contained in:
TomPallister
parent
ffd4e364f6
commit
6f65d9bab0
@ -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}}}
|
{"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}}}
|
||||||
@ -1,6 +1 @@
|
|||||||
{
|
{"projects":["src","test"]}
|
||||||
"projects": [ "src", "test" ],
|
|
||||||
"sdk": {
|
|
||||||
"version": "1.0.0-preview2-003133"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -38,6 +38,8 @@ using Ocelot.Responder;
|
|||||||
using Ocelot.ServiceDiscovery;
|
using Ocelot.ServiceDiscovery;
|
||||||
using FileConfigurationProvider = Ocelot.Configuration.Provider.FileConfigurationProvider;
|
using FileConfigurationProvider = Ocelot.Configuration.Provider.FileConfigurationProvider;
|
||||||
using Ocelot.RateLimit;
|
using Ocelot.RateLimit;
|
||||||
|
using Ocelot.Controllers;
|
||||||
|
using System.Reflection;
|
||||||
|
|
||||||
namespace Ocelot.DependencyInjection
|
namespace Ocelot.DependencyInjection
|
||||||
{
|
{
|
||||||
@ -110,9 +112,14 @@ namespace Ocelot.DependencyInjection
|
|||||||
}).AddResourceOwnerValidator<OcelotResourceOwnerPasswordValidator>();
|
}).AddResourceOwnerValidator<OcelotResourceOwnerPasswordValidator>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var assembly = typeof(FileConfigurationController).GetTypeInfo().Assembly;
|
||||||
|
|
||||||
services.AddMvcCore()
|
services.AddMvcCore()
|
||||||
|
.AddApplicationPart(assembly)
|
||||||
|
.AddControllersAsServices()
|
||||||
.AddAuthorization()
|
.AddAuthorization()
|
||||||
.AddJsonFormatters();
|
.AddJsonFormatters();
|
||||||
|
|
||||||
services.AddLogging();
|
services.AddLogging();
|
||||||
services.AddSingleton<IFileConfigurationRepository, FileConfigurationRepository>();
|
services.AddSingleton<IFileConfigurationRepository, FileConfigurationRepository>();
|
||||||
services.AddSingleton<IFileConfigurationSetter, FileConfigurationSetter>();
|
services.AddSingleton<IFileConfigurationSetter, FileConfigurationSetter>();
|
||||||
|
|||||||
51
src/Ocelot/Ocelot.csproj
Normal file
51
src/Ocelot/Ocelot.csproj
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<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.</Description>
|
||||||
|
<AssemblyTitle>Ocelot</AssemblyTitle>
|
||||||
|
<VersionPrefix>0.0.0-dev</VersionPrefix>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<AssemblyName>Ocelot</AssemblyName>
|
||||||
|
<PackageId>Ocelot</PackageId>
|
||||||
|
<PackageTags>API Gateway;.NET core</PackageTags>
|
||||||
|
<PackageProjectUrl>https://github.com/TomPallister/Ocelot</PackageProjectUrl>
|
||||||
|
<RuntimeIdentifiers>win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64</RuntimeIdentifiers>
|
||||||
|
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
|
||||||
|
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||||
|
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||||
|
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
|
||||||
|
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="1.1.1" />
|
||||||
|
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.0.2" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
|
||||||
|
<PackageReference Include="CacheManager.Core" Version="0.9.2" />
|
||||||
|
<PackageReference Include="CacheManager.Microsoft.Extensions.Configuration" Version="0.9.2" />
|
||||||
|
<PackageReference Include="CacheManager.Microsoft.Extensions.Logging" Version="0.9.2" />
|
||||||
|
<PackageReference Include="Consul" Version="0.7.2.1" />
|
||||||
|
<PackageReference Include="Polly" Version="5.0.3" />
|
||||||
|
<PackageReference Include="IdentityServer4" Version="1.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="1.1.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>d6df4206-0dba-41d8-884d-c3e08290fdbb</ProjectGuid>
|
|
||||||
<RootNamespace>Ocelot</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
||||||
@ -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": [
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
52
test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
Normal file
52
test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>0.0.0-dev</VersionPrefix>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<AssemblyName>Ocelot.AcceptanceTests</AssemblyName>
|
||||||
|
<PackageId>Ocelot.AcceptanceTests</PackageId>
|
||||||
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||||
|
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64</RuntimeIdentifiers>
|
||||||
|
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
|
||||||
|
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||||
|
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||||
|
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="configuration.json">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />
|
||||||
|
<ProjectReference Include="..\Ocelot.ManualTest\Ocelot.ManualTest.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
||||||
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.1" />
|
||||||
|
<PackageReference Include="IdentityServer4" Version="1.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Shouldly" Version="2.8.2" />
|
||||||
|
<PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
|
||||||
|
<PackageReference Include="Consul" Version="0.7.2.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.1" />
|
||||||
|
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>f8c224fe-36be-45f5-9b0e-666d8f4a9b52</ProjectGuid>
|
|
||||||
<RootNamespace>Ocelot.AcceptanceTests</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
||||||
@ -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": [
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
23
test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
Normal file
23
test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>0.0.0-dev</VersionPrefix>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<AssemblyName>Ocelot.Benchmarks</AssemblyName>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<PackageId>Ocelot.Benchmarks</PackageId>
|
||||||
|
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64</RuntimeIdentifiers>
|
||||||
|
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||||
|
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||||
|
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="BenchmarkDotNet" Version="0.10.2" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -1,21 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>106b49e6-95f6-4a7b-b81c-96bfa74af035</ProjectGuid>
|
|
||||||
<RootNamespace>Ocelot.Benchmarks</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
||||||
@ -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": [
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -245,6 +245,9 @@ namespace Ocelot.IntegrationTests
|
|||||||
var responseContent = response.Content.ReadAsStringAsync().Result;
|
var responseContent = response.Content.ReadAsStringAsync().Result;
|
||||||
response.EnsureSuccessStatusCode();
|
response.EnsureSuccessStatusCode();
|
||||||
_token = JsonConvert.DeserializeObject<BearerToken>(responseContent);
|
_token = JsonConvert.DeserializeObject<BearerToken>(responseContent);
|
||||||
|
var configPath = $"{adminPath}/.well-known/openid-configuration";
|
||||||
|
response = _httpClient.GetAsync(configPath).Result;
|
||||||
|
response.EnsureSuccessStatusCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GivenOcelotIsRunning()
|
private void GivenOcelotIsRunning()
|
||||||
|
|||||||
50
test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj
Normal file
50
test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>0.0.0-dev</VersionPrefix>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<AssemblyName>Ocelot.IntegrationTests</AssemblyName>
|
||||||
|
<PackageId>Ocelot.IntegrationTests</PackageId>
|
||||||
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||||
|
<RuntimeIdentifiers>win10-x64;osx.10.11-x64;osx.10.12-x64;win7-x64</RuntimeIdentifiers>
|
||||||
|
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
|
||||||
|
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||||
|
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||||
|
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="configuration.json;appsettings.json">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />
|
||||||
|
<ProjectReference Include="..\Ocelot.ManualTest\Ocelot.ManualTest.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
||||||
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
|
||||||
|
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.1" />
|
||||||
|
<PackageReference Include="IdentityServer4" Version="1.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Shouldly" Version="2.8.2" />
|
||||||
|
<PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
|
||||||
|
<PackageReference Include="Consul" Version="0.7.2.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>d4575572-99ca-4530-8737-c296eda326f8</ProjectGuid>
|
|
||||||
<RootNamespace>Ocelot.IntegrationTests</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
||||||
@ -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": [
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
39
test/Ocelot.ManualTest/Ocelot.ManualTest.csproj
Normal file
39
test/Ocelot.ManualTest/Ocelot.ManualTest.csproj
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>0.0.0-dev</VersionPrefix>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||||
|
<AssemblyName>Ocelot.ManualTest</AssemblyName>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<PackageId>Ocelot.ManualTest</PackageId>
|
||||||
|
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64</RuntimeIdentifiers>
|
||||||
|
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="Views;Areas\**\Views">
|
||||||
|
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Consul" Version="0.7.2.1" />
|
||||||
|
<PackageReference Include="Polly" Version="5.0.3" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="1.1.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -1,25 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>02bbf4c5-517e-4157-8d21-4b8b9e118b7a</ProjectGuid>
|
|
||||||
<RootNamespace>Ocelot.ManualTest</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
|
||||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<DnxInvisibleContent Include="bower.json" />
|
|
||||||
<DnxInvisibleContent Include=".bowerrc" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
||||||
@ -41,11 +41,11 @@ namespace Ocelot.ManualTest
|
|||||||
services.AddOcelot(Configuration);
|
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"));
|
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
|
||||||
|
|
||||||
await app.UseOcelot();
|
app.UseOcelot().Wait();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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%" ]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
44
test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
Normal file
44
test/Ocelot.UnitTests/Ocelot.UnitTests.csproj
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<VersionPrefix>0.0.0-dev</VersionPrefix>
|
||||||
|
<TargetFramework>netcoreapp1.1</TargetFramework>
|
||||||
|
<AssemblyName>Ocelot.UnitTests</AssemblyName>
|
||||||
|
<PackageId>Ocelot.UnitTests</PackageId>
|
||||||
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
|
||||||
|
<RuntimeIdentifiers>osx.10.11-x64;osx.10.12-x64;win7-x64;win10-x64</RuntimeIdentifiers>
|
||||||
|
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
|
||||||
|
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
|
||||||
|
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
|
||||||
|
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\src\Ocelot\Ocelot.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
|
||||||
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
|
||||||
|
<PackageReference Include="Moq" Version="4.6.38-alpha" />
|
||||||
|
<PackageReference Include="Shouldly" Version="2.8.2" />
|
||||||
|
<PackageReference Include="TestStack.BDDfy" Version="4.3.2" />
|
||||||
|
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup>
|
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
|
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
|
||||||
</PropertyGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
<PropertyGroup Label="Globals">
|
|
||||||
<ProjectGuid>54e84f1a-e525-4443-96ec-039cbd50c263</ProjectGuid>
|
|
||||||
<RootNamespace>Ocelot.UnitTests</RootNamespace>
|
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
|
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
|
||||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup>
|
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
|
|
||||||
</ItemGroup>
|
|
||||||
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
|
|
||||||
</Project>
|
|
||||||
@ -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": [
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user