huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to aspnet/Configuration #195,#198 and fix few minor build break issues

This commit is contained in:
Kirthi Krishnamraju 2015-05-20 20:01:23 -07:00
parent fa56df93c3
commit 337bbad51d
7 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/MvcSample.Web/Startup.cs
View File

@ -10,7 +10,7 @@ using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc;
using Microsoft.AspNet.Mvc.Razor; using Microsoft.AspNet.Mvc.Razor;
#if DNX451 #if DNX451
using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.Configuration;
#endif #endif
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
#if DNX451 #if DNX451
@ -54,7 +54,7 @@ namespace MvcSample.Web
var configurationPath = Path.Combine(applicationEnvironment.ApplicationBasePath, "config.json"); var configurationPath = Path.Combine(applicationEnvironment.ApplicationBasePath, "config.json");
// Set up configuration sources. // Set up configuration sources.
var configuration = new Configuration() var configuration = new ConfigurationSection()
.AddJsonFile(configurationPath) .AddJsonFile(configurationPath)
.AddEnvironmentVariables(); .AddEnvironmentVariables();
string diSystem; string diSystem;

2
samples/MvcSample.Web/project.json
View File

@ -23,7 +23,7 @@
"dnx451": { "dnx451": {
"dependencies": { "dependencies": {
"Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*", "Microsoft.Framework.DependencyInjection.Autofac": "1.0.0-*",
"Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*" "Microsoft.Framework.Configuration.Json": "1.0.0-*"
} }
}, },
"dnxcore50": { "dnxcore50": {

41
src/Microsoft.AspNet.JsonPatch/project.json
View File

@ -1,23 +1,24 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.NotNullAttribute.Sources": { "version": "1.0.0-*", "type": "build" },
"Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" }, "Microsoft.Framework.PropertyHelper.Sources": { "version": "1.0.0-*", "type": "build" },
"Newtonsoft.Json": "6.0.6" "Newtonsoft.Json": "6.0.6"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": { },
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.0-beta-*", "Microsoft.CSharp": "4.0.0-beta-*",
"System.Collections.Concurrent": "4.0.10-beta-*", "System.Collections.Concurrent": "4.0.10-beta-*",
"System.ComponentModel.TypeConverter": "4.0.0-beta-*", "System.ComponentModel.TypeConverter": "4.0.0-beta-*",
"System.Globalization": "4.0.10-beta-*", "System.Globalization": "4.0.10-beta-*",
"System.Reflection.Extensions": "4.0.0-beta-*", "System.Reflection.Extensions": "4.0.0-beta-*",
"System.Runtime.Extensions": "4.0.10-beta-*", "System.Resources.ResourceManager": "4.0.0-beta-*",
"System.Text.Encoding.Extensions": "4.0.10-beta-*" "System.Runtime.Extensions": "4.0.10-beta-*",
} "System.Text.Encoding.Extensions": "4.0.10-beta-*"
} }
} }
}
} }

2
src/Microsoft.AspNet.Mvc.Core/DefaultTypeActivatorCache.cs
View File

@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc
{ {
/// <summary> /// <summary>
/// Caches <see cref="ObjectFactory"/> instances produced by /// Caches <see cref="ObjectFactory"/> instances produced by
/// <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>. /// <see cref="Microsoft.Framework.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
/// </summary> /// </summary>
public class DefaultTypeActivatorCache : ITypeActivatorCache public class DefaultTypeActivatorCache : ITypeActivatorCache
{ {

2
test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
View File

@ -37,7 +37,7 @@
"Microsoft.AspNet.Mvc.Xml": "6.0.0-*", "Microsoft.AspNet.Mvc.Xml": "6.0.0-*",
"Microsoft.AspNet.TestHost": "1.0.0-*", "Microsoft.AspNet.TestHost": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "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", "ModelBindingWebSite": "1.0.0",
"MvcSample.Web": "1.0.0", "MvcSample.Web": "1.0.0",
"MvcTagHelpersWebSite": "1.0.0", "MvcTagHelpersWebSite": "1.0.0",

2
test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers; using Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers;
using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.Configuration;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Xunit; using Xunit;

2
test/WebSites/Microsoft.AspNet.Mvc.TestConfiguration/project.json
View File

@ -3,7 +3,7 @@
"Microsoft.AspNet.Http": "1.0.0-*", "Microsoft.AspNet.Http": "1.0.0-*",
"Microsoft.AspNet.Http.Extensions": "1.0.0-*", "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
"Microsoft.AspNet.Testing": "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-*" "Microsoft.Framework.DependencyInjection": "1.0.0-*"
}, },
"frameworks": { "frameworks": {