Reacting to package and namespace changes

samples/MvcSample.Web/Startup.cs

@@ -16,10 +16,10 @@
 // permissions and limitations under the License.
 
 using Microsoft.AspNet;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Routing;
+using Microsoft.Framework.DependencyInjection;
 using MvcSample.Web.Filters;
 
 namespace MvcSample.Web

samples/MvcSample.Web/project.json

@@ -7,7 +7,7 @@
     "Helios": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Routing": "0.1-alpha-*",
     "Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
     "Microsoft.ComponentModel.DataAnnotations": "0.1-alpha-*",

src/Microsoft.AspNet.Mvc.Core/ActionInvokerFactory.cs

@@ -15,7 +15,7 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs

@@ -16,8 +16,6 @@
 // permissions and limitations under the License.
 
 using System;
-using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 
 namespace Microsoft.AspNet.Mvc

src/Microsoft.AspNet.Mvc.Core/ActionResults/ViewResult.cs

@@ -20,7 +20,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Rendering;
 

src/Microsoft.AspNet.Mvc.Core/DefaultActionSelector.cs

@@ -20,9 +20,9 @@ using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Routing;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs

@@ -16,10 +16,9 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
-using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeAttribute.cs

@@ -21,8 +21,8 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Security;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/Filters/DefaultFilterProvider.cs

@@ -17,8 +17,8 @@
 
 using System;
 using System.Diagnostics.Contracts;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Filters
 {

src/Microsoft.AspNet.Mvc.Core/Filters/TypeFilterAttribute.cs

@@ -17,8 +17,8 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/IActionDescriptorProvider.cs

@@ -15,7 +15,7 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/IActionInvokerProvider.cs

@@ -15,7 +15,7 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/Injector.cs

@@ -18,7 +18,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs

@@ -18,9 +18,9 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Routing;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs

@@ -21,9 +21,9 @@ using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvokerProvider.cs

@@ -16,7 +16,7 @@
 // permissions and limitations under the License.
 
 using System;
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultDisplayTemplates.cs

@@ -21,9 +21,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/DefaultEditorTemplates.cs

@@ -21,9 +21,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {

src/Microsoft.AspNet.Mvc.Core/Rendering/Html/TemplateRenderer.cs

@@ -21,8 +21,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Rendering
 {

src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs

@@ -19,9 +19,9 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Routing;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentInvoker.cs

@@ -19,9 +19,9 @@ using System;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentInvokerFactory.cs

@@ -16,7 +16,7 @@
 // permissions and limitations under the License.
 
 using System.Reflection;
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ViewComponents/IViewComponentInvokerProvider.cs

@@ -15,7 +15,7 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/project.json

@@ -5,12 +5,12 @@
   },
   "dependencies": {
     "Newtonsoft.Json": "5.0.8",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.AspNet.Routing": "0.1-alpha-*",
     "Microsoft.AspNet.Security": "0.1-alpha-*",
     "Common": "",
     "Microsoft.AspNet.Mvc.ModelBinding": "",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Microsoft.Net.Runtime.Interfaces":  "0.1-alpha-*",
     "Microsoft.AspNet.Security.DataProtection" : "0.1-alpha-*"
   },

src/Microsoft.AspNet.Mvc.ModelBinding/Binders/GenericModelBinder.cs

@@ -20,8 +20,8 @@ using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.ModelBinding.Internal;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
 {

src/Microsoft.AspNet.Mvc.ModelBinding/project.json

@@ -5,9 +5,9 @@
   },
   "dependencies": {
     "Common": "",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
     "Microsoft.ComponentModel.DataAnnotations": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Newtonsoft.Json": "5.0.8"
   },
   "configurations": {

src/Microsoft.AspNet.Mvc.Razor.Host/project.json

@@ -6,13 +6,13 @@
   "dependencies": {
     "Microsoft.AspNet.FileSystems": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Razor": "0.1-alpha-*",
     "Common": "",
     "Microsoft.AspNet.Mvc.Core" : "",
     "Microsoft.AspNet.Mvc.ModelBinding" : "",
     "Microsoft.CodeAnalysis.Common" : "0.7-beta-*",
     "Microsoft.CodeAnalysis.CSharp" : "0.7-beta-*",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "System.Reflection.Metadata.Ecma335": "0.7-beta-*",
     "Microsoft.Bcl.Immutable": "1.1.18-beta-*",
     "Microsoft.Net.Runtime.Interfaces":  "0.1-alpha-*"

src/Microsoft.AspNet.Mvc.Razor/RazorView.cs

@@ -21,12 +21,11 @@ using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Security.Cryptography;
 using System.Security.Principal;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Razor
 {

src/Microsoft.AspNet.Mvc.Razor/RazorViewOfT.cs

@@ -17,9 +17,9 @@
 
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc.Razor
 {

src/Microsoft.AspNet.Mvc.Razor/project.json

@@ -6,8 +6,8 @@
   "dependencies": {
     "Microsoft.AspNet.FileSystems": "0.1-alpha-*",
     "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Razor": "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Common": "",
     "Microsoft.AspNet.Mvc.Core" : "",
     "Microsoft.AspNet.Mvc.Razor.Host" : "",

src/Microsoft.AspNet.Mvc/BuilderExtensions.cs

@@ -16,12 +16,10 @@
 // permissions and limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Routing;
 
-namespace Microsoft.AspNet
+namespace Microsoft.AspNet.Builder
 {
     public static class BuilderExtensions
     {

src/Microsoft.AspNet.Mvc/MvcServices.cs

@@ -16,15 +16,15 @@
 // permissions and limitations under the License.
 
 using System.Collections.Generic;
-using Microsoft.Framework.ConfigurationModel;
-using Microsoft.AspNet.DependencyInjection;
-using Microsoft.AspNet.DependencyInjection.NestedProviders;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Security;
+using Microsoft.Framework.ConfigurationModel;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.NestedProviders;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc/ServiceCollectionExtensions.cs

@@ -15,10 +15,10 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
+using Microsoft.AspNet.Mvc;
 using Microsoft.Framework.ConfigurationModel;
-using Microsoft.AspNet.DependencyInjection;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.Framework.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {

src/Microsoft.AspNet.Mvc/project.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http" : "0.1-alpha-*",
     "Microsoft.Framework.ConfigurationModel" : "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
+    "Microsoft.Framework.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.FileSystems" : "0.1-alpha-*",
     "Microsoft.AspNet.Razor" : "0.1-alpha-*",
     "Microsoft.AspNet.RequestContainer": "0.1-alpha-*",

test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs

@@ -17,14 +17,14 @@
 
 #if NET45
 
-using Microsoft.AspNet.DependencyInjection.NestedProviders;
-using Microsoft.AspNet.Http;
-using Moq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
+using Microsoft.Framework.DependencyInjection.NestedProviders;
+using Moq;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.Core.Test

test/Microsoft.AspNet.Mvc.Core.Test/ActionSelectionConventionTests.cs

@@ -17,13 +17,13 @@
 
 #if NET45
 
-using Microsoft.AspNet.DependencyInjection.NestedProviders;
-using Microsoft.AspNet.Http;
-using Moq;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Http;
+using Microsoft.Framework.DependencyInjection.NestedProviders;
+using Moq;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.Core.Test

test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionSelectorTest.cs

@@ -18,9 +18,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Routing;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerFactoryTest.cs

@@ -16,11 +16,7 @@
 // permissions and limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeAttributeTests.cs

@@ -15,13 +15,11 @@
 // See the Apache 2 License for the specific language governing
 // permissions and limitations under the License.
 
-using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
-using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Security;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeAttributeTestsBase.cs

@@ -16,14 +16,11 @@
 // permissions and limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
-using System.Web;
-using Microsoft.AspNet.DependencyInjection;
-using Microsoft.AspNet.DependencyInjection.Fallback;
 using Microsoft.AspNet.Http;
+using Microsoft.Framework.DependencyInjection;
+using Microsoft.Framework.DependencyInjection.Fallback;
 using Moq;
 
 namespace Microsoft.AspNet.Mvc.Core.Test

test/Microsoft.AspNet.Mvc.Core.Test/ReflectedActionInvokerTest.cs

@@ -17,13 +17,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Testing;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs

@@ -16,9 +16,9 @@
 // permissions and limitations under the License.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.DependencyInjection;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Routing;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.Core.Test/project.json

@@ -5,15 +5,14 @@
   },
   "dependencies": {
     "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.Mvc.Core" : "",
     "Microsoft.AspNet.Mvc" : "",
     "Microsoft.AspNet.Routing": "0.1-alpha-*",
     "Microsoft.AspNet.Testing": "0.1-alpha-*",
     "Microsoft.AspNet.Mvc.ModelBinding": "",
     "Microsoft.AspNet.Routing": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection" : "0.1-alpha-*",
     "Microsoft.AspNet.Mvc.ModelBinding" : "",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Moq": "4.2.1312.1622",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",

test/Microsoft.AspNet.Mvc.ModelBinding.Test/Binders/CompositeModelBinderTest.cs

@@ -18,10 +18,9 @@
 #if NET45
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DependencyInjection;
+using Microsoft.Framework.DependencyInjection;
 using Moq;
 using Xunit;
 

test/Microsoft.AspNet.Mvc.ModelBinding.Test/project.json

@@ -5,11 +5,11 @@
   },
   "dependencies": {
     "Microsoft.AspNet.Http": "0.1-alpha-*",
-    "Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
     "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
     "Microsoft.AspNet.Testing": "0.1-alpha-*",
     "Microsoft.ComponentModel.DataAnnotations" : "0.1-alpha-*",
     "Microsoft.AspNet.Mvc.ModelBinding" : "",
+    "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
     "Newtonsoft.Json": "5.0.8",
     "Xunit.KRunner": "0.1-alpha-*",
     "xunit.abstractions": "2.0.0-aspnet-*",