temporary fix for kobake#19

nicolaspierre1990 · Dec 19, 2018 · d052d42 · d052d42
1 parent 93554a1
commit d052d42
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 59 deletions.
diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/AspNetCore.RouteAnalyzer.SampleWebProject.csproj b/AspNetCore.RouteAnalyzer.SampleWebProject/AspNetCore.RouteAnalyzer.SampleWebProject.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
   </ItemGroup>
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Controllers/HelloController.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Controllers/HelloController.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace AspNetCore.RouteAnalyzer.SampleWebProject.Controllers
 {

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/About.cshtml.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/About.cshtml.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace AspNetCore.RouteAnalyzer.SampleWebProject.Pages
 {

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/Contact.cshtml.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/Contact.cshtml.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace AspNetCore.RouteAnalyzer.SampleWebProject.Pages
 {

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/Error.cshtml.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/Error.cshtml.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Diagnostics;
 
 namespace AspNetCore.RouteAnalyzer.SampleWebProject.Pages
 {

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/Index.cshtml.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Pages/Index.cshtml.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace AspNetCore.RouteAnalyzer.SampleWebProject.Pages
 {

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Program.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace AspNetCore.RouteAnalyzer.SampleWebProject
 {

diff --git a/AspNetCore.RouteAnalyzer.SampleWebProject/Startup.cs b/AspNetCore.RouteAnalyzer.SampleWebProject/Startup.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics;
@@ -23,7 +22,8 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddRouting();
             services.AddRouteAnalyzer();
         }
 
@@ -51,12 +51,14 @@ IRouteAnalyzer routeAnalyzer
 
             app.UseMvc(routes =>
             {
-                routes.MapRouteAnalyzer("/routes");
+                //routes.MapRouteAnalyzer("/routes", app.ApplicationServices);
                 routes.MapRoute(
                     name: "default",
                     template: "{controller}/{action=Index}/{id?}");
             });
 
+            app.MapRouteAnalyzer("/routes");
+
             // Lifetime events
             applicationLifetime.ApplicationStarted.Register(OnStarted);
             applicationLifetime.ApplicationStopping.Register(OnStopping);

diff --git a/AspNetCore.RouteAnalyzer/Controllers/RouteAnalyzer_MainController.cs b/AspNetCore.RouteAnalyzer/Controllers/RouteAnalyzer_MainController.cs
@@ -1,7 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace AspNetCore.RouteAnalyzer.Controllers
 {

diff --git a/AspNetCore.RouteAnalyzer/Extensions.cs b/AspNetCore.RouteAnalyzer/Extensions.cs
@@ -1,27 +1,47 @@
 using AspNetCore.RouteAnalyzer.Inner;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Threading.Tasks;
+using System.Linq;
+using System.Diagnostics;
 
 namespace AspNetCore.RouteAnalyzer
 {
     public static class RouteAnalyzerServiceCollectionExtensions
     {
         public static IServiceCollection AddRouteAnalyzer(this IServiceCollection services)
         {
-            services.AddSingleton<IRouteAnalyzer, RouteAnalyzer.Inner.RouteAnalyzerImpl>();
+            services.AddSingleton<IRouteAnalyzer, RouteAnalyzerImpl>();
             return services;
         }
     }
 
     public static class RouteAnalyzerRouteBuilderExtensions
     {
+        private static string AspNetCoreRouteAnalyzerRoute = "AspNetCore.RouteAnalyzer.Route";
         public static string RouteAnalyzerUrlPath { get; private set; } = "";
 
-        public static IRouteBuilder MapRouteAnalyzer(this IRouteBuilder routes, string routeAnalyzerUrlPath)
-        {
-            RouteAnalyzerUrlPath = routeAnalyzerUrlPath;
-            routes.Routes.Add(new Router(routes.DefaultHandler, routeAnalyzerUrlPath));
-            return routes;
+        public static IApplicationBuilder MapRouteAnalyzer(this IApplicationBuilder app,  string routeAnalyzerUrlPath)
+        {        
+            var aspnetCorErouteHandler = new RouteHandler(context =>
+            {
+                return Task.Run(() =>
+                {
+                    context.Response.Redirect("RouteAnalyzer_Main/ShowAllRoutes");
+                });
+            });
+
+            var routeBuilder = new RouteBuilder(app, aspnetCorErouteHandler);
+
+            routeBuilder.MapRoute(AspNetCoreRouteAnalyzerRoute, routeAnalyzerUrlPath);
+
+            var routes = routeBuilder.Build();
+            app.UseRouter(routes);
+
+            return app;
         }
     }
 }
diff --git a/AspNetCore.RouteAnalyzer/IRouteAnalyzer.cs b/AspNetCore.RouteAnalyzer/IRouteAnalyzer.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace AspNetCore.RouteAnalyzer
 {

diff --git a/AspNetCore.RouteAnalyzer/Inner/Router.cs b/AspNetCore.RouteAnalyzer/Inner/Router.cs
@@ -1,7 +1,4 @@
 using Microsoft.AspNetCore.Routing;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace AspNetCore.RouteAnalyzer.Inner