Updated everything to DNX RC1 including specification tests. Build no…

…w also compiles the sample app to make sure it's kept up to date.

NuGet.Config

@@ -9,7 +9,6 @@
     <add key="NuGet v3" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
-    <add key="AspNetVNext" value="true" />
     <add key="AspNetMaster" value="true" />
     <add key="NuGet v2" value="true" />
   </disabledPackageSources>

build.ps1

@@ -82,8 +82,8 @@ Remove-PathVariable "*Program Files\Microsoft DNX\DNVM*"
 Install-Dnvm
 
 # Install DNX
-dnvm install $dnxVersion -r CoreCLR -NoNative
-dnvm install $dnxVersion -r CLR -NoNative
+dnvm install $dnxVersion -r CoreCLR -NoNative -Unstable
+dnvm install $dnxVersion -r CLR -NoNative -Unstable
 dnvm use $dnxVersion -r CLR
 
 # Package restore
@@ -95,6 +95,7 @@ Write-Host "Build number:" $env:DNX_BUILD_VERSION
 
 # Build/package
 Get-ChildItem -Path .\src -Filter *.xproj -Recurse | ForEach-Object { Build-Project $_.DirectoryName }
+Get-ChildItem -Path .\samples -Filter *.xproj -Recurse | ForEach-Object { Build-Project $_.DirectoryName }
 
 # Publish tests so we can test without recompiling
 Get-ChildItem -Path .\test -Filter *.xproj -Exclude Autofac.Test.Scenarios.ScannedAssembly.xproj -Recurse | ForEach-Object -Begin { $TestIndex = 0 } -Process { Publish-TestProject -DirectoryName $_.DirectoryName -Index $TestIndex; $TestIndex++; }

global.json

@@ -1,4 +1,4 @@
 {
-  "sdk": { "version": "1.0.0-beta8" },
+  "sdk": { "version": "1.0.0-rc1-15838" },
   "sources": ["src", "test", "samples"]
 }

samples/AutofacWebApiSample/Startup.cs

@@ -3,7 +3,7 @@
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace AutofacWebApiSample
 {

samples/AutofacWebApiSample/project.json

@@ -3,12 +3,12 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "Microsoft.AspNet.Mvc": "6.0.0-beta7",
-    "Microsoft.AspNet.Server.IIS": "1.0.0-beta7",
-    "Microsoft.AspNet.Server.WebListener": "1.0.0-beta7",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-beta7",
-    "Autofac": "4.0.0-beta7-*",
-    "Autofac.Extensions.DependencyInjection": "4.0.0-beta8-*"
+    "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
+    "Microsoft.AspNet.Server.IIS": "1.0.0-beta8",
+    "Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-*",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
+    "Autofac": "4.0.0-rc1-*",
+    "Autofac.Extensions.DependencyInjection": "4.0.0-rc1-*"
   },
 
   "commands": {

src/Autofac.Extensions.DependencyInjection/AutofacRegistration.cs

@@ -27,7 +27,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Autofac.Builder;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Autofac.Extensions.DependencyInjection
 {

src/Autofac.Extensions.DependencyInjection/AutofacServiceScope.cs

@@ -24,7 +24,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 
 using System;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Autofac.Extensions.DependencyInjection
 {

src/Autofac.Extensions.DependencyInjection/AutofacServiceScopeFactory.cs

@@ -23,7 +23,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Autofac.Extensions.DependencyInjection
 {

src/Autofac.Extensions.DependencyInjection/project.json

@@ -1,5 +1,5 @@
 {
-    "version": "4.0.0-beta8-*",
+    "version": "4.0.0-rc1-*",
     "authors": ["Autofac Contributors"],
     "description": "Autofac implementation of the .NET Framework dependency injection abstraction.",
     "projectUrl": "http://autofac.org",
@@ -14,8 +14,8 @@
         "url": "https://github.com/autofac/Autofac"
     },
     "dependencies": {
-        "Autofac": "4.0.0-beta8-*",
-        "Microsoft.Framework.DependencyInjection.Abstractions": "1.0.0-beta8"
+        "Autofac": "4.0.0-rc1-*",
+        "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-*"
     },
     "frameworks": {
         "dnx451": { },

src/Autofac/project.json

@@ -1,5 +1,5 @@
 {
-    "version": "4.0.0-beta8-*",
+    "version": "4.0.0-rc1-*",
     "authors": ["Autofac Contributors"],
     "description": "Core assembly for the Autofac Inversion of Control container",
     "summary": "Autofac is an IoC container for Microsoft .NET. It manages the dependencies between classes so that applications stay easy to change as they grow in size and complexity.",

test/Autofac.Extensions.DependencyInjection.Test/AutofacRegistrationTests.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using Autofac.Core;
 using Autofac.Core.Lifetime;
-using Microsoft.Framework.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
 namespace Autofac.Extensions.DependencyInjection.Test

test/Autofac.Extensions.DependencyInjection.Test/Specification/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
     {
@@ -24,7 +24,6 @@ public void SingleServiceCanBeResolved()
             Assert.Equal("FakeServiceSimpleMethod", service.SimpleMethod());
         }
 
-        [Fact]
         public void ServiceInstanceCanBeResolved()
         {
             var container = CreateContainer();

test/Autofac.Extensions.DependencyInjection.Test/Specification/AutofacContainerTests.cs

@@ -4,9 +4,9 @@
 using System;
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
-using Microsoft.Framework.DependencyInjection.Tests.Fakes;
+using Microsoft.Extensions.DependencyInjection.Tests.Fakes;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Extensions.DependencyInjection.Tests
 {
     public class AutofacContainerTests : ScopingContainerTestBase
     {

test/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/Fakes/ClassWithAmbiguousCtors.cs

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

test/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/Fakes/ClassWithPrivateCtor.cs

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

test/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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/Autofac.Extensions.DependencyInjection.Test/Specification/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
     {