Modify BuilderExtensions.UseMvc to not add any routes by default

Fixes #1879

samples/MvcSample.Web/Startup.cs

@@ -2,12 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.IO;
 using System.Security.Claims;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Razor;
-using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Security;
 using Microsoft.Framework.ConfigurationModel;
 using Microsoft.Framework.DependencyInjection;

samples/TagHelperSample.Web/Startup.cs

@@ -26,7 +26,12 @@ namespace TagHelperSample.Web
                     options.AddXmlDataContractSerializerFormatter();
                 });
             });
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/RouteBuilderExtensions.cs

@@ -3,9 +3,10 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc.WebApiCompatShim;
+using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Constraints;
 
-namespace Microsoft.AspNet.Routing
+namespace Microsoft.AspNet.Builder
 {
     public static class RouteBuilderExtensions
     {

src/Microsoft.AspNet.Mvc/BuilderExtensions.cs

@@ -9,20 +9,31 @@ using Microsoft.AspNet.Routing;
 
 namespace Microsoft.AspNet.Builder
 {
+    /// <summary>
+    /// Extension methods for <see cref="IApplicationBuilder"/> to add Mvc to the request execution pipeline.
+    /// </summary>
     public static class BuilderExtensions
     {
+        /// <summary>
+        /// Adds Mvc to the <see cref="IApplicationBuilder"/> request execution pipeline.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
+        /// <returns>The <paramref name="app"/>.</returns>
+        /// <remarks>This method only supports attribute routing. To add conventional routes use
+        /// <see cref="UseMvc(IApplicationBuilder, Action{IRouteBuilder})"/>.</remarks>
         public static IApplicationBuilder UseMvc([NotNull] this IApplicationBuilder app)
         {
             return app.UseMvc(routes =>
             {
-                // Action style actions
-                routes.MapRoute(null, "{controller}/{action}/{id?}", new { controller = "Home", action = "Index" });
-
-                // Rest style actions
-                routes.MapRoute(null, "{controller}/{id?}");
             });
         }
 
+        /// <summary>
+        /// Adds Mvc to the <see cref="IApplicationBuilder"/> request execution pipeline.
+        /// </summary>
+        /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
+        /// <param name="configureRoutes">A callback to configure Mvc routes.</param>
+        /// <returns>The <paramref name="app"/>.</returns>
         public static IApplicationBuilder UseMvc(
             [NotNull] this IApplicationBuilder app,
             [NotNull] Action<IRouteBuilder> configureRoutes)

test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;

test/WebSites/ActionConstraintsWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ActionConstraintsWebSite

test/WebSites/ActionResultsWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ActionResultsWebSite

test/WebSites/ActivatorWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ActivatorWebSite

test/WebSites/AddServicesWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 
 namespace AddServicesWebSite
 {

test/WebSites/AntiForgeryWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace AntiForgeryWebSite

test/WebSites/ApiExplorerWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ApiExplorerWebSite

test/WebSites/ApplicationModelWebSite/Startup.cs

@@ -17,7 +17,12 @@ namespace ApplicationModelWebSite
                 services.AddMvc(configuration);
             });
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller}/{action}/{id?}");
+            });
         }
     }
 }

test/WebSites/AutofacWebSite/Startup.cs

@@ -4,7 +4,6 @@
 using System;
 using Autofac;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.DependencyInjection.Autofac;
 

test/WebSites/BasicWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace BasicWebSite

test/WebSites/CompositeViewEngineWebSite/Startup.cs

@@ -25,7 +25,12 @@ namespace CompositeViewEngineWebSite
             });
 
             // Add MVC to the request pipeline
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/ConnegWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace ConnegWebSite

test/WebSites/CustomRouteWebSite/LocalizedRoute.cs

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Routing;
 
 namespace CustomRouteWebSite
 {

test/WebSites/CustomRouteWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace CustomRouteWebSite

test/WebSites/FilesWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace FilesWebSite

test/WebSites/FiltersWebSite/Startup.cs

@@ -50,7 +50,12 @@ namespace FiltersWebSite
 
             app.UseMiddleware<AuthorizeBasicMiddleware>();
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/FormatterWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace FormatterWebSite

test/WebSites/InlineConstraintsWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Constraints;
 using Microsoft.Framework.DependencyInjection;
 

test/WebSites/LoggingWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace LoggingWebSite

test/WebSites/ModelBindingWebSite/Startup.cs

@@ -37,7 +37,12 @@ namespace ModelBindingWebSite
             app.UseErrorReporter();
 
             // Add MVC to the request pipeline
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/MvcTagHelpersWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace MvcTagHelpersWebSite

test/WebSites/PrecompilationWebSite/Startup.cs

@@ -17,7 +17,12 @@ namespace PrecompilationWebSite
                 services.AddMvc(configuration);
             });
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/RazorInstrumentationWebsite/Startup.cs

@@ -36,7 +36,12 @@ namespace RazorInstrumentationWebSite
             });
 
             // Add MVC to the request pipeline
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/RazorViewEngineOptionsWebsite/Startup.cs

@@ -1,13 +1,11 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.IO;
 using System.Reflection;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.Framework.DependencyInjection;
-using Microsoft.AspNet.Routing;
 
 namespace RazorViewEngineOptionsWebsite
 {

test/WebSites/RazorWebSite/Startup.cs

@@ -31,7 +31,12 @@ namespace RazorWebSite
             });
 
             // Add MVC to the request pipeline
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/RequestServicesWebSite/Startup.cs

@@ -22,7 +22,12 @@ namespace RequestServicesWebSite
             // Initializes the RequestId service for each request
             app.UseMiddleware<RequestIdMiddleware>();
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/ResponseCacheWebSite/Startup.cs

@@ -17,7 +17,12 @@ namespace ResponseCacheWebSite
                 services.AddMvc(configuration);
             });
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/RoutingWebSite/Startup.cs

@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace RoutingWebSite

test/WebSites/TagHelpersWebSite/Startup.cs

@@ -17,7 +17,12 @@ namespace TagHelpersWebSite
                 services.AddMvc(configuration);
             });
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/UrlHelperWebSite/Startup.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Routing;
 using Microsoft.Framework.DependencyInjection;
 
 namespace UrlHelperWebSite

test/WebSites/ValueProvidersWebSite/Startup.cs

@@ -25,7 +25,12 @@ namespace ValueProvidersWebSite
             });
 
             // Add MVC to the request pipeline
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/VersioningWebSite/Startup.cs

@@ -19,7 +19,12 @@ namespace VersioningWebSite
                 services.AddScoped<TestResponseGenerator>();
             });
 
-            app.UseMvc();
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }

test/WebSites/ViewComponentWebSite/Startup.cs

@@ -15,7 +15,13 @@ namespace ViewComponentWebSite
             {
                 services.AddMvc(configuration);
             });
-            app.UseMvc();
+
+            app.UseMvc(routes =>
+            {
+                routes.MapRoute(
+                    name: "default",
+                    template: "{controller=Home}/{action=Index}/{id?}");
+            });
         }
     }
 }