From f7cea9b6d75699d73f2380920c47da4b0ab80328 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Tue, 11 Aug 2015 14:10:30 -0700 Subject: [PATCH] React to namespace change in DI. --- .../MvcLocalizationServiceCollectionExtensions.cs | 1 + .../DependencyInjection/MvcRazorMvcBuilderExtensions.cs | 1 + .../DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs | 1 + src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs | 2 +- test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs | 1 + .../MvcCoreServiceCollectionExtensionsTest.cs | 1 + .../MvcLocalizationServiceCollectionExtensionsTest.cs | 1 + .../MvcServiceCollectionExtensionsTest.cs | 3 +-- 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Localization/DependencyInjection/MvcLocalizationServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.Localization/DependencyInjection/MvcLocalizationServiceCollectionExtensions.cs index b65047a8b4..b4e619d364 100644 --- a/src/Microsoft.AspNet.Mvc.Localization/DependencyInjection/MvcLocalizationServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Localization/DependencyInjection/MvcLocalizationServiceCollectionExtensions.cs @@ -5,6 +5,7 @@ using System.Linq; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Localization; using Microsoft.AspNet.Mvc.Razor; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs index 10fb5efc11..d7ef1d50f0 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs @@ -11,6 +11,7 @@ using Microsoft.AspNet.Mvc.Razor.Compilation; using Microsoft.AspNet.Mvc.Razor.Directives; using Microsoft.AspNet.Mvc.Razor.Precompilation; using Microsoft.Framework.Caching.Memory; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs index feb9be9aa3..beba3865d6 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs @@ -5,6 +5,7 @@ using System; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs index d35ff24d27..0f9fb37c4e 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Razor; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs index ec1f3b7d36..f8e29613bf 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Logging; using Microsoft.Framework.Logging.Testing; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs index d9960b797c..7ec7576328 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs @@ -10,6 +10,7 @@ using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.OptionsModel; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Localization.Test/DependencyInjection/MvcLocalizationServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Localization.Test/DependencyInjection/MvcLocalizationServiceCollectionExtensionsTest.cs index 6add903e3b..abd486edc6 100644 --- a/test/Microsoft.AspNet.Mvc.Localization.Test/DependencyInjection/MvcLocalizationServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Localization.Test/DependencyInjection/MvcLocalizationServiceCollectionExtensionsTest.cs @@ -7,6 +7,7 @@ using System.Globalization; using System.Linq; using Microsoft.AspNet.Mvc.Localization; using Microsoft.AspNet.Mvc.Razor; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Localization; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index e091a1e6fe..91b7544f41 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -5,8 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNet.Antiforgery; -using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc.ActionConstraints; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ApplicationModels; @@ -16,6 +14,7 @@ using Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers; using Microsoft.AspNet.Mvc.Razor; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.OptionsModel; using Moq; using Xunit;