Move interfaces around
- Moved IServerFactory to Microsoft.AspNet.Server.Interfaces - Moved IHttpContextAccessor to Microsoft.AspNet.Hosting.Interfaces - Fixed dependencies so that they are minimal #172
This commit is contained in:
David Fowler
parent
fd9f845dc9
commit
04e5a558ab
15
Hosting.sln
15
Hosting.sln
|
|
@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
|
|||
EndProject
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Interfaces", "src\Microsoft.AspNet.Hosting.Interfaces\Microsoft.AspNet.Hosting.Interfaces.xproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
|
||||
EndProject
|
||||
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Interfaces", "src\Microsoft.AspNet.Server.Interfaces\Microsoft.AspNet.Server.Interfaces.xproj", "{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -84,6 +86,18 @@ Global
|
|||
{BB780FBB-7842-4759-8DE7-96FA2E5571C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BB780FBB-7842-4759-8DE7-96FA2E5571C1}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{BB780FBB-7842-4759-8DE7-96FA2E5571C1}.Release|x86.Build.0 = Release|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -94,5 +108,6 @@ Global
|
|||
{3944F036-7E75-47E8-AA52-C4B89A64EC3A} = {E0497F39-AFFB-4819-A116-E39E361915AB}
|
||||
{D4F18D58-52B1-435D-A012-10F2CDF158C4} = {FEB39027-9158-4DE2-997F-7ADAEF8188D0}
|
||||
{BB780FBB-7842-4759-8DE7-96FA2E5571C1} = {E0497F39-AFFB-4819-A116-E39E361915AB}
|
||||
{3DCD2CB4-0E15-4BB5-9A24-091E00694DCF} = {E0497F39-AFFB-4819-A116-E39E361915AB}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ using Microsoft.AspNet.Http;
|
|||
|
||||
namespace Microsoft.AspNet.Hosting
|
||||
{
|
||||
// REVIEW: move to interfaces
|
||||
public interface IHttpContextAccessor
|
||||
{
|
||||
HttpContext HttpContext { get; set; }
|
||||
|
|
@ -2,9 +2,7 @@
|
|||
"version": "1.0.0-*",
|
||||
"dependencies": {
|
||||
"Microsoft.AspNet.Http": "1.0.0-*",
|
||||
"Microsoft.AspNet.FeatureModel": "1.0.0-*",
|
||||
"Microsoft.AspNet.FileProviders.Interfaces": "1.0.0-*",
|
||||
"Microsoft.Framework.ConfigurationModel": "1.0.0-*",
|
||||
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }
|
||||
},
|
||||
"frameworks": {
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@ namespace Microsoft.AspNet.Hosting
|
|||
|
||||
// Start/ApplicationServices block use methods
|
||||
private bool _useDisabled;
|
||||
|
||||
private IServerLoader _serverLoader;
|
||||
|
||||
private IApplicationBuilderFactory _builderFactory;
|
||||
private IApplicationBuilder _builder;
|
||||
private IServiceProvider _applicationServices;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{
|
||||
"version": "1.0.0-*",
|
||||
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
|
||||
"compilationOptions": { "warningsAsErrors": "true" },
|
||||
"dependencies": {
|
||||
"Microsoft.AspNet.Hosting.Interfaces": "1.0.0-*",
|
||||
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
|
||||
"Microsoft.AspNet.FileProviders": "1.0.0-*",
|
||||
"Microsoft.AspNet.Server.Interfaces": "1.0.0-*",
|
||||
"Microsoft.AspNet.Hosting.Interfaces": "1.0.0-*",
|
||||
"Microsoft.AspNet.Http.Core": "1.0.0-*",
|
||||
"Microsoft.AspNet.Http.Extensions": "1.0.0-*",
|
||||
"Microsoft.Framework.Logging": "1.0.0-*",
|
||||
"Microsoft.Framework.ConfigurationModel": "1.0.0-*",
|
||||
"Microsoft.Framework.DependencyInjection": "1.0.0-*",
|
||||
"Microsoft.Framework.Logging": "1.0.0-*",
|
||||
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*",
|
||||
"Newtonsoft.Json": "6.0.6"
|
||||
},
|
||||
"frameworks": {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
<?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)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>3dcd2cb4-0e15-4bb5-9a24-091e00694dcf</ProjectGuid>
|
||||
<RootNamespace>Microsoft.AspNet.Server.Interfaces</RootNamespace>
|
||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"version": "1.0.0-*",
|
||||
"dependencies": {
|
||||
"Microsoft.AspNet.Http": "1.0.0-*",
|
||||
"Microsoft.Framework.ConfigurationModel.Interfaces": "1.0.0-*",
|
||||
"Microsoft.AspNet.FeatureModel": "1.0.0-*"
|
||||
},
|
||||
|
||||
"frameworks": {
|
||||
"dnx451": { },
|
||||
"dnxcore50": { }
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue