tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-10-31 10:19:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

after hours of pissing around on the mac...gave up..so got this configured how i wanted in VS2015 now to see if it works on the mac

Browse Source
This commit is contained in:
TomPallister
2016-07-03 20:39:08 +01:00
parent 3777e8c0c8
commit c512a772d4
36 changed files with 359 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/Ocelot.ApiGateway/.gitignore → .gitignore vendored
View File

49
.vscode/launch.json vendored
View File

@@ -1,49 +0,0 @@
{
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/bin/Debug/<target-framework>/<project-name.dll>",
"args": [],
"cwd": "${workspaceRoot}",
"stopAtEntry": false,
"externalConsole": false
},
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceRoot}/bin/Debug/<target-framework>/<project-name.dll>",
"args": [],
"cwd": "${workspaceRoot}",
"stopAtEntry": false,
"launchBrowser": {
"enabled": true,
"args": "${auto-detect-url}",
"windows": {
"command": "cmd.exe",
"args": "/C start ${auto-detect-url}"
},
"osx": {
"command": "open"
},
"linux": {
"command": "xdg-open"
}
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": 0
}
]
}

50
Ocelot.sln Normal file
View File

@@ -0,0 +1,50 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5CFB79B7-C9DC-45A4-9A75-625D92471702}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3FA7C349-DBE8-4904-A2CE-015B8869CE6C}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
LICENSE.md = LICENSE.md
README.md = README.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot", "src\Ocelot\Ocelot.xproj", "{AEC8FB40-B370-48A6-9B38-78E560041F01}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot.Library", "src\Ocelot.Library\Ocelot.Library.xproj", "{D6DF4206-0DBA-41D8-884D-C3E08290FDBB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5B401523-36DA-4491-B73A-7590A26E420B}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot.UnitTests", "test\Ocelot.UnitTests\Ocelot.UnitTests.xproj", "{54E84F1A-E525-4443-96EC-039CBD50C263}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AEC8FB40-B370-48A6-9B38-78E560041F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AEC8FB40-B370-48A6-9B38-78E560041F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AEC8FB40-B370-48A6-9B38-78E560041F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AEC8FB40-B370-48A6-9B38-78E560041F01}.Release|Any CPU.Build.0 = Release|Any CPU
{D6DF4206-0DBA-41D8-884D-C3E08290FDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6DF4206-0DBA-41D8-884D-C3E08290FDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6DF4206-0DBA-41D8-884D-C3E08290FDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6DF4206-0DBA-41D8-884D-C3E08290FDBB}.Release|Any CPU.Build.0 = Release|Any CPU
{54E84F1A-E525-4443-96EC-039CBD50C263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{54E84F1A-E525-4443-96EC-039CBD50C263}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54E84F1A-E525-4443-96EC-039CBD50C263}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54E84F1A-E525-4443-96EC-039CBD50C263}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{AEC8FB40-B370-48A6-9B38-78E560041F01} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
{D6DF4206-0DBA-41D8-884D-C3E08290FDBB} = {5CFB79B7-C9DC-45A4-9A75-625D92471702}
{54E84F1A-E525-4443-96EC-039CBD50C263} = {5B401523-36DA-4491-B73A-7590A26E420B}
EndGlobalSection
EndGlobal

6
global.json Normal file
View File

@@ -0,0 +1,6 @@
 {
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview2-003121"
}
}

11
src/Ocelot.ApiGateway/Dockerfile
View File

@@ -1,11 +0,0 @@
FROM microsoft/aspnet:1.0.0-rc1-update1
RUN printf "deb http://ftp.us.debian.org/debian jessie main\n" >> /etc/apt/sources.list
RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/*
COPY . /app
WORKDIR /app
RUN ["dnu", "restore"]
EXPOSE 5000/tcp
ENTRYPOINT ["dnx", "-p", "project.json", "Microsoft.AspNet.Server.Kestrel", "--server.urls", "http://0.0.0.0:5000"]

65
src/Ocelot.ApiGateway/project.json
View File

@@ -1,65 +0,0 @@
{
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-3002702",
"type": "platform"
},
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-final",
"Shouldly": "2.8.0"
},
"testRunner":"xunit",
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-preview1-final",
"imports": "portable-net45+win8+dnxcore50"
}
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"dnxcore50",
"portable-net45+win8"
]
}
},
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"runtimeOptions": {
"gcServer": true
},
"publishOptions": {
"include": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
]
},
"scripts": {
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
},
"tooling": {
"defaultNamespace": "Ocelot.ApiGateway"
}
}

2
src/Ocelot.ApiGateway/Infrastructure/Responses/Error.cs → src/Ocelot.Library/Infrastructure/Responses/Error.cs
View File

@@ -1,4 +1,4 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
namespace Ocelot.Library.Infrastructure.Responses
{
public abstract class Error
{

6
src/Ocelot.ApiGateway/Infrastructure/Responses/ErrorResponse.cs → src/Ocelot.Library/Infrastructure/Responses/ErrorResponse.cs
View File

@@ -1,7 +1,7 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
{
using System.Collections.Generic;
using System.Collections.Generic;
namespace Ocelot.Library.Infrastructure.Responses
{
public class ErrorResponse : Response
{
public ErrorResponse(List<Error> errors) : base(errors)

6
src/Ocelot.ApiGateway/Infrastructure/Responses/ErrorResponseGeneric.cs → src/Ocelot.Library/Infrastructure/Responses/ErrorResponseGeneric.cs
View File

@@ -1,7 +1,7 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
{
using System.Collections.Generic;
using System.Collections.Generic;
namespace Ocelot.Library.Infrastructure.Responses
{
public class ErrorResponse<T> : Response<T>
{
public ErrorResponse(List<Error> errors) : base(errors)

2
src/Ocelot.ApiGateway/Infrastructure/Responses/OkResponse.cs → src/Ocelot.Library/Infrastructure/Responses/OkResponse.cs
View File

@@ -1,4 +1,4 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
namespace Ocelot.Library.Infrastructure.Responses
{
public class OkResponse : Response
{

2
src/Ocelot.ApiGateway/Infrastructure/Responses/OkResponseGeneric.cs → src/Ocelot.Library/Infrastructure/Responses/OkResponseGeneric.cs
View File

@@ -1,4 +1,4 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
namespace Ocelot.Library.Infrastructure.Responses
{
public class OkResponse<T> : Response<T>
{

6
src/Ocelot.ApiGateway/Infrastructure/Responses/Response.cs → src/Ocelot.Library/Infrastructure/Responses/Response.cs
View File

@@ -1,7 +1,7 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
{
using System.Collections.Generic;
using System.Collections.Generic;
namespace Ocelot.Library.Infrastructure.Responses
{
public abstract class Response
{
protected Response()

6
src/Ocelot.ApiGateway/Infrastructure/Responses/ResponseGeneric.cs → src/Ocelot.Library/Infrastructure/Responses/ResponseGeneric.cs
View File

@@ -1,7 +1,7 @@
namespace Ocelot.ApiGateway.Infrastructure.Responses
{
using System.Collections.Generic;
using System.Collections.Generic;
namespace Ocelot.Library.Infrastructure.Responses
{
public abstract class Response<T> : Response
{
protected Response(T data)

4
src/Ocelot.ApiGateway/Infrastructure/Router/IRouterService.cs → src/Ocelot.Library/Infrastructure/Router/IRouterService.cs
View File

@@ -1,6 +1,6 @@
using Ocelot.ApiGateway.Infrastructure.Responses;
using Ocelot.Library.Infrastructure.Responses;
namespace Ocelot.ApiGateway.Infrastructure.Router
namespace Ocelot.Library.Infrastructure.Router
{
public interface IRouterService
{

6
src/Ocelot.ApiGateway/Infrastructure/Router/InMemoryRouterService.cs → src/Ocelot.Library/Infrastructure/Router/InMemoryRouterService.cs
View File

@@ -1,12 +1,12 @@
using System;
using System.Collections.Generic;
using Ocelot.ApiGateway.Infrastructure.Responses;
using Ocelot.Library.Infrastructure.Responses;
namespace Ocelot.ApiGateway.Infrastructure.Router
namespace Ocelot.Library.Infrastructure.Router
{
public class InMemoryRouterService : IRouterService
{
private Dictionary<string, string> _routes;
private readonly Dictionary<string, string> _routes;
public InMemoryRouterService()
{
_routes = new Dictionary<string,string>();

2
src/Ocelot.ApiGateway/Infrastructure/Router/Route.cs → src/Ocelot.Library/Infrastructure/Router/Route.cs
View File

@@ -1,4 +1,4 @@
namespace Ocelot.ApiGateway.Infrastructure.Router
namespace Ocelot.Library.Infrastructure.Router
{
public class Route
{

4
src/Ocelot.ApiGateway/Infrastructure/Router/RouteKeyAlreadyExists.cs → src/Ocelot.Library/Infrastructure/Router/RouteKeyAlreadyExists.cs
View File

@@ -1,6 +1,6 @@
using Ocelot.ApiGateway.Infrastructure.Responses;
using Ocelot.Library.Infrastructure.Responses;
namespace Ocelot.ApiGateway.Infrastructure.Router
namespace Ocelot.Library.Infrastructure.Router
{
public class RouteKeyAlreadyExists : Error
{

4
src/Ocelot.ApiGateway/Infrastructure/Router/RouteKeyDoesNotExist.cs → src/Ocelot.Library/Infrastructure/Router/RouteKeyDoesNotExist.cs
View File

@@ -1,6 +1,6 @@
using Ocelot.ApiGateway.Infrastructure.Responses;
using Ocelot.Library.Infrastructure.Responses;
namespace Ocelot.ApiGateway.Infrastructure.Router
namespace Ocelot.Library.Infrastructure.Router
{
public class RouteKeyDoesNotExist : Error
{

2
src/Ocelot.ApiGateway/Middleware/ProxyExtensions.cs → src/Ocelot.Library/Middleware/ProxyExtensions.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Builder;
namespace Ocelot.ApiGateway.Middleware
namespace Ocelot.Library.Middleware
{
public static class ProxyExtensions
{

2
src/Ocelot.ApiGateway/Middleware/ProxyMiddleware.cs → src/Ocelot.Library/Middleware/ProxyMiddleware.cs
View File

@@ -1,7 +1,7 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
namespace Ocelot.ApiGateway.Middleware
namespace Ocelot.Library.Middleware
{
public class ProxyMiddleware
{

2
src/Ocelot.ApiGateway/Middleware/RequestLoggerExtensions.cs → src/Ocelot.Library/Middleware/RequestLoggerExtensions.cs
View File

@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Builder;
namespace Ocelot.ApiGateway.Middleware
namespace Ocelot.Library.Middleware
{
public static class RequestLoggerExtensions
{

2
src/Ocelot.ApiGateway/Middleware/RequestLoggerMiddleware.cs → src/Ocelot.Library/Middleware/RequestLoggerMiddleware.cs
View File

@@ -2,7 +2,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
namespace Ocelot.ApiGateway.Middleware
namespace Ocelot.Library.Middleware
{
public class RequestLoggerMiddleware
{

21
src/Ocelot.Library/Ocelot.Library.xproj Normal file
View File

@@ -0,0 +1,21 @@
<?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.Library</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>

19
src/Ocelot.Library/Properties/AssemblyInfo.cs Normal file
View File

@@ -0,0 +1,19 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Ocelot.Library")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("d6df4206-0dba-41d8-884d-c3e08290fdbb")]

30
src/Ocelot.Library/project.json Normal file
View File

@@ -0,0 +1,30 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"type": "platform"
},
"Microsoft.AspNetCore.Mvc": "1.0.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
"Microsoft.Extensions.Configuration.Json": "1.0.0",
"Microsoft.Extensions.Logging": "1.0.0",
"Microsoft.Extensions.Logging.Console": "1.0.0",
"Microsoft.Extensions.Logging.Debug": "1.0.0",
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
"Microsoft.AspNetCore.Http": "1.0.0"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"portable-net45+win8"
]
}
}
}

19
src/Ocelot/Ocelot.xproj Normal file
View File

@@ -0,0 +1,19 @@
<?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>aec8fb40-b370-48a6-9b38-78e560041f01</ProjectGuid>
<RootNamespace>Ocelot</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

6
src/Ocelot.ApiGateway/Program.cs → src/Ocelot/Program.cs
View File

@@ -1,8 +1,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Builder;
namespace Ocelot.ApiGateway
namespace Ocelot
{
public class Program
{

10
src/Ocelot.ApiGateway/Properties/launchSettings.json → src/Ocelot/Properties/launchSettings.json
View File

@@ -3,20 +3,20 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:55368/",
"applicationUrl": "http://localhost:1798/",
"sslPort": 0
}
},
"profiles": {
"IIS Express": {
"commandName" : "IISExpress",
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "api/values",
"environmentVariables" : {
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Ocelot.ApiGateway": {
"Ocelot": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:5000/api/values",
@@ -25,4 +25,4 @@
}
}
}
}
}

26
src/Ocelot.ApiGateway/Startup.cs → src/Ocelot/Startup.cs
View File

@@ -1,14 +1,12 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Routing;
using Ocelot.ApiGateway.Middleware;
using Microsoft.AspNetCore.Http;
namespace Ocelot.ApiGateway
{
namespace Ocelot
{
public class Startup
{
public Startup(IHostingEnvironment env)
@@ -20,30 +18,26 @@ namespace Ocelot.ApiGateway
.AddEnvironmentVariables();
Configuration = builder.Build();
}
public IConfigurationRoot Configuration { get; }
// This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
services.AddRouting();
// Add framework services.
}
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
{
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
app.UseRequestLogger();
app.UseProxy();
loggerFactory.AddDebug();
app.Run(async context =>
app.Run(async context =>
{
await context.Response.WriteAsync("Hello from Tom");
});
}
}
}

20
src/Ocelot.ApiGateway/appsettings.json → src/Ocelot/appsettings.json Executable file → Normal file
View File

@@ -1,10 +1,10 @@
{
"Logging": {
"IncludeScopes": false,
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}
{
"Logging": {
"IncludeScopes": false,
"LogLevel": {
"Default": "Debug",
"System": "Information",
"Microsoft": "Information"
}
}
}

58
src/Ocelot/project.json Normal file
View File

@@ -0,0 +1,58 @@
{
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"type": "platform"
},
"Microsoft.AspNetCore.Mvc": "1.0.0",
"Microsoft.AspNetCore.Http": "1.0.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
"Microsoft.Extensions.Configuration.Json": "1.0.0",
"Microsoft.Extensions.Logging": "1.0.0",
"Microsoft.Extensions.Logging.Console": "1.0.0",
"Microsoft.Extensions.Logging.Debug": "1.0.0",
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
"Ocelot.Library": "1.0.0-*"
},
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"portable-net45+win8"
]
}
},
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
},
"publishOptions": {
"include": [
"wwwroot",
"Views",
"Areas/**/Views",
"appsettings.json",
"web.config"
]
},
"scripts": {
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
}
}

28
src/Ocelot.ApiGateway/web.config → src/Ocelot/web.config
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
Configure your application settings in appsettings.json. Learn more at https://go.microsoft.com/fwlink/?LinkId=786380
-->
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
</handlers>
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
</system.webServer>
</configuration>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!--
Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
-->
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified"/>
</handlers>
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false"/>
</system.webServer>
</configuration>

22
test/Ocelot.UnitTests/Ocelot.UnitTests.xproj Normal file
View File

@@ -0,0 +1,22 @@
<?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>

19
test/Ocelot.UnitTests/Properties/AssemblyInfo.cs Normal file
View File

@@ -0,0 +1,19 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Ocelot.UnitTests")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("54e84f1a-e525-4443-96ec-039cbd50c263")]

12
src/Ocelot.ApiGateway/Infrastructure/Router/RouterTests.cs → test/Ocelot.UnitTests/RouterTests.cs
View File

@@ -1,9 +1,9 @@
using System;
using Ocelot.ApiGateway.Infrastructure.Responses;
using Ocelot.Library.Infrastructure.Responses;
using Ocelot.Library.Infrastructure.Router;
using Shouldly;
using Xunit;
namespace Ocelot.ApiGateway.Infrastructure.Router
namespace Ocelot.UnitTests
{
public class RouterTests
{
@@ -45,7 +45,7 @@ namespace Ocelot.ApiGateway.Infrastructure.Router
[Fact]
public void should_return_error_response_if_key_doesnt_exist()
{
{
GivenIWantToRouteRequestsToMyUpstreamApi("api");
WhenIRetrieveTheRouteByKey();
ThenTheKeyDoesNotExist();
@@ -54,7 +54,7 @@ namespace Ocelot.ApiGateway.Infrastructure.Router
private void WhenITryToUseTheSameKey()
{
WhenIAddTheConfiguration();
}
}
private void ThenTheKeyHasAlreadyBeenUsed()
{
@@ -101,7 +101,7 @@ namespace Ocelot.ApiGateway.Infrastructure.Router
private void WhenIAddTheConfiguration()
{
_response = _router.AddRoute(_apiKey, _upstreamApiUrl);
}
}
private void ThenTheResponseIsSuccesful()
{

36
test/Ocelot.UnitTests/project.json Normal file
View File

@@ -0,0 +1,36 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"type": "platform"
},
"Microsoft.AspNetCore.Mvc": "1.0.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
"Microsoft.Extensions.Configuration.Json": "1.0.0",
"Microsoft.Extensions.Logging": "1.0.0",
"Microsoft.Extensions.Logging.Console": "1.0.0",
"Microsoft.Extensions.Logging.Debug": "1.0.0",
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
"Microsoft.AspNetCore.Http": "1.0.0",
"Ocelot.Library": "1.0.0-*",
"xunit": "2.1.0",
"dotnet-test-xunit": "2.2.0-preview2-build1029",
"Shouldly": "2.8.0"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dotnet5.6",
"portable-net45+win8"
]
}
}
}