Conflicts: Mvc.sln src/Microsoft.AspNet.Mvc.Core/Formatters/TempInputFormatterProvider.cs src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvokerProvider.cs src/Microsoft.AspNet.Mvc/MvcServices.cs test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs Conflicts: src/Microsoft.AspNet.Mvc.Core/Formatters/TempInputFormatterProvider.cs |
||
|---|---|---|
| .. | ||
| CompositeViewEngineTest.cs | ||
| DefaultDisplayTemplatesTests.cs | ||
| DefaultEditorTemplatesTests.cs | ||
| DefaultTemplatesUtilities.cs | ||
| HtmlAttributePropertyHelperTest.cs | ||
| HtmlHelperDisplayNameExtensionsTest.cs | ||
| HtmlHelperDisplayTextTest.cs | ||
| HtmlHelperLabelExtensionsTest.cs | ||
| HtmlHelperNameExtensionsTest.cs | ||
| HtmlHelperValueExtensionsTest.cs | ||
| ViewContextTests.cs | ||
| ViewDataOfTTest.cs | ||