From 6a078ee09ee9107a2d58e4fbca1a3d03d6f15f35 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 7 May 2020 15:24:46 +0200
Subject: [PATCH] AB#6233 - reorderen routing

---
 src/Umbraco.Web.UI.NetCore/Startup.cs                    | 8 +++++---
 src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index fd3de321eb..f9266a9755 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -63,6 +63,7 @@ namespace Umbraco.Web.UI.BackOffice
             services.AddMvc(options =>
             {
                 options.Filters.Add<HttpResponseExceptionFilter>();
+
             }).SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
                 .AddNewtonsoftJson(options =>
                 {
@@ -114,15 +115,16 @@ namespace Umbraco.Web.UI.BackOffice
                     Action = "Default"
                 });
 
-                endpoints.MapControllerRoute(
-                    name: "default",
-                    pattern: "{controller}/{action=Index}/{id?}");
 
                 endpoints.MapControllerRoute("Install", "/install/{controller}/{Action}", defaults:new { Area = "Install"});
 
                 //TODO register routing correct: Name must be like this
                 endpoints.MapControllerRoute("umbraco-api-UmbracoInstall-InstallApi", "/install/api/{Action}", defaults:new { Area = "Install", Controller = "InstallApi"});
 
+                endpoints.MapControllerRoute(
+                    name: "default",
+                    pattern: "{controller}/{action=Index}/{id?}");
+
                 endpoints.MapGet("/", async context =>
                 {
                     var profilerHtml = app.ApplicationServices.GetRequiredService<IProfilerHtml>();
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 19c7608c9d..dbb9872dc1 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -48,7 +48,8 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
-      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+        <!-- TODO: remove the reference to System.Configuration.ConfigurationManager when Examine/lucene dont need it-->
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     </ItemGroup>
 
     <ItemGroup>