Updating to 2.1RC1

src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml

@@ -1,5 +1,5 @@
 @page
-@model LoginWithRecoveryCodeModel
+@model LoginWithRecoveryCodeModel 
 @{
     ViewData["Title"] = "Recovery code verification";
 }

src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml.cs

@@ -7,7 +7,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.RazorPages.Pages.Account.Manage
+namespace Microsoft.eShopWeb.RazorPages.Pages.Account
 {
     public class LoginWithRecoveryCodeModel : PageModel
     {

src/WebRazorPages/Program.cs

@@ -13,7 +13,8 @@ namespace Microsoft.eShopWeb.RazorPages
     {
         public static void Main(string[] args)
         {
-            var host = BuildWebHost(args);
+            var host = CreateWebHostBuilder(args)
+                        .Build();
 
             using (var scope = host.Services.CreateScope())
             {
@@ -38,10 +39,9 @@ namespace Microsoft.eShopWeb.RazorPages
             host.Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseUrls("http://0.0.0.0:5106")
-                .UseStartup<Startup>()
-                .Build();
+                .UseStartup<Startup>();
     }
 }

src/WebRazorPages/Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:28655/",
-      "sslPort": 0
+      "sslPort": 44305
     }
   },
   "profiles": {
@@ -24,4 +24,4 @@
       "applicationUrl": "http://localhost:28656/"
     }
   }
-}
+}

src/WebRazorPages/Startup.cs

@@ -107,6 +107,7 @@ namespace Microsoft.eShopWeb.RazorPages
             services.AddMemoryCache();
 
             services.AddMvc()
+                .SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1)
                 .AddRazorPagesOptions(options =>
                 {
                     options.Conventions.AuthorizeFolder("/Order");
@@ -130,8 +131,10 @@ namespace Microsoft.eShopWeb.RazorPages
             else
             {
                 app.UseExceptionHandler("/Catalog/Error");
+                app.UseHsts();
             }
 
+            app.UseHttpsRedirection();
             app.UseStaticFiles();
             app.UseAuthentication();
 

src/WebRazorPages/WebRazorPages.csproj

@@ -5,10 +5,7 @@
     <AssemblyName>Microsoft.eShopWeb.RazorPages</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" />
-  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />