Updating to 2.1RC1

8 years ago · 80604062d9
12 changed files with 25 additions and 34 deletions
--- a/src/Infrastructure/Infrastructure.csproj
+++ b/src/Infrastructure/Infrastructure.csproj
@ -13,11 +13,6 @@
  <ItemGroup>
    <ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.2" />
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.2" />
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
-  </ItemGroup>
  <ItemGroup>
    <Folder Include="Data\Migrations\" />
  </ItemGroup>
--- a/src/Web/Program.cs
+++ b/src/Web/Program.cs
@ -13,7 +13,8 @@ namespace Microsoft.eShopWeb
    {
        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
            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>();
    }
 }
--- a/src/Web/Properties/launchSettings.json
+++ b/src/Web/Properties/launchSettings.json
@ -1,10 +1,10 @@
-{
+{
  "iisSettings": {
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
      "applicationUrl": "http://localhost:5106/",
-      "sslPort": 0
+      "sslPort": 44316
    }
  },
  "profiles": {
@ -16,7 +16,7 @@
      }
    },
    "eShopWeb": {
-      "commandName": "Project",
+      "commandName": "IISExpress",
      "launchBrowser": true,
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
@ -24,4 +24,4 @@
      "applicationUrl": "http://localhost:5106"
    }
  }
-}
+}
--- a/src/Web/Startup.cs
+++ b/src/Web/Startup.cs
@ -106,7 +106,8 @@ namespace Microsoft.eShopWeb
            // Add memory cache services
            services.AddMemoryCache();

-            services.AddMvc();
+            services.AddMvc()
+                .SetCompatibilityVersion(AspNetCore.Mvc.CompatibilityVersion.Version_2_1);

            _services = services;
        }
@ -125,8 +126,10 @@ namespace Microsoft.eShopWeb
            else
            {
                app.UseExceptionHandler("/Catalog/Error");
+                app.UseHsts();
            }

+            app.UseHttpsRedirection();
            app.UseStaticFiles();
            app.UseAuthentication();

--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@ -6,7 +6,7 @@

  <ItemGroup>
    <PackageReference Include="Dapper" Version="1.50.5" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0-rc1-final" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.0-rc1-final" PrivateAssets="All" />
    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.0-rc1-final" PrivateAssets="All" />
  </ItemGroup>
@ -18,12 +18,6 @@
    <ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />
    <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-  </ItemGroup>
  <ItemGroup>
    <None Include="wwwroot\images\products\1.png" />
    <None Include="wwwroot\images\products\10.png" />
--- a/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml
+++ b/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml
@ -1,5 +1,5 @@
@page
-@model LoginWithRecoveryCodeModel
+@model LoginWithRecoveryCodeModel 
@{
    ViewData["Title"] = "Recovery code verification";
 }
--- a/src/WebRazorPages/Pages/Account/LoginWithRecoveryCode.cshtml.cs
+++ b/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
    {
--- a/src/WebRazorPages/Program.cs
+++ b/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>();
    }
 }
--- a/src/WebRazorPages/Properties/launchSettings.json
+++ b/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/"
    }
  }
-}
+}
--- a/src/WebRazorPages/Startup.cs
+++ b/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();

--- a/src/WebRazorPages/WebRazorPages.csproj
+++ b/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" />
--- a/tests/UnitTests/UnitTests.csproj
+++ b/tests/UnitTests/UnitTests.csproj
@ -6,7 +6,6 @@
  
  <ItemGroup>
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0-rc1-final" />
-
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0-preview-20180510-03" />
    <PackageReference Include="Moq" Version="4.8.2" />
    <PackageReference Include="xunit" Version="2.4.0-beta.1.build3958" />