Merge pull request #17573 from dotnet/master

Master to live 2 April ?

Author: Rick-Anderson

aspnetcore/fundamentals/routing.md

@@ -5,7 +5,7 @@ description: Discover how ASP.NET Core routing is responsible for matching HTTP
 monikerRange: '>= aspnetcore-2.1'
 ms.author: riande
 ms.custom: mvc
-ms.date: 3/25/2020
+ms.date: 4/1/2020
 uid: fundamentals/routing
 ---
 # Routing in ASP.NET Core
@@ -217,7 +217,7 @@ The style of middleware shown with `Approach 1:` is **terminal middleware**. It'
 * The matching operation in the preceding sample is `Path == "/"` for the middleware and `Path == "/Movie"` for routing.
 * When a match is successful, it executes some functionality and returns, rather than invoking the `next` middleware.
 
-It's called terminal middleware middleware because it terminates the search, executes some functionality, and then returns.
+It's called terminal middleware because it terminates the search, executes some functionality, and then returns.
 
 Comparing a terminal middleware and routing:
 * Both approaches allow terminating the processing pipeline:
@@ -574,7 +574,7 @@ The preceding constraint is applied in the following code:
 
 [!code-csharp[](routing/samples/3.x/RoutingSample/Controllers/TestController.cs?name=snippet&highlight=6,13)]
 
-The [MyDisplayRouteInfo](https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Extensions/ControllerContextExtensions.cs) method is included in the [sample download](https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/fundamentals/routing/samples/3.x) and is used to display routing information.
+[!INCLUDE[](~/includes/MyDisplayRouteInfo.md)]
 
 The implementation of `MyCustomConstraint` prevents `0` being applied to a route parameter:
 

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/GadgetController.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-
+using Microsoft.Docs.Samples;
 
 namespace RoutingSample.Controllers
 {

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/HomeController.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-
+using Microsoft.Docs.Samples;
 
 namespace RoutingSample.Controllers
 {

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/ProductController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
-
+using Microsoft.Docs.Samples;
 
 namespace RoutingSample.Controllers
 {

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/TestController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-
+using Microsoft.Docs.Samples;
 
 namespace RoutingSample.Controllers
 {

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/WidgetController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
-
+using Microsoft.Docs.Samples;
 
 namespace RoutingSample.Controllers
 {

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Extensions/ControllerContextExtensions.cs

@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
+    <PackageReference Include="Rick.Docs.Samples.RouteInfo" Version="1.0.0*" />
   </ItemGroup>
-
+  
 </Project>

aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/RoutingSample.csproj

@@ -0,0 +1 @@
+[MyDisplayRouteInfo](https://github.com/Rick-Anderson/RouteInfo/blob/master/Microsoft.Docs.Samples.RouteInfo/ControllerContextExtensions.cs) is provided by the [Rick.Docs.Samples.RouteInfo](https://www.nuget.org/packages/Rick.Docs.Samples.RouteInfo) NuGet package and displays route information.

aspnetcore/includes/MyDisplayRouteInfo.md

@@ -1,4 +1,2 @@
-Support expected in version 8.6
-
-<!-- * [Visual Studio for Mac version 8.6 or later](https://visualstudio.microsoft.com/vs/mac/)
-* [!INCLUDE [.NET 5.0 SDK](~/includes/5.0-SDK.md)] -->
+* [Visual Studio for Mac version 8.6 or later](/visualstudio/releasenotes/vs2019-mac-preview-relnotes)
+* [!INCLUDE [.NET 5.0 SDK](~/includes/5.0-SDK.md)]