diff --git a/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs b/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs index dba7b90319..6214393f3b 100644 --- a/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Routing/RouteBuilderExtensions.cs @@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Routing var inlineConstraintResolver = routeCollectionBuilder .ServiceProvider - .GetService(); + .GetRequiredService(); routeCollectionBuilder.Routes.Add(new TemplateRoute(routeCollectionBuilder.DefaultHandler, name, template, diff --git a/src/Microsoft.AspNet.Routing/RouteCollection.cs b/src/Microsoft.AspNet.Routing/RouteCollection.cs index e232347929..4db88233db 100644 --- a/src/Microsoft.AspNet.Routing/RouteCollection.cs +++ b/src/Microsoft.AspNet.Routing/RouteCollection.cs @@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Routing { if (_logger == null) { - var factory = context.RequestServices.GetService(); + var factory = context.RequestServices.GetRequiredService(); _logger = factory.Create(); } } diff --git a/src/Microsoft.AspNet.Routing/RouterMiddleware.cs b/src/Microsoft.AspNet.Routing/RouterMiddleware.cs index 6a131760ed..789dceeaf9 100644 --- a/src/Microsoft.AspNet.Routing/RouterMiddleware.cs +++ b/src/Microsoft.AspNet.Routing/RouterMiddleware.cs @@ -70,7 +70,7 @@ namespace Microsoft.AspNet.Builder { if (_logger == null) { - var factory = context.RequestServices.GetService(); + var factory = context.RequestServices.GetRequiredService(); _logger = factory.Create(); } } diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs index 8f55fb01e4..d2d742c908 100644 --- a/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs +++ b/src/Microsoft.AspNet.Routing/Template/TemplateRoute.cs @@ -295,7 +295,7 @@ namespace Microsoft.AspNet.Routing.Template { if (_logger == null) { - var factory = context.RequestServices.GetService(); + var factory = context.RequestServices.GetRequiredService(); _logger = factory.Create(); _constraintLogger = factory.Create(typeof(RouteConstraintMatcher).FullName); } diff --git a/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs index e7385848b2..dab86f1981 100644 --- a/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/InlineRouteParameterParserTests.cs @@ -301,7 +301,7 @@ namespace Microsoft.AspNet.Routing.Tests .ConstraintMap .Add("test", typeof(TestRouteConstraint))); var serviceProvider = services.BuildServiceProvider(); - var accessor = serviceProvider.GetService>(); + var accessor = serviceProvider.GetRequiredService>(); return new DefaultInlineConstraintResolver(serviceProvider, accessor); } diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs index 751da95b50..05300dd6ed 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateBinderTests.cs @@ -1055,7 +1055,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests { var services = new ServiceCollection { OptionsServices.GetDefaultServices() }; var serviceProvider = services.BuildServiceProvider(); - var accessor = serviceProvider.GetService>(); + var accessor = serviceProvider.GetRequiredService>(); return new DefaultInlineConstraintResolver(serviceProvider, accessor); } diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs index 8361406c6a..586c2c8c27 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateMatcherTests.cs @@ -823,7 +823,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests { var services = new ServiceCollection { OptionsServices.GetDefaultServices() }; var serviceProvider = services.BuildServiceProvider(); - var accessor = serviceProvider.GetService>(); + var accessor = serviceProvider.GetRequiredService>(); return new DefaultInlineConstraintResolver(serviceProvider, accessor); } } diff --git a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs index 192d90a249..51a9510fa3 100644 --- a/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/Template/TemplateParserTests.cs @@ -481,7 +481,7 @@ namespace Microsoft.AspNet.Routing.Template.Tests { var services = new ServiceCollection { OptionsServices.GetDefaultServices() }; var serviceProvider = services.BuildServiceProvider(); - var accessor = serviceProvider.GetService>(); + var accessor = serviceProvider.GetRequiredService>(); return new DefaultInlineConstraintResolver(serviceProvider, accessor); } diff --git a/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs b/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs index 66895ba8a5..8f11a587db 100644 --- a/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs +++ b/test/Microsoft.AspNet.Routing.Tests/TemplateParserDefaultValuesTests.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Routing.Tests { var services = new ServiceCollection { OptionsServices.GetDefaultServices() }; var serviceProvider = services.BuildServiceProvider(); - var accessor = serviceProvider.GetService>(); + var accessor = serviceProvider.GetRequiredService>(); return new DefaultInlineConstraintResolver(serviceProvider, accessor); } }