diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index 1b49a243bd..62e2f6dc7b 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -59,7 +59,7 @@ namespace MusicStore // Add Identity services to the services container services.AddIdentity(options => { - options.ApplicationCookie.AccessDeniedPath = new PathString("/Home/AccessDenied"); + options.Cookies.ApplicationCookie.AccessDeniedPath = new PathString("/Home/AccessDenied"); }) .AddEntityFrameworkStores() .AddDefaultTokenProviders(); diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index 2d6679f633..9de5aa8666 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -73,7 +73,7 @@ namespace MusicStore .AddEntityFrameworkStores() .AddDefaultTokenProviders(); - services.ConfigureOpenIdConnectAuthentication(options => + services.AddOpenIdConnectAuthentication(options => { options.Authority = "https://login.windows.net/[tenantName].onmicrosoft.com"; options.ClientId = "[ClientId]"; diff --git a/src/MusicStore/Views/Home/Index.cshtml b/src/MusicStore/Views/Home/Index.cshtml index 6225876b9e..2216fbbb3b 100644 --- a/src/MusicStore/Views/Home/Index.cshtml +++ b/src/MusicStore/Views/Home/Index.cshtml @@ -4,7 +4,7 @@ }
-

@AppSettings.Options.SiteTitle

+

@AppSettings.Value.SiteTitle

diff --git a/src/MusicStore/Views/Shared/_Layout.cshtml b/src/MusicStore/Views/Shared/_Layout.cshtml index 52ffb26d0c..f286ed504c 100644 --- a/src/MusicStore/Views/Shared/_Layout.cshtml +++ b/src/MusicStore/Views/Shared/_Layout.cshtml @@ -4,7 +4,7 @@ - @ViewBag.Title – @AppSettings.Options.SiteTitle + @ViewBag.Title – @AppSettings.Value.SiteTitle @@ -33,7 +33,7 @@ - @AppSettings.Options.SiteTitle + @AppSettings.Value.SiteTitle
    diff --git a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs index 2beeb92ac4..38d05ae035 100644 --- a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs +++ b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookNotifications.cs @@ -36,7 +36,7 @@ namespace MusicStore.Mocks.Facebook internal static async Task OnReturnEndpoint(OAuthReturnEndpointContext context) { - if (context.Principal != null && context.SignInScheme == IdentityOptions.ExternalCookieAuthenticationScheme) + if (context.Principal != null && context.SignInScheme == IdentityCookieOptions.ExternalCookieAuthenticationScheme) { //This way we will know all notifications were fired. var identity = context.Principal.Identities.First(); diff --git a/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs index ceca1473a0..a1d4406617 100644 --- a/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs +++ b/test/E2ETests/compiler/shared/Mocks/Google/GoogleNotifications.cs @@ -35,7 +35,7 @@ namespace MusicStore.Mocks.Google internal static async Task OnReturnEndpoint(OAuthReturnEndpointContext context) { - if (context.Principal != null && context.SignInScheme == IdentityOptions.ExternalCookieAuthenticationScheme) + if (context.Principal != null && context.SignInScheme == IdentityCookieOptions.ExternalCookieAuthenticationScheme) { //This way we will know all notifications were fired. var identity = context.Principal.Identities.First(); diff --git a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs index 7cec2fb475..514a6adb0a 100644 --- a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs +++ b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountNotifications.cs @@ -36,7 +36,7 @@ namespace MusicStore.Mocks.MicrosoftAccount internal static async Task OnReturnEndpoint(OAuthReturnEndpointContext context) { - if (context.Principal != null && context.SignInScheme == IdentityOptions.ExternalCookieAuthenticationScheme) + if (context.Principal != null && context.SignInScheme == IdentityCookieOptions.ExternalCookieAuthenticationScheme) { //This way we will know all notifications were fired. var identity = context.Principal.Identities.First(); diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs index fb250cb421..a0bf934734 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -65,7 +65,7 @@ namespace MusicStore .AddEntityFrameworkStores() .AddDefaultTokenProviders(); - services.ConfigureOpenIdConnectAuthentication(options => + services.AddOpenIdConnectAuthentication(options => { options.Authority = "https://login.windows.net/[tenantName].onmicrosoft.com"; options.ClientId = "c99497aa-3ee2-4707-b8a8-c33f51323fef"; diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs index 42241082c2..debbb90bb3 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs @@ -70,13 +70,11 @@ namespace MusicStore // Add Identity services to the services container services.AddIdentity(options => { - options.ApplicationCookie.AccessDeniedPath = new PathString("/Home/AccessDenied"); + options.Cookies.ApplicationCookie.AccessDeniedPath = new PathString("/Home/AccessDenied"); }) .AddEntityFrameworkStores() .AddDefaultTokenProviders(); - services.AddCookieAuthentication(); - services.AddFacebookAuthentication(options => { options.AppId = "[AppId]"; @@ -109,7 +107,7 @@ namespace MusicStore options.BackchannelHttpHandler = new GoogleMockBackChannelHttpHandler(); }); - services.ConfigureTwitterAuthentication(options => + services.AddTwitterAuthentication(options => { options.ConsumerKey = "[ConsumerKey]"; options.ConsumerSecret = "[ConsumerSecret]"; @@ -126,7 +124,7 @@ namespace MusicStore #endif }); - services.ConfigureMicrosoftAccountAuthentication(options => + services.AddMicrosoftAccountAuthentication(options => { options.Caption = "MicrosoftAccount - Requires project changes"; options.ClientId = "[ClientId]"; diff --git a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs index 49d6a031a3..17b43a7ea3 100644 --- a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs +++ b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterNotifications.cs @@ -29,7 +29,7 @@ namespace MusicStore.Mocks.Twitter internal static async Task OnReturnEndpoint(TwitterReturnEndpointContext context) { - if (context.Principal != null && context.SignInScheme == IdentityOptions.ExternalCookieAuthenticationScheme) + if (context.Principal != null && context.SignInScheme == IdentityCookieOptions.ExternalCookieAuthenticationScheme) { //This way we will know all notifications were fired. var identity = context.Principal.Identities.First();