Adding Functional Tests Conflicts: src/Microsoft.AspNet.Mvc.Core/Formatters/OutputFormatter.cs src/Microsoft.AspNet.Mvc.Core/Resources.resx src/Microsoft.AspNet.Mvc.HeaderValueAbstractions/project.json test/Microsoft.AspNet.Mvc.FunctionalTests/project.json Adding Resources + tests Conflicts: src/Microsoft.AspNet.Mvc.Core/Properties/Resources.Designer.cs src/Microsoft.AspNet.Mvc.Core/Resources.resx Adding produces content Attribute Conflicts: src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj Conflicts: src/Microsoft.AspNet.Mvc.Core/Microsoft.AspNet.Mvc.Core.kproj test/Microsoft.AspNet.Mvc.Core.Test/Microsoft.AspNet.Mvc.Core.Test.kproj |
||
|---|---|---|
| .. | ||
| compiler/resources | ||
| ActivatorTests.cs | ||
| BasicTests.cs | ||
| CompositeViewEngineTests.cs | ||
| ConnegTests.cs | ||
| DependencyResolverTests.cs | ||
| HttpResponseHelpers.cs | ||
| InlineConstraintTests.cs | ||
| InputFormatterTests.cs | ||
| Microsoft.AspNet.Mvc.FunctionalTests.kproj | ||
| NullLoggerFactory.cs | ||
| ResourceHelpers.cs | ||
| RoutingTests.cs | ||
| TestApplicationEnvironment.cs | ||
| TestAssemblyProvider.cs | ||
| TestConfigurationProvider.cs | ||
| TestHelper.cs | ||
| ValueProviderTests.cs | ||
| ViewEngineTests.cs | ||
| project.json | ||