Ported MusicStore sample (#326)

ivaylokenov · ivaylokenov · commit 55e7a6d813de · 2019-08-28T15:44:37.000+03:00
diff --git a/samples/MusicStore/MusicStore.Test/Mocks/SignInManagerMock.cs b/samples/MusicStore/MusicStore.Test/Mocks/SignInManagerMock.cs
@@ -20,8 +20,9 @@ public SignInManagerMock(
             IUserClaimsPrincipalFactory<ApplicationUser> claimsFactory, 
             IOptions<IdentityOptions> optionsAccessor, 
             ILogger<SignInManager<ApplicationUser>> logger, 
-            IAuthenticationSchemeProvider schemes)
-            : base(userManager, contextAccessor, claimsFactory, optionsAccessor, logger, schemes)
+            IAuthenticationSchemeProvider schemes,
+            IUserConfirmation<ApplicationUser> confirmation)
+            : base(userManager, contextAccessor, claimsFactory, optionsAccessor, logger, schemes, confirmation)
         {
         }
 
diff --git a/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj b/samples/MusicStore/MusicStore.Test/MusicStore.Test.csproj
@@ -1,13 +1,12 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0-*" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
diff --git a/samples/MusicStore/MusicStore.Test/TestStartup.cs b/samples/MusicStore/MusicStore.Test/TestStartup.cs
@@ -9,7 +9,7 @@
 
     public class TestStartup : Startup
     {
-        public TestStartup(IHostingEnvironment env)
+        public TestStartup(IWebHostEnvironment env)
             : base(env)
         {
         }
diff --git a/samples/MusicStore/MusicStore.Web/Controllers/AccountController.cs b/samples/MusicStore/MusicStore.Web/Controllers/AccountController.cs
@@ -458,7 +458,7 @@ public async Task<ActionResult> LogOff()
 
             // TODO: Currently SignInManager.SignOut does not sign out OpenIdc and does not have a way to pass in a specific
             // AuthType to sign out.
-            var appEnv = HttpContext.RequestServices.GetService<IHostingEnvironment>();
+            var appEnv = HttpContext.RequestServices.GetService<IWebHostEnvironment>();
             if (appEnv.EnvironmentName.StartsWith("OpenIdConnect"))
             {
                 return new SignOutResult("OpenIdConnect", new AuthenticationProperties
diff --git a/samples/MusicStore/MusicStore.Web/Models/SampleData.cs b/samples/MusicStore/MusicStore.Web/Models/SampleData.cs
@@ -78,7 +78,7 @@ private static async Task AddOrUpdateAsync<TEntity>(
         /// <returns></returns>
         private static async Task CreateAdminUser(IServiceProvider serviceProvider)
         {
-            var env = serviceProvider.GetService<IHostingEnvironment>();
+            var env = serviceProvider.GetService<IWebHostEnvironment>();
 
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
diff --git a/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj b/samples/MusicStore/MusicStore.Web/MusicStore.Web.csproj
@@ -1,27 +1,23 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-MusicStore.Web-B1796332-CD47-4D99-85BC-7F98EA978F33</UserSecretsId>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <RootNamespace>MusicStore</RootNamespace>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.*" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="2.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="2.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.*" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.*" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.2.*" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-*" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MusicStore/MusicStore.Web/Startup.cs b/samples/MusicStore/MusicStore.Web/Startup.cs
@@ -15,7 +15,7 @@
 
     public class Startup
     {
-        public Startup(IHostingEnvironment hostingEnvironment)
+        public Startup(IWebHostEnvironment hostingEnvironment)
         {
             // Below code demonstrates usage of multiple configuration sources. For instance a setting say 'setting1'
             // is found in both the registered sources, then the later source will win. By this way a Local config
@@ -57,7 +57,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddLogging();
 
             // Add MVC services to the services container
-            services.AddMvc();
+            services.AddMvc(options => options.EnableEndpointRouting = false);
 
             // Add memory cache services
             services.AddMemoryCache();

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,9 @@ public SignInManagerMock(`
`20`	`20`	`IUserClaimsPrincipalFactory<ApplicationUser> claimsFactory,`
`21`	`21`	`IOptions<IdentityOptions> optionsAccessor,`
`22`	`22`	`ILogger<SignInManager<ApplicationUser>> logger,`
`23`		`- IAuthenticationSchemeProvider schemes)`
`24`		`- : base(userManager, contextAccessor, claimsFactory, optionsAccessor, logger, schemes)`
	`23`	`+ IAuthenticationSchemeProvider schemes,`
	`24`	`+ IUserConfirmation<ApplicationUser> confirmation)`
	`25`	`+ : base(userManager, contextAccessor, claimsFactory, optionsAccessor, logger, schemes, confirmation)`
`25`	`26`	`{`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`public class TestStartup : Startup`
`11`	`11`	`{`
`12`		`- public TestStartup(IHostingEnvironment env)`
	`12`	`+ public TestStartup(IWebHostEnvironment env)`
`13`	`13`	`: base(env)`
`14`	`14`	`{`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ public async Task<ActionResult> LogOff()`
`458`	`458`
`459`	`459`	`// TODO: Currently SignInManager.SignOut does not sign out OpenIdc and does not have a way to pass in a specific`
`460`	`460`	`// AuthType to sign out.`
`461`		`- var appEnv = HttpContext.RequestServices.GetService<IHostingEnvironment>();`
	`461`	`+ var appEnv = HttpContext.RequestServices.GetService<IWebHostEnvironment>();`
`462`	`462`	`if (appEnv.EnvironmentName.StartsWith("OpenIdConnect"))`
`463`	`463`	`{`
`464`	`464`	`return new SignOutResult("OpenIdConnect", new AuthenticationProperties`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private static async Task AddOrUpdateAsync<TEntity>(`
`78`	`78`	`/// <returns></returns>`
`79`	`79`	`private static async Task CreateAdminUser(IServiceProvider serviceProvider)`
`80`	`80`	`{`
`81`		`- var env = serviceProvider.GetService<IHostingEnvironment>();`
	`81`	`+ var env = serviceProvider.GetService<IWebHostEnvironment>();`
`82`	`82`
`83`	`83`	`var builder = new ConfigurationBuilder()`
`84`	`84`	`.SetBasePath(env.ContentRootPath)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`public class Startup`
`17`	`17`	`{`
`18`		`- public Startup(IHostingEnvironment hostingEnvironment)`
	`18`	`+ public Startup(IWebHostEnvironment hostingEnvironment)`
`19`	`19`	`{`
`20`	`20`	`// Below code demonstrates usage of multiple configuration sources. For instance a setting say 'setting1'`
`21`	`21`	`// is found in both the registered sources, then the later source will win. By this way a Local config`
`@@ -57,7 +57,7 @@ public void ConfigureServices(IServiceCollection services)`
`57`	`57`	`services.AddLogging();`
`58`	`58`
`59`	`59`	`// Add MVC services to the services container`
`60`		`- services.AddMvc();`
	`60`	`+ services.AddMvc(options => options.EnableEndpointRouting = false);`
`61`	`61`
`62`	`62`	`// Add memory cache services`
`63`	`63`	`services.AddMemoryCache();`