diff --git a/Ocelot.sln b/Ocelot.sln index f06eb7cf..75f70f63 100644 --- a/Ocelot.sln +++ b/Ocelot.sln @@ -18,9 +18,7 @@ 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 @@ -28,16 +26,14 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Ocelot.UnitTests", "test\Oc 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 diff --git a/src/Ocelot.Library/Authentication/Handler/AuthenticationHandler.cs b/src/Ocelot/Authentication/Handler/AuthenticationHandler.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/AuthenticationHandler.cs rename to src/Ocelot/Authentication/Handler/AuthenticationHandler.cs diff --git a/src/Ocelot.Library/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs b/src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs rename to src/Ocelot/Authentication/Handler/Creator/AuthenticationHandlerCreator.cs diff --git a/src/Ocelot.Library/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs b/src/Ocelot/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs rename to src/Ocelot/Authentication/Handler/Creator/IAuthenticationHandlerCreator.cs diff --git a/src/Ocelot.Library/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs b/src/Ocelot/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs rename to src/Ocelot/Authentication/Handler/Factory/AuthenticationHandlerFactory.cs diff --git a/src/Ocelot.Library/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs b/src/Ocelot/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs rename to src/Ocelot/Authentication/Handler/Factory/IAuthenticationHandlerFactory.cs diff --git a/src/Ocelot.Library/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs b/src/Ocelot/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs rename to src/Ocelot/Authentication/Handler/Factory/UnableToCreateAuthenticationHandlerError.cs diff --git a/src/Ocelot.Library/Authentication/Handler/SupportedAuthenticationProviders.cs b/src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Handler/SupportedAuthenticationProviders.cs rename to src/Ocelot/Authentication/Handler/SupportedAuthenticationProviders.cs diff --git a/src/Ocelot.Library/Authentication/Middleware/AuthenticationMiddleware.cs b/src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Middleware/AuthenticationMiddleware.cs rename to src/Ocelot/Authentication/Middleware/AuthenticationMiddleware.cs diff --git a/src/Ocelot.Library/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs b/src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs rename to src/Ocelot/Authentication/Middleware/AuthenticationMiddlewareMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/Configuration/AuthenticationOptions.cs b/src/Ocelot/Configuration/AuthenticationOptions.cs similarity index 100% rename from src/Ocelot.Library/Configuration/AuthenticationOptions.cs rename to src/Ocelot/Configuration/AuthenticationOptions.cs diff --git a/src/Ocelot.Library/Configuration/Builder/ReRouteBuilder.cs b/src/Ocelot/Configuration/Builder/ReRouteBuilder.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Builder/ReRouteBuilder.cs rename to src/Ocelot/Configuration/Builder/ReRouteBuilder.cs diff --git a/src/Ocelot.Library/Configuration/ClaimToHeader.cs b/src/Ocelot/Configuration/ClaimToHeader.cs similarity index 100% rename from src/Ocelot.Library/Configuration/ClaimToHeader.cs rename to src/Ocelot/Configuration/ClaimToHeader.cs diff --git a/src/Ocelot.Library/Configuration/Creator/IOcelotConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Creator/IOcelotConfigurationCreator.cs rename to src/Ocelot/Configuration/Creator/IOcelotConfigurationCreator.cs diff --git a/src/Ocelot.Library/Configuration/Creator/YamlOcelotConfigurationCreator.cs b/src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Creator/YamlOcelotConfigurationCreator.cs rename to src/Ocelot/Configuration/Creator/YamlOcelotConfigurationCreator.cs diff --git a/src/Ocelot.Library/Configuration/IOcelotConfiguration.cs b/src/Ocelot/Configuration/IOcelotConfiguration.cs similarity index 100% rename from src/Ocelot.Library/Configuration/IOcelotConfiguration.cs rename to src/Ocelot/Configuration/IOcelotConfiguration.cs diff --git a/src/Ocelot.Library/Configuration/OcelotConfiguration.cs b/src/Ocelot/Configuration/OcelotConfiguration.cs similarity index 100% rename from src/Ocelot.Library/Configuration/OcelotConfiguration.cs rename to src/Ocelot/Configuration/OcelotConfiguration.cs diff --git a/src/Ocelot.Library/Configuration/Parser/ClaimToHeaderConfigurationParser.cs b/src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Parser/ClaimToHeaderConfigurationParser.cs rename to src/Ocelot/Configuration/Parser/ClaimToHeaderConfigurationParser.cs diff --git a/src/Ocelot.Library/Configuration/Parser/IClaimToHeaderConfigurationParser.cs b/src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Parser/IClaimToHeaderConfigurationParser.cs rename to src/Ocelot/Configuration/Parser/IClaimToHeaderConfigurationParser.cs diff --git a/src/Ocelot.Library/Configuration/Parser/InstructionNotForClaimsError.cs b/src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Parser/InstructionNotForClaimsError.cs rename to src/Ocelot/Configuration/Parser/InstructionNotForClaimsError.cs diff --git a/src/Ocelot.Library/Configuration/Parser/NoInstructionsError.cs b/src/Ocelot/Configuration/Parser/NoInstructionsError.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Parser/NoInstructionsError.cs rename to src/Ocelot/Configuration/Parser/NoInstructionsError.cs diff --git a/src/Ocelot.Library/Configuration/Parser/ParsingConfigurationHeaderError.cs b/src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Parser/ParsingConfigurationHeaderError.cs rename to src/Ocelot/Configuration/Parser/ParsingConfigurationHeaderError.cs diff --git a/src/Ocelot.Library/Configuration/Provider/IOcelotConfigurationProvider.cs b/src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Provider/IOcelotConfigurationProvider.cs rename to src/Ocelot/Configuration/Provider/IOcelotConfigurationProvider.cs diff --git a/src/Ocelot.Library/Configuration/Provider/YamlOcelotConfigurationProvider.cs b/src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Provider/YamlOcelotConfigurationProvider.cs rename to src/Ocelot/Configuration/Provider/YamlOcelotConfigurationProvider.cs diff --git a/src/Ocelot.Library/Configuration/ReRoute.cs b/src/Ocelot/Configuration/ReRoute.cs similarity index 100% rename from src/Ocelot.Library/Configuration/ReRoute.cs rename to src/Ocelot/Configuration/ReRoute.cs diff --git a/src/Ocelot.Library/Configuration/Repository/IOcelotConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Repository/IOcelotConfigurationRepository.cs rename to src/Ocelot/Configuration/Repository/IOcelotConfigurationRepository.cs diff --git a/src/Ocelot.Library/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs b/src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs rename to src/Ocelot/Configuration/Repository/InMemoryOcelotConfigurationRepository.cs diff --git a/src/Ocelot.Library/Configuration/Validator/ConfigurationValidationResult.cs b/src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Validator/ConfigurationValidationResult.cs rename to src/Ocelot/Configuration/Validator/ConfigurationValidationResult.cs diff --git a/src/Ocelot.Library/Configuration/Validator/ConfigurationValidator.cs b/src/Ocelot/Configuration/Validator/ConfigurationValidator.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Validator/ConfigurationValidator.cs rename to src/Ocelot/Configuration/Validator/ConfigurationValidator.cs diff --git a/src/Ocelot.Library/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs b/src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs rename to src/Ocelot/Configuration/Validator/DownstreamTemplateAlreadyUsedError.cs diff --git a/src/Ocelot.Library/Configuration/Validator/IConfigurationValidator.cs b/src/Ocelot/Configuration/Validator/IConfigurationValidator.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Validator/IConfigurationValidator.cs rename to src/Ocelot/Configuration/Validator/IConfigurationValidator.cs diff --git a/src/Ocelot.Library/Configuration/Validator/UnsupportedAuthenticationProviderError.cs b/src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Validator/UnsupportedAuthenticationProviderError.cs rename to src/Ocelot/Configuration/Validator/UnsupportedAuthenticationProviderError.cs diff --git a/src/Ocelot.Library/Configuration/Yaml/YamlAuthenticationOptions.cs b/src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Yaml/YamlAuthenticationOptions.cs rename to src/Ocelot/Configuration/Yaml/YamlAuthenticationOptions.cs diff --git a/src/Ocelot.Library/Configuration/Yaml/YamlConfiguration.cs b/src/Ocelot/Configuration/Yaml/YamlConfiguration.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Yaml/YamlConfiguration.cs rename to src/Ocelot/Configuration/Yaml/YamlConfiguration.cs diff --git a/src/Ocelot.Library/Configuration/Yaml/YamlReRoute.cs b/src/Ocelot/Configuration/Yaml/YamlReRoute.cs similarity index 100% rename from src/Ocelot.Library/Configuration/Yaml/YamlReRoute.cs rename to src/Ocelot/Configuration/Yaml/YamlReRoute.cs diff --git a/src/Ocelot.Library/DependencyInjection/ServiceCollectionExtensions.cs b/src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs similarity index 100% rename from src/Ocelot.Library/DependencyInjection/ServiceCollectionExtensions.cs rename to src/Ocelot/DependencyInjection/ServiceCollectionExtensions.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/DownstreamRoute.cs b/src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/DownstreamRoute.cs rename to src/Ocelot/DownstreamRouteFinder/DownstreamRoute.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs b/src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs rename to src/Ocelot/DownstreamRouteFinder/Finder/DownstreamRouteFinder.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs b/src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs rename to src/Ocelot/DownstreamRouteFinder/Finder/IDownstreamRouteFinder.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs b/src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs rename to src/Ocelot/DownstreamRouteFinder/Finder/UnableToFindDownstreamRouteError.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs rename to src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddleware.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs b/src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs rename to src/Ocelot/DownstreamRouteFinder/Middleware/DownstreamRouteFinderMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs rename to src/Ocelot/DownstreamRouteFinder/UrlMatcher/ITemplateVariableNameAndValueFinder.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs rename to src/Ocelot/DownstreamRouteFinder/UrlMatcher/IUrlPathToUrlTemplateMatcher.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs rename to src/Ocelot/DownstreamRouteFinder/UrlMatcher/RegExUrlMatcher.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs rename to src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValue.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs rename to src/Ocelot/DownstreamRouteFinder/UrlMatcher/TemplateVariableNameAndValueFinder.cs diff --git a/src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs b/src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs similarity index 100% rename from src/Ocelot.Library/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs rename to src/Ocelot/DownstreamRouteFinder/UrlMatcher/UrlMatch.cs diff --git a/src/Ocelot.Library/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs similarity index 100% rename from src/Ocelot.Library/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs rename to src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddleware.cs diff --git a/src/Ocelot.Library/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs b/src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs rename to src/Ocelot/DownstreamUrlCreator/Middleware/DownstreamUrlCreatorMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs b/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs similarity index 100% rename from src/Ocelot.Library/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs rename to src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/DownstreamUrlTemplateVariableReplacer.cs diff --git a/src/Ocelot.Library/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs b/src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs similarity index 100% rename from src/Ocelot.Library/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs rename to src/Ocelot/DownstreamUrlCreator/UrlTemplateReplacer/IDownstreamUrlPathTemplateVariableReplacer.cs diff --git a/src/Ocelot.Library/Errors/Error.cs b/src/Ocelot/Errors/Error.cs similarity index 100% rename from src/Ocelot.Library/Errors/Error.cs rename to src/Ocelot/Errors/Error.cs diff --git a/src/Ocelot.Library/Errors/OcelotErrorCode.cs b/src/Ocelot/Errors/OcelotErrorCode.cs similarity index 100% rename from src/Ocelot.Library/Errors/OcelotErrorCode.cs rename to src/Ocelot/Errors/OcelotErrorCode.cs diff --git a/src/Ocelot.Library/HeaderBuilder/AddHeadersToRequest.cs b/src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/AddHeadersToRequest.cs rename to src/Ocelot/HeaderBuilder/AddHeadersToRequest.cs diff --git a/src/Ocelot.Library/HeaderBuilder/IAddHeadersToRequest.cs b/src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/IAddHeadersToRequest.cs rename to src/Ocelot/HeaderBuilder/IAddHeadersToRequest.cs diff --git a/src/Ocelot.Library/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs b/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs rename to src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddleware.cs diff --git a/src/Ocelot.Library/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs b/src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs rename to src/Ocelot/HeaderBuilder/Middleware/HttpRequestHeadersBuilderMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/HeaderBuilder/Parser/CannotFindClaimError.cs b/src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/Parser/CannotFindClaimError.cs rename to src/Ocelot/HeaderBuilder/Parser/CannotFindClaimError.cs diff --git a/src/Ocelot.Library/HeaderBuilder/Parser/ClaimsParser.cs b/src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/Parser/ClaimsParser.cs rename to src/Ocelot/HeaderBuilder/Parser/ClaimsParser.cs diff --git a/src/Ocelot.Library/HeaderBuilder/Parser/IClaimsParser.cs b/src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs similarity index 100% rename from src/Ocelot.Library/HeaderBuilder/Parser/IClaimsParser.cs rename to src/Ocelot/HeaderBuilder/Parser/IClaimsParser.cs diff --git a/src/Ocelot.Library/Middleware/OcelotMiddleware.cs b/src/Ocelot/Middleware/OcelotMiddleware.cs similarity index 100% rename from src/Ocelot.Library/Middleware/OcelotMiddleware.cs rename to src/Ocelot/Middleware/OcelotMiddleware.cs diff --git a/src/Ocelot.Library/Middleware/OcelotMiddlewareExtensions.cs b/src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/Middleware/OcelotMiddlewareExtensions.cs rename to src/Ocelot/Middleware/OcelotMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/Middleware/UnauthenticatedError.cs b/src/Ocelot/Middleware/UnauthenticatedError.cs similarity index 100% rename from src/Ocelot.Library/Middleware/UnauthenticatedError.cs rename to src/Ocelot/Middleware/UnauthenticatedError.cs diff --git a/src/Ocelot/Ocelot.xproj b/src/Ocelot/Ocelot.xproj index ec987923..5f2a7cc5 100644 --- a/src/Ocelot/Ocelot.xproj +++ b/src/Ocelot/Ocelot.xproj @@ -6,19 +6,14 @@ - aec8fb40-b370-48a6-9b38-78e560041f01 + d6df4206-0dba-41d8-884d-c3e08290fdbb Ocelot .\obj .\bin\ - v4.5.2 + v4.5 2.0 - - - - - - + \ No newline at end of file diff --git a/src/Ocelot.Library/Properties/AssemblyInfo.cs b/src/Ocelot/Properties/AssemblyInfo.cs similarity index 100% rename from src/Ocelot.Library/Properties/AssemblyInfo.cs rename to src/Ocelot/Properties/AssemblyInfo.cs diff --git a/src/Ocelot.Library/RequestBuilder/Builder/HttpRequestBuilder.cs b/src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs similarity index 100% rename from src/Ocelot.Library/RequestBuilder/Builder/HttpRequestBuilder.cs rename to src/Ocelot/RequestBuilder/Builder/HttpRequestBuilder.cs diff --git a/src/Ocelot.Library/RequestBuilder/Builder/IRequestBuilder.cs b/src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs similarity index 100% rename from src/Ocelot.Library/RequestBuilder/Builder/IRequestBuilder.cs rename to src/Ocelot/RequestBuilder/Builder/IRequestBuilder.cs diff --git a/src/Ocelot.Library/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs b/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs similarity index 100% rename from src/Ocelot.Library/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs rename to src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddleware.cs diff --git a/src/Ocelot.Library/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs b/src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs rename to src/Ocelot/RequestBuilder/Middleware/HttpRequestBuilderMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/RequestBuilder/Request.cs b/src/Ocelot/RequestBuilder/Request.cs similarity index 100% rename from src/Ocelot.Library/RequestBuilder/Request.cs rename to src/Ocelot/RequestBuilder/Request.cs diff --git a/src/Ocelot.Library/Requester/HttpClientHttpRequester.cs b/src/Ocelot/Requester/HttpClientHttpRequester.cs similarity index 100% rename from src/Ocelot.Library/Requester/HttpClientHttpRequester.cs rename to src/Ocelot/Requester/HttpClientHttpRequester.cs diff --git a/src/Ocelot.Library/Requester/IHttpRequester.cs b/src/Ocelot/Requester/IHttpRequester.cs similarity index 100% rename from src/Ocelot.Library/Requester/IHttpRequester.cs rename to src/Ocelot/Requester/IHttpRequester.cs diff --git a/src/Ocelot.Library/Requester/Middleware/HttpRequesterMiddleware.cs b/src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs similarity index 100% rename from src/Ocelot.Library/Requester/Middleware/HttpRequesterMiddleware.cs rename to src/Ocelot/Requester/Middleware/HttpRequesterMiddleware.cs diff --git a/src/Ocelot.Library/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs b/src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs rename to src/Ocelot/Requester/Middleware/HttpRequesterMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/Requester/UnableToCompleteRequestError.cs b/src/Ocelot/Requester/UnableToCompleteRequestError.cs similarity index 100% rename from src/Ocelot.Library/Requester/UnableToCompleteRequestError.cs rename to src/Ocelot/Requester/UnableToCompleteRequestError.cs diff --git a/src/Ocelot.Library/Responder/ErrorsToHttpStatusCodeMapper.cs b/src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs similarity index 100% rename from src/Ocelot.Library/Responder/ErrorsToHttpStatusCodeMapper.cs rename to src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs diff --git a/src/Ocelot.Library/Responder/HttpContextResponder.cs b/src/Ocelot/Responder/HttpContextResponder.cs similarity index 100% rename from src/Ocelot.Library/Responder/HttpContextResponder.cs rename to src/Ocelot/Responder/HttpContextResponder.cs diff --git a/src/Ocelot.Library/Responder/IErrorsToHttpStatusCodeMapper.cs b/src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs similarity index 100% rename from src/Ocelot.Library/Responder/IErrorsToHttpStatusCodeMapper.cs rename to src/Ocelot/Responder/IErrorsToHttpStatusCodeMapper.cs diff --git a/src/Ocelot.Library/Responder/IHttpResponder.cs b/src/Ocelot/Responder/IHttpResponder.cs similarity index 100% rename from src/Ocelot.Library/Responder/IHttpResponder.cs rename to src/Ocelot/Responder/IHttpResponder.cs diff --git a/src/Ocelot.Library/Responder/Middleware/HttpResponderMiddleware.cs b/src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs similarity index 100% rename from src/Ocelot.Library/Responder/Middleware/HttpResponderMiddleware.cs rename to src/Ocelot/Responder/Middleware/HttpResponderMiddleware.cs diff --git a/src/Ocelot.Library/Responder/Middleware/HttpResponderMiddlewareExtensions.cs b/src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs similarity index 100% rename from src/Ocelot.Library/Responder/Middleware/HttpResponderMiddlewareExtensions.cs rename to src/Ocelot/Responder/Middleware/HttpResponderMiddlewareExtensions.cs diff --git a/src/Ocelot.Library/Responses/ErrorResponse.cs b/src/Ocelot/Responses/ErrorResponse.cs similarity index 100% rename from src/Ocelot.Library/Responses/ErrorResponse.cs rename to src/Ocelot/Responses/ErrorResponse.cs diff --git a/src/Ocelot.Library/Responses/ErrorResponseGeneric.cs b/src/Ocelot/Responses/ErrorResponseGeneric.cs similarity index 100% rename from src/Ocelot.Library/Responses/ErrorResponseGeneric.cs rename to src/Ocelot/Responses/ErrorResponseGeneric.cs diff --git a/src/Ocelot.Library/Responses/OkResponse.cs b/src/Ocelot/Responses/OkResponse.cs similarity index 100% rename from src/Ocelot.Library/Responses/OkResponse.cs rename to src/Ocelot/Responses/OkResponse.cs diff --git a/src/Ocelot.Library/Responses/OkResponseGeneric.cs b/src/Ocelot/Responses/OkResponseGeneric.cs similarity index 100% rename from src/Ocelot.Library/Responses/OkResponseGeneric.cs rename to src/Ocelot/Responses/OkResponseGeneric.cs diff --git a/src/Ocelot.Library/Responses/Response.cs b/src/Ocelot/Responses/Response.cs similarity index 100% rename from src/Ocelot.Library/Responses/Response.cs rename to src/Ocelot/Responses/Response.cs diff --git a/src/Ocelot.Library/Responses/ResponseGeneric.cs b/src/Ocelot/Responses/ResponseGeneric.cs similarity index 100% rename from src/Ocelot.Library/Responses/ResponseGeneric.cs rename to src/Ocelot/Responses/ResponseGeneric.cs diff --git a/src/Ocelot.Library/ScopedData/CannotAddDataError.cs b/src/Ocelot/ScopedData/CannotAddDataError.cs similarity index 100% rename from src/Ocelot.Library/ScopedData/CannotAddDataError.cs rename to src/Ocelot/ScopedData/CannotAddDataError.cs diff --git a/src/Ocelot.Library/ScopedData/CannotFindDataError.cs b/src/Ocelot/ScopedData/CannotFindDataError.cs similarity index 100% rename from src/Ocelot.Library/ScopedData/CannotFindDataError.cs rename to src/Ocelot/ScopedData/CannotFindDataError.cs diff --git a/src/Ocelot.Library/ScopedData/IScopedRequestDataRepository.cs b/src/Ocelot/ScopedData/IScopedRequestDataRepository.cs similarity index 100% rename from src/Ocelot.Library/ScopedData/IScopedRequestDataRepository.cs rename to src/Ocelot/ScopedData/IScopedRequestDataRepository.cs diff --git a/src/Ocelot.Library/ScopedData/ScopedRequestDataRepository.cs b/src/Ocelot/ScopedData/ScopedRequestDataRepository.cs similarity index 100% rename from src/Ocelot.Library/ScopedData/ScopedRequestDataRepository.cs rename to src/Ocelot/ScopedData/ScopedRequestDataRepository.cs diff --git a/src/Ocelot/project.json b/src/Ocelot/project.json index 98c5d1e5..f57d8566 100644 --- a/src/Ocelot/project.json +++ b/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%" ] - } } +} diff --git a/test/Ocelot.AcceptanceTests/AuthenticationTests.cs b/test/Ocelot.AcceptanceTests/AuthenticationTests.cs index ee8c6a5c..ab202d70 100644 --- a/test/Ocelot.AcceptanceTests/AuthenticationTests.cs +++ b/test/Ocelot.AcceptanceTests/AuthenticationTests.cs @@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; +using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs b/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs index 33bbe648..44c79872 100644 --- a/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs +++ b/test/Ocelot.AcceptanceTests/ClaimsToHeadersForwardingTests.cs @@ -15,6 +15,7 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; using Ocelot.Library.Configuration.Yaml; +using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs b/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs index dafd69f1..43dbbdb2 100644 --- a/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs +++ b/test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Ocelot.Library.Configuration.Yaml; +using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.AcceptanceTests/RoutingTests.cs b/test/Ocelot.AcceptanceTests/RoutingTests.cs index 22accf7b..42b9fea5 100644 --- a/test/Ocelot.AcceptanceTests/RoutingTests.cs +++ b/test/Ocelot.AcceptanceTests/RoutingTests.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; +using Ocelot.ManualTest; using Shouldly; using TestStack.BDDfy; using Xunit; diff --git a/test/Ocelot.AcceptanceTests/project.json b/test/Ocelot.AcceptanceTests/project.json index e36303e4..56f49099 100644 --- a/test/Ocelot.AcceptanceTests/project.json +++ b/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", diff --git a/src/Ocelot.Library/Ocelot.Library.xproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.xproj similarity index 67% rename from src/Ocelot.Library/Ocelot.Library.xproj rename to test/Ocelot.ManualTest/Ocelot.ManualTest.xproj index d5f127c2..16a89a50 100644 --- a/src/Ocelot.Library/Ocelot.Library.xproj +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.xproj @@ -7,15 +7,19 @@ - d6df4206-0dba-41d8-884d-c3e08290fdbb - Ocelot.Library + 02bbf4c5-517e-4157-8d21-4b8b9e118b7a + Ocelot.ManualTest .\obj .\bin\ - v4.5 + v4.6.1 2.0 - + + + + + diff --git a/src/Ocelot/Program.cs b/test/Ocelot.ManualTest/Program.cs similarity index 93% rename from src/Ocelot/Program.cs rename to test/Ocelot.ManualTest/Program.cs index 1fdd2ad8..7b6b8535 100644 --- a/src/Ocelot/Program.cs +++ b/test/Ocelot.ManualTest/Program.cs @@ -1,7 +1,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; -namespace Ocelot +namespace Ocelot.ManualTest { public class Program { diff --git a/src/Ocelot/Properties/launchSettings.json b/test/Ocelot.ManualTest/Properties/launchSettings.json similarity index 76% rename from src/Ocelot/Properties/launchSettings.json rename to test/Ocelot.ManualTest/Properties/launchSettings.json index 7fc77fcd..e2e8ad9a 100644 --- a/src/Ocelot/Properties/launchSettings.json +++ b/test/Ocelot.ManualTest/Properties/launchSettings.json @@ -3,7 +3,7 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:1798/", + "applicationUrl": "http://localhost:24620/", "sslPort": 0 } }, @@ -11,15 +11,14 @@ "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" } diff --git a/src/Ocelot/Startup.cs b/test/Ocelot.ManualTest/Startup.cs similarity index 93% rename from src/Ocelot/Startup.cs rename to test/Ocelot.ManualTest/Startup.cs index ae9c59cd..c8d12f85 100644 --- a/src/Ocelot/Startup.cs +++ b/test/Ocelot.ManualTest/Startup.cs @@ -3,12 +3,11 @@ using Microsoft.AspNetCore.Hosting; 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) diff --git a/src/Ocelot/appsettings.json b/test/Ocelot.ManualTest/appsettings.json similarity index 100% rename from src/Ocelot/appsettings.json rename to test/Ocelot.ManualTest/appsettings.json diff --git a/src/Ocelot/configuration.yaml b/test/Ocelot.ManualTest/configuration.yaml similarity index 100% rename from src/Ocelot/configuration.yaml rename to test/Ocelot.ManualTest/configuration.yaml diff --git a/src/Ocelot.Library/project.json b/test/Ocelot.ManualTest/project.json similarity index 50% rename from src/Ocelot.Library/project.json rename to test/Ocelot.ManualTest/project.json index f57d8566..39425e9d 100644 --- a/src/Ocelot.Library/project.json +++ b/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%" ] + } } -} diff --git a/src/Ocelot/web.config b/test/Ocelot.ManualTest/web.config similarity index 100% rename from src/Ocelot/web.config rename to test/Ocelot.ManualTest/web.config diff --git a/test/Ocelot.UnitTests/project.json b/test/Ocelot.UnitTests/project.json index 4c8f0f4f..f747872f 100644 --- a/test/Ocelot.UnitTests/project.json +++ b/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",