diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index 6476f2ea47..9204ae7c01 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/samples/MvcSample.Web/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Razor; #if DNX451 -using Microsoft.Framework.ConfigurationModel; +using Microsoft.Framework.Configuration; #endif using Microsoft.Framework.DependencyInjection; #if DNX451 @@ -54,7 +54,7 @@ namespace MvcSample.Web var configurationPath = Path.Combine(applicationEnvironment.ApplicationBasePath, "config.json"); // Set up configuration sources. - var configuration = new Configuration() + var configuration = new ConfigurationSection() .AddJsonFile(configurationPath) .AddEnvironmentVariables(); string diSystem; diff --git a/samples/MvcSample.Web/project.json b/samples/MvcSample.Web/project.json index 819204ebcc..75301e7a2d 100644 --- a/samples/MvcSample.Web/project.json +++ b/samples/MvcSample.Web/project.json @@ -23,7 +23,7 @@ "dnx451": { "dependencies": { "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*", - "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*" + "Microsoft.Framework.Configuration.Json": "1.0.0-*" } }, "dnxcore50": { diff --git a/src/Microsoft.AspNet.JsonPatch/project.json b/src/Microsoft.AspNet.JsonPatch/project.json index 0fcc66aebd..86168afd0f 100644 --- a/src/Microsoft.AspNet.JsonPatch/project.json +++ b/src/Microsoft.AspNet.JsonPatch/project.json @@ -1,23 +1,24 @@ { - "version": "1.0.0-*", - "dependencies": { - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", - "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, - "Newtonsoft.Json": "6.0.6" - }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { - "dependencies": { - "Microsoft.CSharp": "4.0.0-beta-*", - "System.Collections.Concurrent": "4.0.10-beta-*", - "System.ComponentModel.TypeConverter": "4.0.0-beta-*", - "System.Globalization": "4.0.10-beta-*", - "System.Reflection.Extensions": "4.0.0-beta-*", - "System.Runtime.Extensions": "4.0.10-beta-*", - "System.Text.Encoding.Extensions": "4.0.10-beta-*" - } - } + "version": "1.0.0-*", + "dependencies": { + "Microsoft.AspNet.Http.Extensions": "1.0.0-*", + "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }, + "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, + "Newtonsoft.Json": "6.0.6" + }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { + "dependencies": { + "Microsoft.CSharp": "4.0.0-beta-*", + "System.Collections.Concurrent": "4.0.10-beta-*", + "System.ComponentModel.TypeConverter": "4.0.0-beta-*", + "System.Globalization": "4.0.10-beta-*", + "System.Reflection.Extensions": "4.0.0-beta-*", + "System.Resources.ResourceManager": "4.0.0-beta-*", + "System.Runtime.Extensions": "4.0.10-beta-*", + "System.Text.Encoding.Extensions": "4.0.10-beta-*" + } } + } } diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs index b888047268..e6faccdca0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc { /// /// Caches instances produced by - /// . + /// . /// public class DefaultTypeActivatorCache : ITypeActivatorCache { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json index 597944f135..53d2523762 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json @@ -37,7 +37,7 @@ "Microsoft.AspNet.Mvc.Xml": "6.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*", "Microsoft.AspNet.WebUtilities": "1.0.0-*", - "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*", + "Microsoft.Framework.Configuration.Json": "1.0.0-*", "ModelBindingWebSite": "1.0.0", "MvcSample.Web": "1.0.0", "MvcTagHelpersWebSite": "1.0.0", diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index 3bdb0bb4e9..675c648bd2 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers; -using Microsoft.Framework.ConfigurationModel; +using Microsoft.Framework.Configuration; using Microsoft.Framework.DependencyInjection; using Xunit; diff --git a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json index 6c564c37b4..a998c35bd8 100644 --- a/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json @@ -3,7 +3,7 @@ "Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", - "Microsoft.Framework.ConfigurationModel": "1.0.0-*", + "Microsoft.Framework.Configuration": "1.0.0-*", "Microsoft.Framework.DependencyInjection": "1.0.0-*" }, "frameworks": {