From 85ad1aeb96b95ec48ddb8abd0c4a3061206bc8ef Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Wed, 10 Sep 2014 14:12:08 -0700 Subject: [PATCH] Handle IBuilder rename to IApplicationBuilder. --- samples/MvcSample.Web/Startup.cs | 2 +- src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs | 2 +- src/Microsoft.AspNet.Mvc/BuilderExtensions.cs | 4 ++-- .../Internal/MvcServicesHelperTests.cs | 4 ++-- test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs | 2 +- .../AntiForgeryTests.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs | 2 +- .../CompositeViewEngineTests.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs | 2 +- .../DependencyResolverTests.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/DirectivesTest.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/FlushPointTest.cs | 2 +- .../InlineConstraintTests.cs | 2 +- .../InputFormatterTests.cs | 2 +- .../ModelBindingTests.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs | 2 +- .../Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs | 6 +++--- .../OutputFormattterTests.cs | 2 +- test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs | 2 +- .../ValueProviderTests.cs | 2 +- .../Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs | 2 +- .../XmlOutputFormatterTests.cs | 2 +- test/WebSites/ActivatorWebSite/Startup.cs | 2 +- test/WebSites/AddServicesWebSite/Startup.cs | 2 +- test/WebSites/AntiForgeryWebSite/Startup.cs | 2 +- test/WebSites/AutofacWebSite/Startup.cs | 2 +- test/WebSites/BasicWebSite/Startup.cs | 2 +- test/WebSites/CompositeViewEngine/Startup.cs | 2 +- test/WebSites/ConnegWebSite/Startup.cs | 2 +- test/WebSites/FormatterWebSite/Startup.cs | 2 +- test/WebSites/InlineConstraintsWebSite/Startup.cs | 2 +- .../BuilderExtensions.cs | 2 +- test/WebSites/ModelBindingWebSite/Startup.cs | 2 +- test/WebSites/RazorWebSite/Startup.cs | 2 +- test/WebSites/RoutingWebSite/Startup.cs | 2 +- test/WebSites/ValueProvidersSite/Startup.cs | 2 +- 36 files changed, 40 insertions(+), 40 deletions(-) diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index acaa3b103a..a4213e6341 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/samples/MvcSample.Web/Startup.cs @@ -17,7 +17,7 @@ namespace MvcSample.Web { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { app.UseFileServer(); #if ASPNET50 diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs index c018a8c114..bee779b392 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Mvc.Internal if (services.GetServiceOrNull(typeof(MvcMarkerService)) == null) { throw new InvalidOperationException(Resources.FormatUnableToFindServices( - "IServiceCollection.AddMvc()", "IBuilder.UseServices(...)", "IBuilder.UseMvc(...)")); + "IServiceCollection.AddMvc()", "IApplicationBuilder.UseServices(...)", "IApplicationBuilder.UseMvc(...)")); } } } diff --git a/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs b/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs index dbb580d9e7..61ff7228ab 100644 --- a/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Builder { public static class BuilderExtensions { - public static IBuilder UseMvc([NotNull] this IBuilder app) + public static IApplicationBuilder UseMvc([NotNull] this IApplicationBuilder app) { return app.UseMvc(routes => { @@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Builder }); } - public static IBuilder UseMvc([NotNull] this IBuilder app, [NotNull] Action configureRoutes) + public static IApplicationBuilder UseMvc([NotNull] this IApplicationBuilder app, [NotNull] Action configureRoutes) { // Verify if AddMvc was done before calling UseMvc // We use the MvcMarkerService to make sure if all the services were added. diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs index 04510a91c4..551c74027b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs @@ -19,8 +19,8 @@ namespace Microsoft.AspNet.Mvc services.Setup(o => o.GetService(typeof(IEnumerable))) .Returns(new List()); var expectedMessage = "Unable to find the required services. Please add all the required " + - "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IBuilder.UseServices(...)' " + - "or 'IBuilder.UseMvc(...)' in the application startup code."; + "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " + + "or 'IApplicationBuilder.UseMvc(...)' in the application startup code."; // Act & Assert var ex = Assert.Throws( diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs index a31c993eb4..46c87378bb 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ActivatorTests.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class ActivatorTests { private readonly IServiceProvider _provider = TestHelper.CreateServices("ActivatorWebSite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; [Fact] public async Task ControllerThatCannotBeActivated_ThrowsWhenAttemptedToBeInvoked() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/AntiForgeryTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/AntiForgeryTests.cs index 7b357a178a..52e0e8edb9 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/AntiForgeryTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/AntiForgeryTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class AntiForgeryTests { private readonly IServiceProvider _services = TestHelper.CreateServices("AntiForgeryWebSite"); - private readonly Action _app = new AntiForgeryWebSite.Startup().Configure; + private readonly Action _app = new AntiForgeryWebSite.Startup().Configure; [Fact] public async Task MultipleAFTokensWithinTheSamePage_AreAllowed() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs index 94c9c60721..ed9bda8ac1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/BasicTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class BasicTests { private readonly IServiceProvider _provider = TestHelper.CreateServices("BasicWebSite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; // Some tests require comparing the actual response body against an expected response baseline // so they require a reference to the assembly on which the resources are located, in order to diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs index d46428b9ca..49ff7545cd 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class CompositeViewEngineTests { private readonly IServiceProvider _services = TestHelper.CreateServices("CompositeViewEngine"); - private readonly Action _app = new CompositeViewEngine.Startup().Configure; + private readonly Action _app = new CompositeViewEngine.Startup().Configure; [Fact] public async Task CompositeViewEngine_FindsPartialViewsAcrossAllEngines() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs index cb4d885b21..a58a73baf3 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class ConnegTests { private readonly IServiceProvider _provider = TestHelper.CreateServices("ConnegWebsite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; [Fact] public async Task ProducesContentAttribute_SingleContentType_PicksTheFirstSupportedFormatter() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs index 14616416da..cca4acfe0f 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DependencyResolverTests.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests { // Arrange var provider = TestHelper.CreateServices("AutofacWebSite"); - Action app = new Startup().Configure; + Action app = new Startup().Configure; HttpResponseMessage response = null; // Act & Assert diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DirectivesTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DirectivesTest.cs index e4966e6b66..fd576b7ee4 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DirectivesTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DirectivesTest.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class DirectivesTest { private readonly IServiceProvider _provider = TestHelper.CreateServices("RazorWebSite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; [Fact] public async Task ViewsInheritsUsingsAndInjectDirectivesFromViewStarts() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/FlushPointTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/FlushPointTest.cs index aa758a4e93..00410ab04c 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/FlushPointTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/FlushPointTest.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class FlushPointTest { private readonly IServiceProvider _provider = TestHelper.CreateServices("RazorWebSite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; [Fact] public async Task FlushPointsAreExecutedForPagesWithLayouts() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/InlineConstraintTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/InlineConstraintTests.cs index b60ac42055..b59cd87ca0 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/InlineConstraintTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/InlineConstraintTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class InlineConstraintTests { private readonly IServiceProvider _provider; - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; public InlineConstraintTests() { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/InputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/InputFormatterTests.cs index 22b110fe9f..9750b485b0 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/InputFormatterTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/InputFormatterTests.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class InputFormatterTests { private readonly IServiceProvider _services = TestHelper.CreateServices("FormatterWebSite"); - private readonly Action _app = new FormatterWebSite.Startup().Configure; + private readonly Action _app = new FormatterWebSite.Startup().Configure; [Fact] public async Task CheckIfXmlInputFormatterIsBeingCalled() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTests.cs index 52023c3f4b..4e6033df5e 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ModelBindingTests.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class ModelBindingTests { private readonly IServiceProvider _services = TestHelper.CreateServices("ModelBindingWebSite"); - private readonly Action _app = new ModelBindingWebSite.Startup().Configure; + private readonly Action _app = new ModelBindingWebSite.Startup().Configure; [Fact] public async Task ModelBindingBindsBase64StringsToByteArrays() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs index 01a66c402c..b31ba85ee1 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcSampleTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests // Path relative to Mvc\\test\Microsoft.AspNet.Mvc.FunctionalTests private readonly IServiceProvider _services = TestHelper.CreateServices("MvcSample.Web", Path.Combine("..", "..", "samples")); - private readonly Action _app = new MvcSample.Web.Startup().Configure; + private readonly Action _app = new MvcSample.Web.Startup().Configure; [Fact] public async Task Home_Index_ReturnsSuccess() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs index 8dd98a966d..deb39e1839 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs @@ -11,15 +11,15 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class MvcStartupTests { private readonly IServiceProvider _provider = TestHelper.CreateServices("AddServicesWebSite"); - private readonly Action _app = new AddServicesWebSite.Startup().Configure; + private readonly Action _app = new AddServicesWebSite.Startup().Configure; [Fact] public void MvcThrowsWhenRequiredServicesAreNotAdded() { // Arrange var expectedMessage = "Unable to find the required services. Please add all the required " + - "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IBuilder.UseServices(...)' " + - "or 'IBuilder.UseMvc(...)' in the application startup code."; + "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " + + "or 'IApplicationBuilder.UseMvc(...)' in the application startup code."; // Act & Assert var ex = Assert.Throws(() => TestServer.Create(_provider, _app)); diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormattterTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormattterTests.cs index 8ebb2b6d2b..9511454900 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormattterTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormattterTests.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class OutputFormatterTests { private readonly IServiceProvider _provider = TestHelper.CreateServices("ConnegWebsite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; [Theory] [InlineData("ReturnTaskOfString")] diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs index a4ee08096a..e545198a52 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RoutingTests.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class RoutingTests { private readonly IServiceProvider _services = TestHelper.CreateServices("RoutingWebSite"); - private readonly Action _app = new RoutingWebSite.Startup().Configure; + private readonly Action _app = new RoutingWebSite.Startup().Configure; [Fact] public async Task ConventionRoutedController_ActionIsReachable() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs index 0b71be5349..7f082d6714 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class ValueProviderTest { private readonly IServiceProvider _services = TestHelper.CreateServices("ValueProvidersSite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; [Fact] public async Task ValueProviderFactories_AreVisitedInSequentialOrder_ForValueProviders() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs index 35c77f028d..cf5b6b15c5 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ViewEngineTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class ViewEngineTests { private readonly IServiceProvider _provider = TestHelper.CreateServices("RazorWebSite"); - private readonly Action _app = new Startup().Configure; + private readonly Action _app = new Startup().Configure; public static IEnumerable RazorView_ExecutesPageAndLayoutData { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs index 008f803909..6b3b368ecb 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/XmlOutputFormatterTests.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class XmlOutputFormatterTests { private readonly IServiceProvider _services; - private readonly Action _app = new FormatterWebSite.Startup().Configure; + private readonly Action _app = new FormatterWebSite.Startup().Configure; public XmlOutputFormatterTests() { diff --git a/test/WebSites/ActivatorWebSite/Startup.cs b/test/WebSites/ActivatorWebSite/Startup.cs index 388428623c..dfc3a68168 100644 --- a/test/WebSites/ActivatorWebSite/Startup.cs +++ b/test/WebSites/ActivatorWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace ActivatorWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/AddServicesWebSite/Startup.cs b/test/WebSites/AddServicesWebSite/Startup.cs index 9397f5956c..4cb90bd753 100644 --- a/test/WebSites/AddServicesWebSite/Startup.cs +++ b/test/WebSites/AddServicesWebSite/Startup.cs @@ -8,7 +8,7 @@ namespace AddServicesWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/AntiForgeryWebSite/Startup.cs b/test/WebSites/AntiForgeryWebSite/Startup.cs index a25cb4932c..9c0e4f3404 100644 --- a/test/WebSites/AntiForgeryWebSite/Startup.cs +++ b/test/WebSites/AntiForgeryWebSite/Startup.cs @@ -6,7 +6,7 @@ namespace AntiForgeryWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); app.UseServices(services => diff --git a/test/WebSites/AutofacWebSite/Startup.cs b/test/WebSites/AutofacWebSite/Startup.cs index c39aff22ce..6cadb40b80 100644 --- a/test/WebSites/AutofacWebSite/Startup.cs +++ b/test/WebSites/AutofacWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace AutofacWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { app.UseServices(services => { services.AddMvc(); diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs index 5686feef0d..955d4378ec 100644 --- a/test/WebSites/BasicWebSite/Startup.cs +++ b/test/WebSites/BasicWebSite/Startup.cs @@ -8,7 +8,7 @@ namespace BasicWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/CompositeViewEngine/Startup.cs b/test/WebSites/CompositeViewEngine/Startup.cs index 65223ba53a..9f020df0ba 100644 --- a/test/WebSites/CompositeViewEngine/Startup.cs +++ b/test/WebSites/CompositeViewEngine/Startup.cs @@ -9,7 +9,7 @@ namespace CompositeViewEngine { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/ConnegWebSite/Startup.cs b/test/WebSites/ConnegWebSite/Startup.cs index 943c84e5d1..939707b984 100644 --- a/test/WebSites/ConnegWebSite/Startup.cs +++ b/test/WebSites/ConnegWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace ConnegWebsite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/FormatterWebSite/Startup.cs b/test/WebSites/FormatterWebSite/Startup.cs index 26fccfaae7..502301c7fb 100644 --- a/test/WebSites/FormatterWebSite/Startup.cs +++ b/test/WebSites/FormatterWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace FormatterWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/InlineConstraintsWebSite/Startup.cs b/test/WebSites/InlineConstraintsWebSite/Startup.cs index 5becb8178f..d1d8b181b1 100644 --- a/test/WebSites/InlineConstraintsWebSite/Startup.cs +++ b/test/WebSites/InlineConstraintsWebSite/Startup.cs @@ -14,7 +14,7 @@ namespace InlineConstraints { public Action RouteCollectionProvider { get; set; } - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs index 2af91cce7b..81ee5867a2 100644 --- a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs +++ b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/BuilderExtensions.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Builder { public static class BuilderExtensions { - public static Configuration GetTestConfiguration(this IBuilder app) + public static Configuration GetTestConfiguration(this IApplicationBuilder app) { var configurationProvider = app.ApplicationServices.GetServiceOrDefault(); var configuration = configurationProvider == null diff --git a/test/WebSites/ModelBindingWebSite/Startup.cs b/test/WebSites/ModelBindingWebSite/Startup.cs index 84b80ee479..e5436b71c7 100644 --- a/test/WebSites/ModelBindingWebSite/Startup.cs +++ b/test/WebSites/ModelBindingWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace ModelBindingWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs index 951a918a2c..63475f6326 100644 --- a/test/WebSites/RazorWebSite/Startup.cs +++ b/test/WebSites/RazorWebSite/Startup.cs @@ -5,7 +5,7 @@ namespace RazorWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/RoutingWebSite/Startup.cs b/test/WebSites/RoutingWebSite/Startup.cs index 011532f8a7..c353939d84 100644 --- a/test/WebSites/RoutingWebSite/Startup.cs +++ b/test/WebSites/RoutingWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace RoutingWebSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); diff --git a/test/WebSites/ValueProvidersSite/Startup.cs b/test/WebSites/ValueProvidersSite/Startup.cs index fe50940e76..d119dabe66 100644 --- a/test/WebSites/ValueProvidersSite/Startup.cs +++ b/test/WebSites/ValueProvidersSite/Startup.cs @@ -9,7 +9,7 @@ namespace ValueProvidersSite { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration();