From 193467bbcf978e49f92cd51dabc940fe7f0d0ad7 Mon Sep 17 00:00:00 2001
From: Rick Anderson <riande@microsoft.com>
Date: Mon, 18 Dec 2017 20:02:41 -1000
Subject: [PATCH] Update live with current master (#5038)

* Restore MVC/EF to TOC (#5034)

* Fix legacy Web-API server (#5037)
---
 .../sample/server/ProductsApp/ProductsApp.csproj     |  7 -------
 aspnetcore/toc.md                                    | 12 ++++++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/aspnet/web-api/overview/advanced/calling-a-web-api-from-a-net-client/sample/server/ProductsApp/ProductsApp.csproj b/aspnet/web-api/overview/advanced/calling-a-web-api-from-a-net-client/sample/server/ProductsApp/ProductsApp.csproj
index d9f1a5664d..8fd9e62251 100644
--- a/aspnet/web-api/overview/advanced/calling-a-web-api-from-a-net-client/sample/server/ProductsApp/ProductsApp.csproj
+++ b/aspnet/web-api/overview/advanced/calling-a-web-api-from-a-net-client/sample/server/ProductsApp/ProductsApp.csproj
@@ -134,13 +134,6 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.5\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/aspnetcore/toc.md b/aspnetcore/toc.md
index 44a7f549fe..ca0efbdf7e 100644
--- a/aspnetcore/toc.md
+++ b/aspnetcore/toc.md
@@ -37,6 +37,18 @@
 ### [Updating related data](xref:data/ef-rp/update-related-data)
 ### [Handling concurrency conflicts](xref:data/ef-rp/concurrency)
 
+## [Data access - MVC with EF Core](data/ef-mvc/index.md)
+### [Getting started](data/ef-mvc/intro.md)
+### [Create, Read, Update, and Delete operations](data/ef-mvc/crud.md)
+### [Sorting, filtering, paging, and grouping](data/ef-mvc/sort-filter-page.md)
+### [Migrations](data/ef-mvc/migrations.md)
+### [Creating a complex data model](data/ef-mvc/complex-data-model.md)
+### [Reading related data](data/ef-mvc/read-related-data.md)
+### [Updating related data](data/ef-mvc/update-related-data.md)
+### [Handling concurrency conflicts](data/ef-mvc/concurrency.md)
+### [Inheritance](data/ef-mvc/inheritance.md)
+### [Advanced topics](data/ef-mvc/advanced.md)
+
 ## [Creating backend services for mobile apps](mobile/native-mobile-backend.md)
 ## [Building Web APIs](mvc/web-api/index.md)
 ## [Create a Web API](xref:tutorials/first-web-api-mac)