Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit e6ba1f2

Browse files
committed
refactor of action descriptor pipeline
(cherry picked from commit 634f756e7fd303fc3022563fcd8fb9b1cb47fba2)
1 parent 172dcd1 commit e6ba1f2

23 files changed

+850
-259
lines changed

src/Microsoft.AspNet.Mvc.Core/Areas/ReflectedRouteConstraintsActionDescriptorProvider.cs

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/Microsoft.AspNet.Mvc.Core/DefaultControllerDescriptorFactory.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/Microsoft.AspNet.Mvc.Core/DefaultParameterDescriptorFactory.cs

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/Microsoft.AspNet.Mvc.Core/IControllerDescriptorFactory.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Microsoft.AspNet.Mvc.Core/IParameterDescriptorFactory.cs

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<Compile Include="ActionDescriptor.cs" />
2828
<Compile Include="ActionDescriptorProviderContext.cs" />
2929
<Compile Include="ActionDescriptorsCollection.cs" />
30+
<Compile Include="ReflectedModelBuilder\IReflectedApplicationModelConvention.cs" />
31+
<Compile Include="ReflectedModelBuilder\ReflectedActionModel.cs" />
32+
<Compile Include="ReflectedModelBuilder\ReflectedControllerModel.cs" />
33+
<Compile Include="ReflectedModelBuilder\ReflectedApplicationModel.cs" />
3034
<Compile Include="ActionInvokerFactory.cs" />
3135
<Compile Include="ActionInvokerProviderContext.cs" />
3236
<Compile Include="ActionMethodSelectorAttribute.cs" />
@@ -61,17 +65,15 @@
6165
<Compile Include="AntiForgery\ITokenValidator.cs" />
6266
<Compile Include="AntiForgery\TokenProvider.cs" />
6367
<Compile Include="Areas\AreaAttribute.cs" />
64-
<Compile Include="Areas\ReflectedRouteConstraintsActionDescriptorProvider.cs" />
6568
<Compile Include="BodyParameterInfo.cs" />
6669
<Compile Include="Controller.cs" />
6770
<Compile Include="ControllerDescriptor.cs" />
6871
<Compile Include="DefaultActionDescriptorsCollectionProvider.cs" />
6972
<Compile Include="DefaultActionDiscoveryConventions.cs" />
7073
<Compile Include="DefaultActionSelector.cs" />
7174
<Compile Include="DefaultControllerAssemblyProvider.cs" />
72-
<Compile Include="DefaultControllerDescriptorFactory.cs" />
7375
<Compile Include="DefaultControllerFactory.cs" />
74-
<Compile Include="DefaultParameterDescriptorFactory.cs" />
76+
<Compile Include="ReflectedModelBuilder\ReflectedParameterModel.cs" />
7577
<Compile Include="Extensions\IEnumerableExtensions.cs" />
7678
<Compile Include="Filters\FilterItemOrderComparer.cs" />
7779
<Compile Include="Filters\TypeFilterAttribute.cs" />
@@ -129,13 +131,11 @@
129131
<Compile Include="IActionResult.cs" />
130132
<Compile Include="IActionSelector.cs" />
131133
<Compile Include="IControllerAssemblyProvider.cs" />
132-
<Compile Include="IControllerDescriptorFactory.cs" />
133134
<Compile Include="IControllerFactory.cs" />
134135
<Compile Include="Injector.cs" />
135136
<Compile Include="Internal\PropertyHelper.cs" />
136137
<Compile Include="Internal\TypeHelper.cs" />
137138
<Compile Include="Internal\UTF8EncodingWithoutBOM.cs" />
138-
<Compile Include="IParameterDescriptorFactory.cs" />
139139
<Compile Include="IUrlHelper.cs" />
140140
<Compile Include="JsonOutputFormatter.cs" />
141141
<Compile Include="MvcOptions.cs" />
@@ -233,4 +233,4 @@
233233
<Compile Include="ViewDataDictionaryOfT.cs" />
234234
</ItemGroup>
235235
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
236-
</Project>
236+
</Project>

src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,21 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Collections.Generic;
56
using Microsoft.AspNet.Mvc.Core;
7+
using Microsoft.AspNet.Mvc.ReflectedModelBuilder;
68

79
namespace Microsoft.AspNet.Mvc
810
{
911
public class MvcOptions
1012
{
1113
private AntiForgeryOptions _antiForgeryOptions = new AntiForgeryOptions();
1214

15+
public MvcOptions()
16+
{
17+
ApplicationModelConventions = new List<IReflectedApplicationModelConvention>();
18+
}
19+
1320
public AntiForgeryOptions AntiForgeryOptions
1421
{
1522
get
@@ -29,5 +36,7 @@ public AntiForgeryOptions AntiForgeryOptions
2936
_antiForgeryOptions = value;
3037
}
3138
}
39+
40+
public List<IReflectedApplicationModelConvention> ApplicationModelConventions { get; private set; }
3241
}
3342
}

0 commit comments

Comments
 (0)