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 |
||
|---|---|---|
| .. | ||
| App_Data | ||
| Areas/Travel | ||
| Components | ||
| Content | ||
| Filters | ||
| Models | ||
| Monitoring | ||
| Services | ||
| Views | ||
| FiltersController.cs | ||
| Home2Controller.cs | ||
| HomeController.cs | ||
| LinkController.cs | ||
| MvcSample.Web.kproj | ||
| OverloadController.cs | ||
| SimplePocoController.cs | ||
| SimpleRest.cs | ||
| Startup.cs | ||
| ViewMetadata.cs | ||
| project.json | ||
| web.Debug.config | ||
| web.Release.config | ||
| web.config | ||