Cruft

khellang · khellang · commit 6e41bffab57a · 2016-07-14T16:04:04.000+02:00
diff --git a/NuGet.Config b/NuGet.Config
@@ -2,7 +2,6 @@
 
 <configuration>
     <packageSources>
-      <add key="myget.org xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
       <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
     </packageSources>
-</configuration>
+</configuration>
diff --git a/build.ps1 b/build.ps1
@@ -46,4 +46,4 @@ Get-ChildItem -Path .\test -Filter *.xproj -Recurse | ForEach-Object {
     Pop-Location
 }
 
-Pop-Location
+Pop-Location
diff --git a/src/StructureMap.Dnx/ContainerExtensions.cs b/src/StructureMap.Dnx/ContainerExtensions.cs
@@ -33,16 +33,15 @@ public static void Populate(this ConfigurationExpression config, IEnumerable<Ser
 
         private class AspNetConstructorSelector : IConstructorSelector
         {
-            public ConstructorInfo Find(Type pluggedType, DependencyCollection dependencies, PluginGraph graph)
-            {
-                return pluggedType.GetTypeInfo()
+            // ASP.NET expects registered services to be considered when selecting a ctor, SM doesn't by default.
+            public ConstructorInfo Find(Type pluggedType, DependencyCollection dependencies, PluginGraph graph) =>
+                pluggedType.GetTypeInfo()
                     .DeclaredConstructors
-                    .Select(ctor => Tuple.Create(ctor, ctor.GetParameters()))
-                    .Where(tuple => tuple.Item2.All(param => graph.HasFamily(param.ParameterType)))
-                    .OrderByDescending(tuple => tuple.Item2.Length)
-                    .Select(tuple => tuple.Item1)
+                    .Select(ctor => new { Constructor = ctor, Parameters = ctor.GetParameters() })
+                    .Where(x => x.Parameters.All(param => graph.HasFamily(param.ParameterType)))
+                    .OrderByDescending(x => x.Parameters.Length)
+                    .Select(x => x.Constructor)
                     .FirstOrDefault();
-            }
         }
     }
 }
diff --git a/src/StructureMap.Dnx/HelperExtensions.cs b/src/StructureMap.Dnx/HelperExtensions.cs
@@ -29,4 +29,4 @@ public static GenericFamilyExpression LifecycleIs(this GenericFamilyExpression i
             }
         }
     }
-}
+}
diff --git a/src/StructureMap.Dnx/ServiceCollectionRegistry.cs b/src/StructureMap.Dnx/ServiceCollectionRegistry.cs
@@ -54,4 +54,4 @@ private static Expression<Func<IContext, object>> CreateFactory(ServiceDescripto
             return context => descriptor.ImplementationFactory(context.GetInstance<IServiceProvider>());
         }
     }
-}
+}
diff --git a/src/StructureMap.Dnx/project.json b/src/StructureMap.Dnx/project.json
@@ -1,43 +1,35 @@
 ﻿{
-    "version": "0.5.1-rc2-final",
+  "version": "1.0.0",
 
-    "description": "StructureMap.Dnx",
-    "authors": [ "khellang" ],
+  "description": "StructureMap.Dnx",
+  "authors": ["khellang"],
 
-    "buildOptions": {
-        "warningsAsErrors": true,
-        "nowarn": [ "CS1591" ],
-        "xmlDoc": true
-    },
+  "buildOptions": {
+    "warningsAsErrors": true,
+    "nowarn": ["CS1591"],
+    "xmlDoc": true
+  },
 
-    "packOptions": {
-        "tags": [ "StructureMap", "DNX", "Dependency Injection", "DI", "IoC" ],
+  "packOptions": {
+    "tags": ["StructureMap", "DNX", "Dependency Injection", "DI", "IoC"],
 
-        "projectUrl": "https://github.com/structuremap/structuremap.dnx",
-        "licenseUrl": "https://github.com/structuremap/structuremap.dnx/blob/master/LICENSE",
+    "projectUrl": "https://github.com/structuremap/structuremap.dnx",
+    "licenseUrl": "https://github.com/structuremap/structuremap.dnx/blob/master/LICENSE",
 
-        "repository": {
-            "type": "git",
-            "url": "https://github.com/structuremap/structuremap.dnx"
-        }
-    },
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/structuremap/structuremap.dnx"
+    }
+  },
 
-    "dependencies": {
-        "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
-        "structuremap": "4.2.0.402"
-    },
+  "dependencies": {
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "structuremap": "4.2.0.402"
+  },
 
-    "frameworks": {
-        "netstandard1.0": {
-            "imports": [ "dotnet" ]
-        },
-        "netcore50": {
-            "dependencies": {
-                "Microsoft.NETCore.Platforms": {
-                    "type": "build",
-                    "version": "1.0.1"
-                }
-            }
-        }
+  "frameworks": {
+    "netstandard1.0": {
+      "imports": ["dotnet"]
     }
+  }
 }
diff --git a/test/StructureMap.Dnx.Tests/StructureMapContainerTests.cs b/test/StructureMap.Dnx.Tests/StructureMapContainerTests.cs
@@ -15,4 +15,4 @@ protected override IServiceProvider CreateServiceProvider(IServiceCollection ser
             return container.GetInstance<IServiceProvider>();
         }
     }
-}
+}
diff --git a/test/StructureMap.Dnx.Tests/project.json b/test/StructureMap.Dnx.Tests/project.json
@@ -1,36 +1,33 @@
 {
-    "dependencies": {
-        "dotnet-test-xunit": "2.2.0-preview2-build1029" ,
-        "Microsoft.Extensions.DependencyInjection.Specification.Tests": "1.0.0",
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "StructureMap.Dnx": { "target": "project" },
-        "xunit": "2.2.0-beta2-build3300"
-    },
+  "dependencies": {
+    "dotnet-test-xunit": "2.2.0-preview2-build1029",
+    "Microsoft.Extensions.DependencyInjection.Specification.Tests": "1.0.0",
+    "Microsoft.NETCore.Platforms": "1.0.1",
+    "StructureMap.Dnx": { "target": "project" },
+    "xunit": "2.2.0-beta2-build3300"
+  },
 
-    "testRunner": "xunit",
+  "testRunner": "xunit",
 
-    "frameworks": {
-        "net451": {
-            "frameworkAssemblies": {
-                "System.Runtime": {
-                    "type": "build"
-                }
-            },
-            "dependencies": {
-                "xunit.runner.console": "2.1.0"
-            }
-        },
-        "netcoreapp1.0": {
-            "imports": [
-                "dnxcore50",
-                "portable-net451+win8"
-            ],
-            "dependencies": {
-                "Microsoft.NETCore.App": {
-                    "version": "1.0.0",
-                    "type": "platform"
-                }
-            }
+  "frameworks": {
+    "net451": {
+      "frameworkAssemblies": {
+        "System.Runtime": {
+          "type": "build"
+        }
+      },
+      "dependencies": {
+        "xunit.runner.console": "2.1.0"
+      }
+    },
+    "netcoreapp1.0": {
+      "imports": [ "dotnet" ],
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0",
+          "type": "platform"
         }
+      }
     }
-}
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ Get-ChildItem -Path .\test -Filter *.xproj -Recurse \| ForEach-Object {`
`46`	`46`	`Pop-Location`
`47`	`47`	`}`
`48`	`48`
`49`		`-Pop-Location`
	`49`	`+Pop-Location`
Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,15 @@ public static void Populate(this ConfigurationExpression config, IEnumerable<Ser`
`33`	`33`
`34`	`34`	`private class AspNetConstructorSelector : IConstructorSelector`
`35`	`35`	`{`
`36`		`- public ConstructorInfo Find(Type pluggedType, DependencyCollection dependencies, PluginGraph graph)`
`37`		`- {`
`38`		`- return pluggedType.GetTypeInfo()`
	`36`	`+ // ASP.NET expects registered services to be considered when selecting a ctor, SM doesn't by default.`
	`37`	`+ public ConstructorInfo Find(Type pluggedType, DependencyCollection dependencies, PluginGraph graph) =>`
	`38`	`+ pluggedType.GetTypeInfo()`
`39`	`39`	`.DeclaredConstructors`
`40`		`- .Select(ctor => Tuple.Create(ctor, ctor.GetParameters()))`
`41`		`- .Where(tuple => tuple.Item2.All(param => graph.HasFamily(param.ParameterType)))`
`42`		`- .OrderByDescending(tuple => tuple.Item2.Length)`
`43`		`- .Select(tuple => tuple.Item1)`
	`40`	`+ .Select(ctor => new { Constructor = ctor, Parameters = ctor.GetParameters() })`
	`41`	`+ .Where(x => x.Parameters.All(param => graph.HasFamily(param.ParameterType)))`
	`42`	`+ .OrderByDescending(x => x.Parameters.Length)`
	`43`	`+ .Select(x => x.Constructor)`
`44`	`44`	`.FirstOrDefault();`
`45`		`- }`
`46`	`45`	`}`
`47`	`46`	`}`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ public static GenericFamilyExpression LifecycleIs(this GenericFamilyExpression i`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`-}`
	`32`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@ private static Expression<Func<IContext, object>> CreateFactory(ServiceDescripto`
`54`	`54`	`return context => descriptor.ImplementationFactory(context.GetInstance<IServiceProvider>());`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ protected override IServiceProvider CreateServiceProvider(IServiceCollection ser`
`15`	`15`	`return container.GetInstance<IServiceProvider>();`
`16`	`16`	`}`
`17`	`17`	`}`
`18`		`-}`
	`18`	`+}`