Renaming Microsoft.Framework.* -> Microsoft.Extensions.*

DependencyInjection.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
@@ -7,11 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D26F6F80-63E
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{88B347C1-CCEC-4827-9564-FFF07C9BF7C7}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.DependencyInjection", "src\Microsoft.Framework.DependencyInjection\Microsoft.Framework.DependencyInjection.xproj", "{07ABDD98-9974-48CB-8265-53D1A8EC9E34}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyInjection", "src\Microsoft.Extensions.DependencyInjection\Microsoft.Extensions.DependencyInjection.xproj", "{07ABDD98-9974-48CB-8265-53D1A8EC9E34}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.DependencyInjection.Tests", "test\Microsoft.Framework.DependencyInjection.Tests\Microsoft.Framework.DependencyInjection.Tests.xproj", "{20201277-5461-49EF-811B-63ED3CD274EF}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyInjection.Tests", "test\Microsoft.Extensions.DependencyInjection.Tests\Microsoft.Extensions.DependencyInjection.Tests.xproj", "{20201277-5461-49EF-811B-63ED3CD274EF}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.DependencyInjection.Abstractions", "src\Microsoft.Framework.DependencyInjection.Abstractions\Microsoft.Framework.DependencyInjection.Abstractions.xproj", "{4E959D3B-2E0D-4296-B22C-D428DED294F0}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "src\Microsoft.Extensions.DependencyInjection.Abstractions\Microsoft.Extensions.DependencyInjection.Abstractions.xproj", "{4E959D3B-2E0D-4296-B22C-D428DED294F0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

NuGetPackageVerifier.json

@@ -9,8 +9,8 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.Framework.DependencyInjection": { },
-            "Microsoft.Framework.DependencyInjection.Abstractions": { }
+            "Microsoft.Extensions.DependencyInjection": { },
+            "Microsoft.Extensions.DependencyInjection.Abstractions": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.

src/Microsoft.Extensions.DependencyInjection.Abstractions/ActivatorUtilities.cs

@@ -6,9 +6,9 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
-using Microsoft.Framework.DependencyInjection.Abstractions;
+using Microsoft.Extensions.DependencyInjection.Abstractions;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Helper code for the various activator services.

src/Microsoft.Extensions.DependencyInjection.Abstractions/Extensions/ServiceCollectionExtensions.cs

@@ -1,13 +1,13 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.DependencyInjection.Abstractions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.DependencyInjection.Abstractions;
+using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Framework.DependencyInjection.Extensions
+namespace Microsoft.Extensions.DependencyInjection.Extensions
 {
     public static class ServiceCollectionExtensions
     {

src/Microsoft.Extensions.DependencyInjection.Abstractions/IServiceCollection.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Specifies the contract for a collection of service descriptors.

src/Microsoft.Extensions.DependencyInjection.Abstractions/IServiceScope.cs

@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// The <see cref="System.IDisposable.Dispose"/> method ends the scope lifetime. Once Dispose
     /// is called, any scoped services that have been resolved from
-    /// <see cref="Microsoft.Framework.DependencyInjection.IServiceScope.ServiceProvider"/> will be
+    /// <see cref="Microsoft.Extensions.DependencyInjection.IServiceScope.ServiceProvider"/> will be
     /// disposed.
     /// </summary>
     public interface IServiceScope : IDisposable

src/Microsoft.Extensions.DependencyInjection.Abstractions/IServiceScopeFactory.cs

@@ -1,19 +1,19 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public interface IServiceScopeFactory
     {
         /// <summary>
-        /// Create an <see cref="Microsoft.Framework.DependencyInjection.IServiceScope"/> which
+        /// Create an <see cref="Microsoft.Extensions.DependencyInjection.IServiceScope"/> which
         /// contains an <see cref="System.IServiceProvider"/> used to resolve dependencies from a
         /// newly created scope.
         /// </summary>
         /// <returns>
-        /// An <see cref="Microsoft.Framework.DependencyInjection.IServiceScope"/> controlling the
+        /// An <see cref="Microsoft.Extensions.DependencyInjection.IServiceScope"/> controlling the
         /// lifetime of the scope. Once this is disposed, any scoped services that have been resolved
-        /// from the <see cref="Microsoft.Framework.DependencyInjection.IServiceScope.ServiceProvider"/>
+        /// from the <see cref="Microsoft.Extensions.DependencyInjection.IServiceScope.ServiceProvider"/>
         /// will also be disposed.
         /// </returns>
         IServiceScope CreateScope();

src/Microsoft.Extensions.DependencyInjection.Abstractions/ObjectFactory.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// The result of <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>.

src/Microsoft.Extensions.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs

@@ -5,6 +5,6 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.Framework.DependencyInjection.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyInjection.Tests")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-us")]

src/Microsoft.Extensions.DependencyInjection.Abstractions/Properties/Resources.Designer.cs

@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.Framework.DependencyInjection.Abstractions
+namespace Microsoft.Extensions.DependencyInjection.Abstractions
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.DependencyInjection.Abstractions
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.Framework.DependencyInjection.Abstractions.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.Extensions.DependencyInjection.Abstractions.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// Multiple constructors accepting all given argument types have been found in type '{0}'. There should only be one applicable constructor.

src/Microsoft.Extensions.DependencyInjection.Abstractions/ServiceCollectionExtensions.cs

@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {

src/Microsoft.Extensions.DependencyInjection.Abstractions/ServiceDescriptor.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Diagnostics;
 using System.Reflection;
-using Microsoft.Framework.DependencyInjection.Abstractions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.DependencyInjection.Abstractions;
+using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     [DebuggerDisplay("Lifetime = {Lifetime}, ServiceType = {ServiceType}, ImplementationType = {ImplementationType}")]
     public class ServiceDescriptor

src/Microsoft.Extensions.DependencyInjection.Abstractions/ServiceLifetime.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public enum ServiceLifetime
     {

src/Microsoft.Extensions.DependencyInjection.Abstractions/ServiceProviderExtensions.cs

@@ -3,10 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Framework.DependencyInjection.Abstractions;
-using Microsoft.Framework.Internal;
+using Microsoft.Extensions.DependencyInjection.Abstractions;
+using Microsoft.Extensions.Internal;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceProviderExtensions
     {

src/Microsoft.Extensions.DependencyInjection.Abstractions/project.json

@@ -9,7 +9,7 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }
+        "Microsoft.Extensions.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }
     },
     "frameworks": {
         "net45": {

src/Microsoft.Extensions.DependencyInjection/Properties/AssemblyInfo.cs

@@ -5,7 +5,7 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.Framework.DependencyInjection.Tests")]
+[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyInjection.Tests")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-us")]
 

src/Microsoft.Extensions.DependencyInjection/Properties/Resources.Designer.cs

@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.DependencyInjection
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.Framework.DependencyInjection.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.Extensions.DependencyInjection.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// Unable to activate type '{0}'. The following constructors are ambigious:

src/Microsoft.Extensions.DependencyInjection/ServiceCollection.cs

@@ -4,7 +4,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Default implementation of <see cref="IServiceCollection"/>.

src/Microsoft.Extensions.DependencyInjection/ServiceCollectionExtensions.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionExtensions
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ClosedIEnumerableService.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ClosedIEnumerableService : IService
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ConstantCallSite.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq.Expressions;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ConstantCallSite : IServiceCallSite
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ConstructorCallSite.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -7,7 +7,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ConstructorCallSite : IServiceCallSite
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/CreateInstanceCallSite.cs

@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Linq.Expressions;
 using System.Runtime.ExceptionServices;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class CreateInstanceCallSite : IServiceCallSite
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/FactoryService.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class FactoryService : IService, IServiceCallSite
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/GenericService.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Reflection;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class GenericService : IGenericService
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/IGenericService.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal interface IGenericService
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/IService.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal interface IService
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/IServiceCallSite.cs

@@ -3,7 +3,7 @@
 
 using System.Linq.Expressions;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     /// <summary>
     /// Summary description for IServiceCallSite

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/InstanceService.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     /// <summary>
     /// Summary description for InstanceService

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/OpenIEnumerableService.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Reflection;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class OpenIEnumerableService : IGenericService
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/Service.cs

@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class Service : IService
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ServiceEntry.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ServiceEntry
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ServiceProviderService.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ServiceProviderService : IService, IServiceCallSite
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ServiceScope.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ServiceScope : IServiceScope
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ServiceScopeFactory.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ServiceScopeFactory : IServiceScopeFactory
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ServiceScopeService.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ServiceScopeService : IService, IServiceCallSite
     {

src/Microsoft.Extensions.DependencyInjection/ServiceLookup/ServiceTable.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     internal class ServiceTable
     {

src/Microsoft.Extensions.DependencyInjection/ServiceProvider.cs

@@ -8,9 +8,9 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Framework.DependencyInjection.ServiceLookup;
+using Microsoft.Extensions.DependencyInjection.ServiceLookup;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// The default IServiceProvider.

src/Microsoft.Extensions.DependencyInjection/project.json

@@ -9,8 +9,8 @@
         "warningsAsErrors": true
     },
     "dependencies": {
-        "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-*",
-        "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }
+        "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
+        "Microsoft.Extensions.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }
     },
     "frameworks": {
         "net45": { },

test/Microsoft.Extensions.DependencyInjection.Tests/ActivatorUtilitiesTests.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.Abstractions.Tests
+namespace Microsoft.Extensions.DependencyInjection.Abstractions.Tests
 {
     public class ActivatorUtilitiesTests
     {

test/Microsoft.Extensions.DependencyInjection.Tests/AllContainerTestsBase.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Extensions.DependencyInjection.Tests
 {
     public abstract class AllContainerTestsBase
     {

test/Microsoft.Extensions.DependencyInjection.Tests/CallSiteTests.cs

@@ -5,11 +5,11 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Microsoft.Framework.DependencyInjection.ServiceLookup;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.ServiceLookup;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Extensions.DependencyInjection.Tests
 {
     public class CallSiteTests
     {

test/Microsoft.Extensions.DependencyInjection.Tests/CircularDependencyTests.cs

@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Extensions.DependencyInjection.Tests
 {
     public class CircularDependencyTests
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/AbstractClass.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public abstract class AbstractClass
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/AnotherClass.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class AnotherClass
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/AnotherClassAcceptingData.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class AnotherClassAcceptingData
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/CircularDependencyGeneric.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class CircularDependencyGeneric<TDependency>
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/DirectCircularDependencyA.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class DirectCircularDependencyA
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/DirectCircularDependencyB.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class DirectCircularDependencyB
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/ISelfCircularDependencyWithInterface.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface ISelfCircularDependencyWithInterface
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/IndirectCircularDependencyA.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class IndirectCircularDependencyA
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/IndirectCircularDependencyB.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class IndirectCircularDependencyB
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/IndirectCircularDependencyC.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class IndirectCircularDependencyC
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesA.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     //    A
     //  / | \

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesB.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class NoCircularDependencySameTypeMultipleTimesB
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/NoCircularDependencySameTypeMultipleTimesC.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class NoCircularDependencySameTypeMultipleTimesC
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/SelfCircularDependency.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class SelfCircularDependency
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/SelfCircularDependencyGeneric.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class SelfCircularDependencyGeneric<TDependency>
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CircularReferences/SelfCircularDependencyWithInterface.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class SelfCircularDependencyWithInterface : ISelfCircularDependencyWithInterface
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithAmbiguousCtors.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithAmbiguousCtors
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithInternalConstructor.cs

@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public class ClassWithInternalConstructor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithNestedReferencesToProvider.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithNestedReferencesToProvider : IDisposable
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithOptionalArgsCtor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithOptionalArgsCtor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithPrivateCtor.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithPrivateCtor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithProtectedConstructor.cs

@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public class ClassWithProtectedConstructor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithStaticCtor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithStaticCtor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithThrowingCtor.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithThrowingCtor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ClassWithThrowingEmptyCtor.cs

@@ -1,6 +1,6 @@
-using System;
+using System;
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ClassWithThrowingEmptyCtor
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/CreationCountFakeService.cs

@@ -3,7 +3,7 @@
 
 using System.Threading;
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class CreationCountFakeService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/DependOnNonexistentService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class DependOnNonexistentService : IDependOnNonexistentService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/DependsOnServiceWithoutImplementation.cs

@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public class DependsOnServiceWithoutImplementation
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/FakeOpenGenericService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class FakeOpenGenericService<T> : IFakeOpenGenericService<T>
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/FakeOuterService.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class FakeOuterService : IFakeOuterService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/FakeService.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class FakeService : IFakeEveryService, IDisposable
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IDependOnNonexistentService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IDependOnNonexistentService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFactoryService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IFactoryService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeEveryService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     interface IFakeEveryService :
             IFakeService,

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeMultipleService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IFakeMultipleService : IFakeService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeOpenGenericService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IFakeOpenGenericService<T>
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeOuterService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IFakeOuterService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeScopedService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IFakeScopedService : IFakeService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface IFakeService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeServiceInstance.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     interface IFakeServiceInstance : IFakeService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IFakeSingletonService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     interface IFakeSingletonService : IFakeService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/INonexistentService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public interface INonexistentService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/IServiceWithoutImplementation.cs

@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public interface IServiceWithoutImplementation
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ScopedFactoryService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class ScopedFactoryService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/ServiceAcceptingFactoryService.cs

@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Extensions.DependencyInjection.Tests
 {
     public class ServiceAcceptingFactoryService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/TestServices.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public static class TestServices
     {

test/Microsoft.Extensions.DependencyInjection.Tests/Fakes/TransientFactoryService.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.Framework.DependencyInjection.Tests.Fakes
+namespace Microsoft.Extensions.DependencyInjection.Tests.Fakes
 {
     public class TransientFactoryService : IFactoryService
     {

test/Microsoft.Extensions.DependencyInjection.Tests/ScopingContainerTestBase.cs

@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Extensions.DependencyInjection.Tests
 {
     public abstract class ScopingContainerTestBase : AllContainerTestsBase
     {

test/Microsoft.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionTest.cs

@@ -3,13 +3,13 @@
 
 using System;
 using Microsoft.AspNet.Testing;
-using Microsoft.Framework.DependencyInjection.Extensions;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-using AbstractionResources = Microsoft.Framework.DependencyInjection.Abstractions.Resources;
+using AbstractionResources = Microsoft.Extensions.DependencyInjection.Abstractions.Resources;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public class ServiceCollectionExtensionTest
     {

test/Microsoft.Extensions.DependencyInjection.Tests/ServiceCollectionTests.cs

@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.Framework.DependencyInjection.Extensions;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection
+namespace Microsoft.Extensions.DependencyInjection
 {
     public class ServiceCollectionTests
     {

test/Microsoft.Extensions.DependencyInjection.Tests/ServiceLookup/ServiceTest.cs

@@ -1,15 +1,15 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.Framework.DependencyInjection.Extensions;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.ServiceLookup
+namespace Microsoft.Extensions.DependencyInjection.ServiceLookup
 {
     public class ServiceTest
     {