fix merge

dotnet · Jun 29, 2019 · 49a5ca9 · 49a5ca9
2 parents 9e28412 + 343d6e4
commit 49a5ca9
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
@@ -120,9 +120,8 @@ public void ConfigureServices(IServiceCollection services)
 #else
             services.AddControllersWithViews();
 #endif
-
-#if (Auth)
-            services.AddRazorPages();
+#if (OrganizationalAuth || IndividualAuth)
+           services.AddRazorPages();
 #endif
         }
 
@@ -143,11 +142,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
                 app.UseHsts();
             }
-
             app.UseHttpsRedirection();
 #else
             }
-
 #endif
             app.UseStaticFiles();
 
@@ -163,8 +160,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 endpoints.MapControllerRoute(
                     name: "default",
                     pattern: "{controller=Home}/{action=Index}/{id?}");
-
-#if (Auth)
+#if (OrganizationalAuth || IndividualAuth)
                 endpoints.MapRazorPages();
 #endif
             });