Conflicts: src/Microsoft.AspNet.Mvc.Common/Encodings.cs src/Microsoft.AspNet.Mvc.Core/Formatters/JsonOutputFormatter.cs src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectContentResultTests.cs test/Microsoft.AspNet.Mvc.Test/MvcOptionSetupTest.cs |
||
|---|---|---|
| .. | ||
| compiler/resources | ||
| ActivatorTests.cs | ||
| BasicTests.cs | ||
| CompositeViewEngineTests.cs | ||
| DependencyResolverTests.cs | ||
| HttpResponseHelpers.cs | ||
| InlineConstraintTests.cs | ||
| InputFormatterTests.cs | ||
| Microsoft.AspNet.Mvc.FunctionalTests.kproj | ||
| ResourceHelpers.cs | ||
| RoutingTests.cs | ||
| TestApplicationEnvironment.cs | ||
| TestAssemblyProvider.cs | ||
| TestConfigurationProvider.cs | ||
| TestHelper.cs | ||
| ValueProviderTests.cs | ||
| ViewEngineTests.cs | ||
| project.json | ||