Use NuGet routing debug package (#17572)

Rick-Anderson · web-flow · commit fa4c1e7b6e2a · 2020-04-01T13:03:18.000-10:00
* Use NuGet routing debug package

* Use NuGet routing debug package

* Use NuGet routing debug package

* Use NuGet routing debug package
diff --git a/aspnetcore/fundamentals/routing.md b/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
@@ -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:
 
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/GadgetController.cs b/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
 {
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/HomeController.cs b/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
 {
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/ProductController.cs b/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
 {
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/TestController.cs b/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
 {
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Controllers/WidgetController.cs b/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
 {
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Extensions/ControllerContextExtensions.cs b/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/Extensions/ControllerContextExtensions.cs
diff --git a/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/RoutingSample.csproj b/aspnetcore/fundamentals/routing/samples/3.x/RoutingSample/RoutingSample.csproj
@@ -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>
diff --git a/aspnetcore/includes/MyDisplayRouteInfo.md b/aspnetcore/includes/MyDisplayRouteInfo.md
@@ -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.
diff --git a/aspnetcore/mvc/controllers/routing.md b/aspnetcore/mvc/controllers/routing.md
@@ -45,18 +45,17 @@ The route template `"{controller=Home}/{action=Index}/{id?}"`:
 * Matches a URL path like `/Products/Details/5`
 * Extracts the route values `{ controller = Products, action = Details, id = 5 }` by tokenizing the path. The extraction of route values results in a match if the app has a controller named `ProductsController` and a `Details` action:
 
-[!code-csharp[](routing/samples/3.x/main/Controllers/ProductsController.cs?name=snippetA)]
+  [!code-csharp[](routing/samples/3.x/main/Controllers/ProductsController.cs?name=snippetA)]
 
- The [MyDisplayRouteInfo](https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/mvc/controllers/routing/samples/3.x/main/Extensions/ControllerContextExtensions.cs) method is included in the [sample download](https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/mvc/controllers/routing/samples/3.x) and is used to display routing information.
+  [!INCLUDE[](~/includes/MyDisplayRouteInfo.md)]
 
-  * `/Products/Details/5` model binds the value of `id = 5` to set the `id` parameter to `5`. See [Model Binding](xref:mvc/models/model-binding) for more details.
+* `/Products/Details/5` model binds the value of `id = 5` to set the `id` parameter to `5`. See [Model Binding](xref:mvc/models/model-binding) for more details.
 * `{controller=Home}` defines `Home` as the default `controller`.
 * `{action=Index}` defines `Index` as the default `action`.
 *  The `?` character in `{id?}` defines `id` as optional.
   * Default and optional route parameters don't need to be present in the URL path for a match. See [Route Template Reference](xref:fundamentals/routing#route-template-reference) for a detailed description of route template syntax.
 * Matches the URL path `/`.
 * Produces the route values `{ controller = Home, action = Index }`.
-* The [MyDisplayRouteInfo](https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/mvc/controllers/routing/samples/3.x/main/Extensions/ControllerContextExtensions.cs) method is included in the [sample download](https://github.com/dotnet/AspNetCore.Docs/tree/master/aspnetcore/mvc/controllers/routing/samples/3.x) and is used to display routing information.
 
 The values for `controller` and `action` make use of the default values. `id` doesn't produce a value since there's no corresponding segment in the URL path. `/` only matches if there exists a `HomeController` and `Index` action:
 
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/BlogController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/BlogController.cs
@@ -1,4 +1,5 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/HomeController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/HomeController.cs
@@ -9,6 +9,7 @@
 #define Five
 
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyDemo2Controller.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyDemo2Controller.cs
@@ -1,6 +1,6 @@
 ﻿#define First
 using Microsoft.AspNetCore.Mvc;
-
+using Microsoft.Docs.Samples;
 
 namespace RoutingSample.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyDemo3Controller.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyDemo3Controller.cs
@@ -1,7 +1,8 @@
-﻿//#define MYDEMO4
+﻿//define MYDEMO4
 //#define MYDEMO3
 
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 // This uses same routes as HomeController, so only one can be defined without setting order
 // Test with                     webBuilder.UseStartup<StartupDefaultMVC>();
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyDemoController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyDemoController.cs
@@ -1,6 +1,7 @@
 ﻿#define MYDEMO
 
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 // This uses same routes as HomeController, and MyDemo3Controller so only one can be defined
 // Test with                     webBuilder.UseStartup<StartupAPI>();
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyProductsController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyProductsController.cs
@@ -1,5 +1,6 @@
 ﻿#define PROD1  
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyTestApiController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/MyTestApiController.cs
@@ -1,6 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Routing;
 using System;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/ProductsApiController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/ProductsApiController.cs
@@ -2,6 +2,7 @@
 #define PROD2
 
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/ProductsController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/ProductsController.cs
@@ -1,4 +1,5 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/SubscriptionManagementController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/SubscriptionManagementController.cs
@@ -1,4 +1,5 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 namespace WebMvcRouting.Controllers
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/Test2Controller.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/Test2Controller.cs
@@ -1,4 +1,5 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
 
 
 namespace WebMvcRouting.Controllers
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/UrlGeneration2Controller.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/UrlGeneration2Controller.cs
@@ -3,10 +3,12 @@
 
 // This is the ultimate greedy route
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
+
 namespace WebMvcRouting.Controllers
 {
-    #region snippet_1
-    #region snippet_2
+#region snippet_1
+#region snippet_2
     public class UrlGeneration2Controller : Controller
     {
         [HttpGet("")]
@@ -15,14 +17,14 @@ public IActionResult Source()
             var url = Url.RouteUrl("Destination_Route");
             return ControllerContext.MyDisplayRouteInfo("", $" URL = {url}");
         }
-        #endregion
+#endregion
 
         [HttpGet("custom/url/to/destination2", Name = "Destination_Route")]
         public IActionResult Destination()
         {
             return ControllerContext.MyDisplayRouteInfo();
         }
-        #endregion
+#endregion
     }
 }
 #endif
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/UrlGenerationAttrController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/UrlGenerationAttrController.cs
@@ -1,4 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
+
 #region snippet_1
 public class UrlGenerationAttrController : Controller
 {
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/UrlGenerationController.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Controllers/UrlGenerationController.cs
@@ -1,4 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc;
+using Microsoft.Docs.Samples;
+
 namespace WebMvcRouting.Controllers
 {
     #region snippet_1
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Extensions/ControllerContextExtensions.cs b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Extensions/ControllerContextExtensions.cs
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/Views/Shared/TestLinks.cshtml b/aspnetcore/mvc/controllers/routing/samples/3.x/main/Views/Shared/TestLinks.cshtml
@@ -36,7 +36,7 @@
             <a href-key="Products13 Index"></a>
         </li>
         <li>
-            <a href-key="MyTestApi"></a> &nbsp; ZZ
+            <a href-key="MyTestApi"></a> &nbsp;
             <a href-key="MyTestApiController"></a>
         </li>
         <li>
diff --git a/aspnetcore/mvc/controllers/routing/samples/3.x/main/WebMvcRouting.csproj b/aspnetcore/mvc/controllers/routing/samples/3.x/main/WebMvcRouting.csproj
@@ -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.*" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc;`
`2`		`-`
	`2`	`+using Microsoft.Docs.Samples;`
`3`	`3`
`4`	`4`	`namespace RoutingSample.Controllers`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc;`
`2`	`2`	`using Microsoft.AspNetCore.Routing;`
`3`		`-`
	`3`	`+using Microsoft.Docs.Samples;`
`4`	`4`
`5`	`5`	`namespace RoutingSample.Controllers`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.AspNetCore.Http;`
`2`	`2`	`using Microsoft.AspNetCore.Mvc;`
`3`		`-`
	`3`	`+using Microsoft.Docs.Samples;`
`4`	`4`
`5`	`5`	`namespace RoutingSample.Controllers`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`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.`