[WIP] Add support for .NET Core

.gitignore

@@ -7,7 +7,7 @@ src/*/obj
 src/*/bin
 samples/*/obj
 samples/*/bin
-*.csproj.user
+*.user
 *ReSharper.user
 _ReSharper*
 *resharper*
@@ -19,4 +19,7 @@ _ReSharper*
 *.orig
 *.bak
 *.sln.DotSettings.user
-*.DotSettings.user
+*.DotSettings.user
+
+project.lock.json
+.vs

Castle.Windsor-NetCore.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Castle.Windsor", "src\Castle.Windsor\Castle.Windsor.xproj", "{6C92C875-3E3B-4CE3-A46D-FB309AC28557}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6C92C875-3E3B-4CE3-A46D-FB309AC28557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C92C875-3E3B-4CE3-A46D-FB309AC28557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C92C875-3E3B-4CE3-A46D-FB309AC28557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C92C875-3E3B-4CE3-A46D-FB309AC28557}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

src/Castle.Windsor/AutoregisterPerWebRequestLifestyleModule.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if !(SILVERLIGHT || CLIENTPROFILE || DOTNET35)
+#if !(SILVERLIGHT || CLIENTPROFILE || DOTNET35 || NETCORE)
 
 using System.Web;
 

src/Castle.Windsor/Castle.Windsor.csproj

@@ -26,7 +26,7 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <OutputPath>bin\NET40-Release\</OutputPath>
-    <DefineConstants>TRACE;DOTNET DOTNET40 </DefineConstants>
+    <DefineConstants>TRACE;DOTNET DOTNET40 FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_LEGACY_REFLECTION_API FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\NET40-Release\Castle.Windsor.XML</DocumentationFile>
     <Optimize>true</Optimize>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
     </TargetFrameworkProfile>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\NET40-Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DOTNET DOTNET40 </DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DOTNET DOTNET40 FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_LEGACY_REFLECTION_API FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\NET40-Debug\Castle.Windsor.XML</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591</NoWarn>
@@ -69,7 +69,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NET45-Release|AnyCPU'">
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>bin\NET45-Release\</OutputPath>
-    <DefineConstants>TRACE;DOTNET;DOTNET45</DefineConstants>
+    <DefineConstants>TRACE;DOTNET;DOTNET45 FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\NET45-Release\Castle.Windsor.XML</DocumentationFile>
     <Optimize>true</Optimize>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -82,7 +82,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\NET45-Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DOTNET;DOTNET45</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DOTNET;DOTNET45 FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\NET45-Debug\Castle.Windsor.XML</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591</NoWarn>
@@ -94,7 +94,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <OutputPath>bin\NET40CP-Release\</OutputPath>
-    <DefineConstants>TRACE;DOTNET DOTNET40 CLIENTPROFILE</DefineConstants>
+    <DefineConstants>TRACE;DOTNET DOTNET40 CLIENTPROFILE FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_LEGACY_REFLECTION_API FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\Release\Castle.Windsor.XML</DocumentationFile>
     <Optimize>true</Optimize>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -117,7 +117,7 @@
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\NET40CP-Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DOTNET DOTNET40 CLIENTPROFILE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DOTNET DOTNET40 CLIENTPROFILE FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_LEGACY_REFLECTION_API FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\Debug\Castle.Windsor.XML</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591</NoWarn>
@@ -138,7 +138,7 @@
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <OutputPath>bin\NET35-Release\</OutputPath>
-    <DefineConstants>TRACE;DOTNET DOTNET35</DefineConstants>
+    <DefineConstants>TRACE;DOTNET DOTNET35 FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_LEGACY_REFLECTION_API FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\NET35-Release\Castle.Windsor.XML</DocumentationFile>
     <Optimize>true</Optimize>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -162,7 +162,7 @@
     </TargetFrameworkProfile>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\NET35-Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DOTNET DOTNET35</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DOTNET DOTNET35 FEATURE_APPDOMAIN FEATURE_GAC FEATURE_ISUPPORTINITIALIZE FEATURE_LEGACY_REFLECTION_API FEATURE_PERFCOUNTERS FEATURE_REMOTING FEATURE_SECURITY_PERMISSIONS FEATURE_SERIALIZATION FEATURE_SYSTEM_CONFIGURATION</DefineConstants>
     <DocumentationFile>bin\NET35-Debug\Castle.Windsor.XML</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1591</NoWarn>
@@ -341,6 +341,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Compatibility\CustomAttributeExtensions.cs" />
+    <Compile Include="Compatibility\IntrospectionExtensions.cs" />
+    <Compile Include="Compatibility\NetCoreReflectionExtensions.cs" />
     <Compile Include="Core\Internal\SimpleThreadSafeCollection.cs" />
     <Compile Include="Core\Internal\SimpleThreadSafeSet.cs" />
     <Compile Include="Facilities\Startable\IStartFlagInternal.cs" />

src/Castle.Windsor/Castle.Windsor.xproj

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6c92c875-3e3b-4ce3-a46d-fb309ac28557</ProjectGuid>
+    <RootNamespace>Castle.Windsor</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

src/Castle.Windsor/Compatibility/CustomAttributeExtensions.cs

@@ -0,0 +1,63 @@
+// Copyright 2004-2015 Castle Project - http://www.castleproject.org/
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if FEATURE_LEGACY_REFLECTION_API
+
+namespace System.Reflection
+{
+	using System.Collections.Generic;
+
+	// This allows us to use the new reflection API while still supporting .NET 3.5 and 4.0.
+	//
+	// Methods like Attribute.IsDefined no longer exist in .NET Core so this provides a shim
+	// for .NET 3.5 and 4.0.
+	//
+	// This class only implemented the required extensions so add more if needed in the order
+	// from https://github.com/dotnet/corefx/blob/master/src/System.Reflection.Extensions/ref/System.Reflection.Extensions.cs
+	internal static class CustomAttributeExtensions
+	{
+		public static IEnumerable<T> GetCustomAttributes<T>(this Assembly element) where T : Attribute
+		{
+			foreach (T a in Attribute.GetCustomAttributes(element, typeof(T)))
+			{
+				yield return a;
+			}
+		}
+
+		public static IEnumerable<T> GetCustomAttributes<T>(this MemberInfo element, bool inherit) where T : Attribute
+		{
+			foreach (T a in Attribute.GetCustomAttributes(element, typeof(T), inherit))
+			{
+				yield return a;
+			}
+		}
+
+		public static bool IsDefined(this MemberInfo element, Type attributeType)
+		{
+			return Attribute.IsDefined(element, attributeType);
+		}
+
+		public static bool IsDefined(this ParameterInfo element, Type attributeType)
+		{
+			return Attribute.IsDefined(element, attributeType);
+		}
+
+        public static bool IsDefined(this ConstructorInfo element, Type attributeType)
+        {
+            return Attribute.IsDefined(element, attributeType);
+        }
+    }
+}
+
+#endif

src/Castle.Windsor/Compatibility/IntrospectionExtensions.cs

@@ -0,0 +1,35 @@
+// Copyright 2004-2015 Castle Project - http://www.castleproject.org/
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if FEATURE_LEGACY_REFLECTION_API
+
+namespace System.Reflection
+{
+	internal static class IntrospectionExtensions
+	{
+		// This allows us to use the new reflection API which separates Type and TypeInfo
+		// while still supporting .NET 3.5 and 4.0. This class matches the API of the same
+		// class in .NET 4.5+, and so is only needed on .NET Framework versions before that.
+		//
+		// Return the System.Type for now, we will probably need to create a TypeInfo class
+		// which inherits from Type like .NET 4.5+ and implement the additional methods and
+		// properties.
+		public static Type GetTypeInfo(this Type type)
+		{
+			return type;
+		}
+	}
+}
+
+#endif

src/Castle.Windsor/Compatibility/NetCoreReflectionExtensions.cs

@@ -0,0 +1,59 @@
+// Copyright 2004-2015 Castle Project - http://www.castleproject.org/
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if FEATURE_NETCORE_REFLECTION_API
+
+namespace System.Reflection
+{
+	using System.Linq;
+
+	internal static class NetCoreReflectionExtensions
+	{
+		// .NET Core needs to expose GetConstructor that takes both flags and parameter types,
+		// because we need to get the private constructor for a type with multiple constructors.
+		// It should also provide the same for GetMethod, which luckily we don't need yet.
+		public static ConstructorInfo GetConstructor(this Type type, BindingFlags bindingAttr, object binder, Type[] types, object[] modifiers)
+		{
+			if (binder != null) throw new NotSupportedException("Parameter binder must be null.");
+			if (modifiers != null) throw new NotSupportedException("Parameter modifiers must be null.");
+
+			return type.GetConstructors(bindingAttr)
+				.SingleOrDefault(ctor => ctor.GetParameters().Select(p => p.ParameterType).SequenceEqual(types));
+		}
+
+        public static PropertyInfo GetProperty(this Type type, string name, BindingFlags bindingAttr, object binder, Type returnType, Type[] types, ParameterModifier[] modifiers)
+        {
+            if (binder != null) throw new NotSupportedException("Parameter binder must be null.");
+            if (modifiers != null) throw new NotSupportedException("Parameter modifiers must be null.");
+
+            var property = type.GetProperty(name, bindingAttr);
+            if (property.PropertyType == returnType)
+                return property;
+            return null;
+        }
+
+        public static MethodInfo GetMethod(this Type type, string name, BindingFlags bindingAttr, object binder, Type[] types, ParameterModifier[] modifiers)
+        {
+            if (binder != null) throw new NotSupportedException("Parameter binder must be null.");
+            if (modifiers != null) throw new NotSupportedException("Parameter modifiers must be null.");
+
+            var method = type.GetMethod(name, bindingAttr);
+            if (method.GetParameters().Select(p => p.ParameterType).SequenceEqual(types))
+                return method;
+            return null;
+        }
+    }
+}
+
+#endif

src/Castle.Windsor/Core/CastleComponentAttribute.cs

@@ -15,6 +15,7 @@
 namespace Castle.Core
 {
 	using System;
+    using System.Reflection;
 
 	/// <summary>
 	///   This attribute is useful only when you want to register all components
@@ -58,8 +59,13 @@ public bool HasName
 
 		public static CastleComponentAttribute GetDefaultsFor(Type type)
 		{
-			var attribute = (CastleComponentAttribute)GetCustomAttribute(type, typeof(CastleComponentAttribute));
-			if (attribute != null)
+#if FEATURE_LEGACY_REFLECTION_API
+            var attribute = (CastleComponentAttribute)GetCustomAttribute(type, typeof(CastleComponentAttribute));
+#else
+            var attribute = type.GetTypeInfo().GetCustomAttribute(typeof(CastleComponentAttribute)) as CastleComponentAttribute;
+#endif
+
+            if (attribute != null)
 			{
 				if (attribute.ServicesSpecifiedExplicitly == false)
 				{

src/Castle.Windsor/Core/ComponentDependencyModel.cs

@@ -16,8 +16,10 @@ namespace Castle.Core
 {
 	using System;
 
+#if FEATURE_SERIALIZATION
 	[Serializable]
-	public class ComponentDependencyModel : DependencyModel
+#endif
+    public class ComponentDependencyModel : DependencyModel
 	{
 		public ComponentDependencyModel(string referencedComponentName) : this(referencedComponentName, null)
 		{