From c8a59d7f3e2b660eb77f9eff4ba2d1f1977773b4 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Fri, 8 Jan 2016 18:07:36 -0800
Subject: [PATCH] Reacting to new middleware options pattern

---
 samples/InlineConstraintSample.Web/Startup.cs        |  7 ++++---
 samples/LocalizationSample.Web/Startup.cs            | 12 ++++++------
 .../Filters/AuthorizeFilterTest.cs                   |  1 +
 test/WebSites/RazorWebSite/Startup.cs                | 12 ++++++------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/samples/InlineConstraintSample.Web/Startup.cs b/samples/InlineConstraintSample.Web/Startup.cs
index b0e782d17f..2b45922ce2 100644
--- a/samples/InlineConstraintSample.Web/Startup.cs
+++ b/samples/InlineConstraintSample.Web/Startup.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Collections.Generic;
 using InlineConstraintSample.Web.Constraints;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
@@ -25,11 +26,11 @@ namespace InlineConstraintSample.Web
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UseRequestLocalization(localizationOptions =>
+            app.UseRequestLocalization(new RequestLocalizationOptions
             {
                 // Ignore ambient and client locale. Use same values as ReplaceCultureAttribute / CultureReplacerMiddleware.
-                localizationOptions.DefaultRequestCulture = new RequestCulture("en-GB", "en-US");
-                localizationOptions.RequestCultureProviders.Clear();
+                DefaultRequestCulture = new RequestCulture("en-GB", "en-US"),
+                RequestCultureProviders = new List<IRequestCultureProvider>()
             });
 
             app.UseMvc();
diff --git a/samples/LocalizationSample.Web/Startup.cs b/samples/LocalizationSample.Web/Startup.cs
index 028899b7a3..ba3015f402 100644
--- a/samples/LocalizationSample.Web/Startup.cs
+++ b/samples/LocalizationSample.Web/Startup.cs
@@ -22,19 +22,19 @@ namespace LocalizationSample.Web
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UseRequestLocalization(options =>
+            app.UseRequestLocalization(new RequestLocalizationOptions
             {
-                options.DefaultRequestCulture = new RequestCulture("en-US");
-                options.SupportedCultures = new List<CultureInfo>
+                DefaultRequestCulture = new RequestCulture("en-US"),
+                SupportedCultures = new List<CultureInfo>
                 {
                     new CultureInfo("fr"),
                     new CultureInfo("en-GB"),
-                };
-                options.SupportedUICultures = new List<CultureInfo>
+                },
+                SupportedUICultures = new List<CultureInfo>
                 {
                     new CultureInfo("fr"),
                     new CultureInfo("en-GB"),
-                };
+                }
             });
 
             app.UseMvcWithDefaultRoute();
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs
index 54d800ad18..e71ed3824a 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs
@@ -301,6 +301,7 @@ namespace Microsoft.AspNet.Mvc.Filters
             var serviceCollection = new ServiceCollection();
             if (registerServices != null)
             {
+                serviceCollection.AddOptions();
                 serviceCollection.AddLogging();
                 registerServices(serviceCollection);
             }
diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs
index 9d864da892..15084cc4a0 100644
--- a/test/WebSites/RazorWebSite/Startup.cs
+++ b/test/WebSites/RazorWebSite/Startup.cs
@@ -43,21 +43,21 @@ namespace RazorWebSite
 
         public void Configure(IApplicationBuilder app)
         {
-            app.UseRequestLocalization(options =>
+            app.UseRequestLocalization(new RequestLocalizationOptions
             {
-                options.DefaultRequestCulture = new RequestCulture("en-GB", "en-US");
-                options.SupportedCultures = new List<CultureInfo>
+                DefaultRequestCulture = new RequestCulture("en-GB", "en-US"),
+                SupportedCultures = new List<CultureInfo>
                 {
                     new CultureInfo("fr"),
                     new CultureInfo("en-GB"),
                     new CultureInfo("en-US"),
-                };
-                options.SupportedUICultures = new List<CultureInfo>
+                },
+                SupportedUICultures = new List<CultureInfo>
                 {
                     new CultureInfo("fr"),
                     new CultureInfo("en-GB"),
                     new CultureInfo("en-US"),
-                };
+                }
             });
 
             app.UseMvcWithDefaultRoute();