Remove dependency on DependencyInjection and instead use DependencyInjection.Interfaces on Http.Extensions

Praburaj · Praburaj · commit 702e9a7af37a · 2015-03-15T21:28:13.000-07:00
Fixes: aspnet/HttpAbstractions#228
diff --git a/DependencyInjection.sln b/DependencyInjection.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22613.0
+VisualStudioVersion = 14.0.22710.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D26F6F80-63EE-4081-A814-EF3DBABE24D9}"
 EndProject
diff --git a/src/Microsoft.Framework.DependencyInjection.Interfaces/ActivatorUtilities.cs b/src/Microsoft.Framework.DependencyInjection.Interfaces/ActivatorUtilities.cs
@@ -6,6 +6,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.ExceptionServices;
+using Microsoft.Framework.DependencyInjection.Interfaces;
 
 namespace Microsoft.Framework.DependencyInjection
 {
diff --git a/src/Microsoft.Framework.DependencyInjection.Interfaces/ObjectFactory.cs b/src/Microsoft.Framework.DependencyInjection.Interfaces/ObjectFactory.cs
diff --git a/src/Microsoft.Framework.DependencyInjection.Interfaces/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.DependencyInjection.Interfaces/Properties/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+﻿// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.Framework.DependencyInjection.Tests")]
diff --git a/src/Microsoft.Framework.DependencyInjection.Interfaces/Properties/Resources.Designer.cs b/src/Microsoft.Framework.DependencyInjection.Interfaces/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.Framework.DependencyInjection.Interfaces/Resources.resx b/src/Microsoft.Framework.DependencyInjection.Interfaces/Resources.resx
@@ -117,6 +117,18 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="AmbiguousConstructorMatch" xml:space="preserve">
+    <value>Multiple constructors accepting all given argument types have been found in type '{0}'. There should only be one applicable constructor.</value>
+    <comment>{0} = service type</comment>
+  </data>
+  <data name="CannotLocateImplementation" xml:space="preserve">
+    <value>Unable to locate implementation '{0}' for service '{1}'.</value>
+    <comment>{0} = implementation type, {1} = service type</comment>
+  </data>
+  <data name="CannotResolveService" xml:space="preserve">
+    <value>Unable to resolve service for type '{0}' while attempting to activate '{1}'.</value>
+    <comment>{0} = service which cannot be resolved, {1} = service being activated</comment>
+  </data>
   <data name="NoConstructorMatch" xml:space="preserve">
     <value>Unable to locate suitable constructor for type '{0}'. Ensure the type is concrete and all parameters are accepted by a constructor.</value>
     <comment>{0} = service type</comment>
diff --git a/src/Microsoft.Framework.DependencyInjection.Interfaces/project.json b/src/Microsoft.Framework.DependencyInjection.Interfaces/project.json
@@ -14,6 +14,7 @@
                 "System.Diagnostics.Debug": "4.0.10-beta-*",
                 "System.Globalization": "4.0.10-beta-*",
                 "System.Linq": "4.0.0-beta-*",
+                "System.Linq.Expressions": "4.0.10-beta-*",
                 "System.Reflection": "4.0.10-beta-*",
                 "System.Resources.ResourceManager": "4.0.0-beta-*"
             }
@@ -24,6 +25,7 @@
                 "System.Diagnostics.Debug": "",
                 "System.Globalization": "",
                 "System.Linq": "",
+                "System.Linq.Expressions": "",
                 "System.Runtime": "",
                 "System.Reflection": "",
                 "System.Resources.ResourceManager": ""
diff --git a/src/Microsoft.Framework.DependencyInjection/Properties/Resources.Designer.cs b/src/Microsoft.Framework.DependencyInjection/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.Framework.DependencyInjection/Resources.resx b/src/Microsoft.Framework.DependencyInjection/Resources.resx
@@ -117,14 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AmbiguousConstructorMatch" xml:space="preserve">
-    <value>Multiple constructors accepting all given argument types have been found in type '{0}'. There should only be one applicable constructor.</value>
-    <comment>{0} = service type</comment>
-  </data>
-  <data name="CannotLocateImplementation" xml:space="preserve">
-    <value>Unable to locate implementation '{0}' for service '{1}'.</value>
-    <comment>{0} = implementation type, {1} = service type</comment>
-  </data>
   <data name="CannotResolveService" xml:space="preserve">
     <value>Unable to resolve service for type '{0}' while attempting to activate '{1}'.</value>
     <comment>{0} = service which cannot be resolved, {1} = service being activated</comment>
@@ -133,12 +125,4 @@
     <value>A circular dependency was detected for the service of type '{0}'.</value>
     <comment>{0} = service type with circular dependency</comment>
   </data>
-  <data name="NoConstructorMatch" xml:space="preserve">
-    <value>Unable to locate suitable constructor for type '{0}'. Ensure the type is concrete and all parameters are accepted by a constructor.</value>
-    <comment>{0} = service type</comment>
-  </data>
-  <data name="NoServiceRegistered" xml:space="preserve">
-    <value>No service for type '{0}' has been registered.</value>
-    <comment>{0} = service type</comment>
-  </data>
 </root>
diff --git a/src/Microsoft.Framework.DependencyInjection/ServiceCollection.cs b/src/Microsoft.Framework.DependencyInjection/ServiceCollection.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Open Technologies, Inc. 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;
 using System.Collections.Generic;
-using Microsoft.Framework.Internal;
 
 namespace Microsoft.Framework.DependencyInjection
 {
diff --git a/src/Microsoft.Framework.DependencyInjection/ServiceCollectionExtensions.cs b/src/Microsoft.Framework.DependencyInjection/ServiceCollectionExtensions.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Framework.Internal;
 
 namespace Microsoft.Framework.DependencyInjection
 {
diff --git a/src/Microsoft.Framework.DependencyInjection/ServiceProvider.cs b/src/Microsoft.Framework.DependencyInjection/ServiceProvider.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading;
diff --git a/src/Microsoft.Framework.DependencyInjection/project.json b/src/Microsoft.Framework.DependencyInjection/project.json
@@ -12,16 +12,13 @@
         "dnxcore50": {
             "dependencies": {
                 "System.Collections.Concurrent": "4.0.10-beta-*",
-                "System.Linq.Expressions": "4.0.10-beta-*",
                 "System.Threading": "4.0.10-beta-*",
                 "System.Threading.Tasks": "4.0.10-beta-*"
             }
         },
         ".NETPortable,Version=v4.6,Profile=Profile151": {
             "frameworkAssemblies": {
                 "System.Collections.Concurrent": "",
-                "System.ComponentModel": "",
-                "System.Linq.Expressions": "",
                 "System.Threading": "",
                 "System.Threading.Tasks": ""
             }
diff --git a/test/Microsoft.Framework.DependencyInjection.Tests/ActivatorUtilitiesTests.cs b/test/Microsoft.Framework.DependencyInjection.Tests/ActivatorUtilitiesTests.cs
@@ -7,7 +7,7 @@
 using Microsoft.Framework.DependencyInjection.Tests.Fakes;
 using Xunit;
 
-namespace Microsoft.Framework.DependencyInjection.Tests
+namespace Microsoft.Framework.DependencyInjection.Interfaces.Tests
 {
     public class ActivatorUtilitiesTests
     {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Linq.Expressions;`
`7`	`7`	`using System.Reflection;`
`8`	`8`	`using System.Runtime.ExceptionServices;`
	`9`	`+using Microsoft.Framework.DependencyInjection.Interfaces;`
`9`	`10`
`10`	`11`	`namespace Microsoft.Framework.DependencyInjection`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-using System;`
`5`	`4`	`using System.Collections;`
`6`	`5`	`using System.Collections.Generic;`
`7`		`-using Microsoft.Framework.Internal;`
`8`	`6`
`9`	`7`	`namespace Microsoft.Framework.DependencyInjection`
`10`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using Microsoft.Framework.Internal;`
`6`	`5`
`7`	`6`	`namespace Microsoft.Framework.DependencyInjection`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Microsoft.Framework.DependencyInjection.Tests.Fakes;`
`8`	`8`	`using Xunit;`
`9`	`9`
`10`		`-namespace Microsoft.Framework.DependencyInjection.Tests`
	`10`	`+namespace Microsoft.Framework.DependencyInjection.Interfaces.Tests`
`11`	`11`	`{`
`12`	`12`	`public class ActivatorUtilitiesTests`
`13`	`13`	`{`