removed ocelot website project from src and added a manual test proje…

…ct for this, renamed library project to just be ocelot

Ocelot.sln

@@ -18,26 +18,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		run-tests.bat = run-tests.bat
 	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}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot", "src\Ocelot\Ocelot.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
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot.AcceptanceTests", "test\Ocelot.AcceptanceTests\Ocelot.AcceptanceTests.xproj", "{F8C224FE-36BE-45F5-9B0E-666D8F4A9B52}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot.ManualTest", "test\Ocelot.ManualTest\Ocelot.ManualTest.xproj", "{02BBF4C5-517E-4157-8D21-4B8B9E118B7A}"
+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
@@ -50,14 +46,18 @@ Global
 		{F8C224FE-36BE-45F5-9B0E-666D8F4A9B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F8C224FE-36BE-45F5-9B0E-666D8F4A9B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F8C224FE-36BE-45F5-9B0E-666D8F4A9B52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02BBF4C5-517E-4157-8D21-4B8B9E118B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02BBF4C5-517E-4157-8D21-4B8B9E118B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02BBF4C5-517E-4157-8D21-4B8B9E118B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02BBF4C5-517E-4157-8D21-4B8B9E118B7A}.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}
 		{F8C224FE-36BE-45F5-9B0E-666D8F4A9B52} = {5B401523-36DA-4491-B73A-7590A26E420B}
+		{02BBF4C5-517E-4157-8D21-4B8B9E118B7A} = {5B401523-36DA-4491-B73A-7590A26E420B}
 	EndGlobalSection
 EndGlobal

src/Ocelot/Ocelot.xproj

@@ -6,19 +6,14 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>aec8fb40-b370-48a6-9b38-78e560041f01</ProjectGuid>
+    <ProjectGuid>d6df4206-0dba-41d8-884d-c3e08290fdbb</ProjectGuid>
     <RootNamespace>Ocelot</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties project_1json__JSONSchema="http://json.schemastore.org/chrome-manifest" />
-    </VisualStudio>
-  </ProjectExtensions>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

src/Ocelot/project.json

@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
 
     "dependencies": {
@@ -7,7 +7,6 @@
             "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",
@@ -17,12 +16,19 @@
         "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-*",
-        "NetEscapades.Configuration.Yaml": "1.1.0"
-    },
-
-    "tools": {
-        "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
+        "Microsoft.AspNetCore.Http": "1.0.0",
+        "System.Text.RegularExpressions": "4.1.0",
+        "YamlDotNet": "3.9.0",
+        "Microsoft.AspNetCore.Authentication.OAuth": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.JwtBearer": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.Google": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0",
+        "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.0.0",
+        "Microsoft.AspNetCore.Authentication": "1.0.0",
+        "IdentityServer4.AccessTokenValidation": "1.0.1-rc2"
     },
 
     "frameworks": {
@@ -32,36 +38,5 @@
                 "portable-net45+win8"
             ]
         }
-    },
-
-    "buildOptions": {
-        "emitEntryPoint": true,
-        "preserveCompilationContext": true,
-        "copyToOutput": {
-            "include": [
-                "configuration.yaml"
-            ]
-        }
-        },
-
-        "runtimeOptions": {
-            "configProperties": {
-                "System.GC.Server": true
-            }
-        },
-
-        "publishOptions": {
-            "include": [
-                "wwwroot",
-                "Views",
-                "Areas/**/Views",
-                "appsettings.json",
-                "web.config",
-                "configuration.yaml"
-            ]
-        },
-
-        "scripts": {
-            "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
-        }
     }
+}

test/Ocelot.AcceptanceTests/AuthenticationTests.cs

@@ -13,6 +13,7 @@
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
+using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs

@@ -15,6 +15,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Ocelot.Library.Configuration.Yaml;
+using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Ocelot.Library.Configuration.Yaml;
+using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.AcceptanceTests/RoutingTests.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.TestHost;
+using Ocelot.ManualTest;
 using Shouldly;
 using TestStack.BDDfy;
 using Xunit;

test/Ocelot.AcceptanceTests/project.json

@@ -27,11 +27,11 @@
         "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-*",
+        "Ocelot": "1.0.0-*",
         "xunit": "2.1.0",
         "dotnet-test-xunit": "2.2.0-preview2-build1029",
         "Shouldly": "2.8.0",
-        "Ocelot": "1.0.0-*",
+        "Ocelot.ManualTest": "1.0.0-*",
         "Microsoft.AspNetCore.TestHost": "1.0.0",
         "TestStack.BDDfy": "4.3.1",
         "YamlDotNet": "3.9.0",

src/Ocelot.Library/Ocelot.Library.xproj → test/Ocelot.ManualTest/Ocelot.ManualTest.xproj

@@ -7,15 +7,19 @@
 
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>d6df4206-0dba-41d8-884d-c3e08290fdbb</ProjectGuid>
-    <RootNamespace>Ocelot.Library</RootNamespace>
+    <ProjectGuid>02bbf4c5-517e-4157-8d21-4b8b9e118b7a</ProjectGuid>
+    <RootNamespace>Ocelot.ManualTest</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
 
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+  <ItemGroup>
+    <DnxInvisibleContent Include="bower.json" />
+    <DnxInvisibleContent Include=".bowerrc" />
+  </ItemGroup>
+  <Import Project="$(VSToolsPath)\DotNet.Web\Microsoft.DotNet.Web.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>

src/Ocelot/Program.cs → test/Ocelot.ManualTest/Program.cs

@@ -1,7 +1,7 @@
 using System.IO;
 using Microsoft.AspNetCore.Hosting;
 
-namespace Ocelot
+namespace Ocelot.ManualTest
 {
     public class Program
     {

src/Ocelot/Properties/launchSettings.json → test/Ocelot.ManualTest/Properties/launchSettings.json

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

src/Ocelot/Startup.cs → test/Ocelot.ManualTest/Startup.cs

@@ -3,12 +3,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Ocelot.Library.DependencyInjection;
+using Ocelot.Library.Middleware;
 
-namespace Ocelot
+namespace Ocelot.ManualTest
 {
-    using Library.DependencyInjection;
-    using Library.Middleware;
-
     public class Startup
     {
         public Startup(IHostingEnvironment env)

src/Ocelot.Library/project.json → test/Ocelot.ManualTest/project.json

@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
 
     "dependencies": {
@@ -7,6 +7,7 @@
             "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",
@@ -16,19 +17,12 @@
         "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",
-        "System.Text.RegularExpressions": "4.1.0",
-        "YamlDotNet": "3.9.0",
-        "Microsoft.AspNetCore.Authentication.OAuth": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.JwtBearer": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.Google": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0",
-        "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.0.0",
-        "Microsoft.AspNetCore.Authentication": "1.0.0",
-        "IdentityServer4.AccessTokenValidation": "1.0.1-rc2"
+        "Ocelot": "1.0.0-*",
+        "NetEscapades.Configuration.Yaml": "1.1.0"
+    },
+
+    "tools": {
+        "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
     },
 
     "frameworks": {
@@ -38,5 +32,36 @@
                 "portable-net45+win8"
             ]
         }
+    },
+
+    "buildOptions": {
+        "emitEntryPoint": true,
+        "preserveCompilationContext": true,
+        "copyToOutput": {
+            "include": [
+                "configuration.yaml"
+            ]
+        }
+        },
+
+        "runtimeOptions": {
+            "configProperties": {
+                "System.GC.Server": true
+            }
+        },
+
+        "publishOptions": {
+            "include": [
+                "wwwroot",
+                "Views",
+                "Areas/**/Views",
+                "appsettings.json",
+                "web.config",
+                "configuration.yaml"
+            ]
+        },
+
+        "scripts": {
+            "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
+        }
     }
-}

test/Ocelot.UnitTests/project.json

@@ -19,7 +19,7 @@
     "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-*",
+    "Ocelot": "1.0.0-*",
     "xunit": "2.1.0",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Shouldly": "2.8.0",