Update DI dependency.

This commit is contained in:
Chris Ross 2014-05-06 11:11:00 -07:00
parent f72de34e10
commit 3b57674141
15 changed files with 34 additions and 43 deletions

View File

@ -17,10 +17,10 @@
using System; using System;
using System.Threading; using System.Threading;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.Hosting.Builder; using Microsoft.AspNet.Hosting.Builder;
using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup; using Microsoft.AspNet.Hosting.Startup;
using Microsoft.Framework.DependencyInjection;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting
{ {

View File

@ -16,12 +16,12 @@
// permissions and limitations under the License. // permissions and limitations under the License.
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.Hosting.Builder; using Microsoft.AspNet.Hosting.Builder;
using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup; using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Security.DataProtection; using Microsoft.AspNet.Security.DataProtection;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.Framework.DependencyInjection;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting
{ {

View File

@ -18,8 +18,8 @@
using System; using System;
using System.IO; using System.IO;
using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.ConfigurationModel;
using Microsoft.AspNet.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.Framework.DependencyInjection.Fallback;
using Microsoft.Net.Runtime; using Microsoft.Net.Runtime;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting

View File

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

View File

@ -20,7 +20,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
namespace Microsoft.AspNet.Hosting.Startup namespace Microsoft.AspNet.Hosting.Startup

View File

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

View File

@ -1,7 +1,7 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Microsoft.Framework.ConfigurationModel": "0.1-alpha-*", "Microsoft.Framework.ConfigurationModel": "0.1-alpha-*",
"Microsoft.AspNet.PipelineCore": "0.1-alpha-*", "Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*", "Microsoft.AspNet.Http": "0.1-alpha-*",

View File

@ -16,13 +16,12 @@
// permissions and limitations under the License. // permissions and limitations under the License.
using System; using System;
using System.Reflection;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.AspNet.Http; using System.Reflection;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.RequestContainer; using Microsoft.AspNet.RequestContainer;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
namespace Microsoft.AspNet.Builder namespace Microsoft.AspNet.Builder
{ {

View File

@ -20,9 +20,9 @@ using System;
using System.Runtime.Remoting.Messaging; using System.Runtime.Remoting.Messaging;
#endif #endif
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using Microsoft.Framework.DependencyInjection;
namespace Microsoft.AspNet.RequestContainer namespace Microsoft.AspNet.RequestContainer
{ {

View File

@ -1,7 +1,7 @@
{ {
"version": "0.1-alpha-*", "version": "0.1-alpha-*",
"dependencies": { "dependencies": {
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*", "Microsoft.Framework.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*" "Microsoft.AspNet.Http": "0.1-alpha-*"
}, },
"configurations": { "configurations": {

View File

@ -17,17 +17,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Versioning;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Builder;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Hosting.Server; using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup; using Microsoft.AspNet.Hosting.Startup;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
using Microsoft.Net.Runtime; using Microsoft.Net.Runtime;
using Microsoft.AspNet.Builder;
namespace Microsoft.AspNet.TestHost namespace Microsoft.AspNet.TestHost
{ {

View File

@ -18,13 +18,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Hosting.Server;
using Xunit;
using Microsoft.AspNet.Builder; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.Framework.ConfigurationModel;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
using Xunit;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting
{ {

View File

@ -15,12 +15,11 @@
// See the Apache 2 License for the specific language governing // See the Apache 2 License for the specific language governing
// permissions and limitations under the License. // permissions and limitations under the License.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback;
using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Hosting.Fakes; using Microsoft.AspNet.Hosting.Fakes;
using Microsoft.AspNet.Hosting.Startup;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Hosting namespace Microsoft.AspNet.Hosting

View File

@ -18,14 +18,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.Versioning;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.Framework.DependencyInjection.Fallback;
using Microsoft.Net.Runtime; using Microsoft.Net.Runtime;
using Xunit; using Xunit;
using Microsoft.AspNet.Builder;
namespace Microsoft.AspNet.TestHost.Tests namespace Microsoft.AspNet.TestHost.Tests
{ {

View File

@ -17,14 +17,12 @@
using System; using System;
using System.IO; using System.IO;
using System.Runtime.Versioning;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Builder;
using Microsoft.AspNet.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.AspNet.DependencyInjection.Fallback; using Microsoft.Framework.DependencyInjection.Fallback;
using Microsoft.Net.Runtime; using Microsoft.Net.Runtime;
using Xunit; using Xunit;
using Microsoft.AspNet.Builder;
namespace Microsoft.AspNet.TestHost.Tests namespace Microsoft.AspNet.TestHost.Tests
{ {