From 12ceb6ae1c4775737155b2f51ab71e602f77645f Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Tue, 11 Aug 2015 15:44:47 -0700 Subject: [PATCH] React to DI namespace change part 3. --- .../DependencyInjection/MvcApiExplorerMvcBuilderExtensions.cs | 1 + .../DependencyInjection/MvcCorsMvcBuilderExtensions.cs | 3 ++- .../MvcDataAnnotationsMvcBuilderExtensions.cs | 1 + .../DependencyInjection/MvcJsonMvcBuilderExtensions.cs | 1 + .../DependencyInjection/MvcXmlMvcBuilderExtensions.cs | 1 + .../WebApiCompatShimServiceCollectionExtensions.cs | 1 + .../Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs | 1 + .../RazorPageExecutionInstrumentationWebSite/Startup.cs | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcBuilderExtensions.cs index 689fb094b1..e54609726a 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcBuilderExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc.ApiExplorer; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection diff --git a/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcBuilderExtensions.cs index 38d5a1e292..b579686b48 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/DependencyInjection/MvcCorsMvcBuilderExtensions.cs @@ -5,11 +5,12 @@ using System; using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; namespace Microsoft.Framework.DependencyInjection { - public static class MvcJsonMvcBuilderExtensions + public static class MvcCorsMvcBuilderExtensions { public static IMvcBuilder AddCors([NotNull] this IMvcBuilder builder) { diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs index 94d9cd87bd..b5fc264fd7 100644 --- a/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs index d25d3e50a5..b67e03de79 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Mvc; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; using Newtonsoft.Json; diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs index edb622b2e7..ca90a97b7b 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs index fd03bd5566..c8a4c5a77a 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs @@ -4,6 +4,7 @@ using System.Net.Http.Formatting; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.WebApiCompatShim; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.OptionsModel; namespace Microsoft.Framework.DependencyInjection diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs index c58c7e687e..a5d4990fee 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs @@ -14,6 +14,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc.TagHelpers; using Microsoft.AspNet.Testing; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.WebEncoders; using Xunit; diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs index ab99a59914..207d56940b 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs @@ -8,6 +8,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.Razor.Compilation; using Microsoft.AspNet.PageExecutionInstrumentation; using Microsoft.Framework.DependencyInjection; +using Microsoft.Framework.DependencyInjection.Extensions; namespace RazorPageExecutionInstrumentationWebSite {