added OWIN support for WebApi

Ninject.Web.WebApi.build

@@ -11,8 +11,8 @@
 	<property name="dependencies" value="Ninject,Ninject.Web.Common,Ninject.Extensions.NamedScope,Ninject.Extensions.ContextPreservation"  overwrite="false"/>
 
 	<include buildfile="Ninject.include" />
-	<target name="all" depends="core selfhost"/>
-	<target name="nuget-all" depends="nuget-webapi nuget-selfhost nuget-webhost"/>
+	<target name="all" depends="core selfhost owinhost"/>
+	<target name="nuget-all" depends="nuget-webapi nuget-selfhost nuget-webhost nuget-owinhost"/>
 
 	<target name="core" depends="init">
 		<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
@@ -38,6 +38,62 @@
 		</csc>
 	</target>
 
+  <target name="owinhost" depends="core" if="${not(string::contains(build.platform, 'net-3.5')) 
+		and not(string::contains(build.platform, 'net-4.0'))
+		and not(string::contains(build.platform, 'mono-2.0')) 
+		and not(string::contains(build.platform, 'mono-3.5'))
+		and not(string::contains(build.platform, 'mono-4.0'))}">
+		<property name="current.path.build.extensions" value="${path.build}/${build.platform}/${build.config}/extensions"/>
+		<mkdir dir="${current.path.build.extensions}" if="${not(directory::exists(current.path.build.extensions))}"/>
+
+		<property name="packagepath.Owin" value="Owin.*/lib/net40" if="${string::contains(build.platform, 'net-4.5')}" />
+		<property name="current.path.lib.Owin" value="${path.packages}/${packagepath.Owin}"/>
+		<copy todir="${current.path.build}/Owin/lib">
+			<fileset basedir="${path.packages}">
+				<include name="${packagepath.Owin}/*.dll"/>
+				<include name="${packagepath.Owin}/*.xml"/>
+			</fileset>
+		</copy> 
+
+		<property name="packagepath.Microsoft.Owin" value="Microsoft.Owin.*/lib/net45" if="${string::contains(build.platform, 'net-4.5')}" />
+		<property name="current.path.lib.Microsoft.Owin" value="${path.packages}/${packagepath.Microsoft.Owin}"/>
+		<copy todir="${current.path.build}/Microsoft.Owin/lib">
+			<fileset basedir="${path.packages}">
+				<include name="${packagepath.Microsoft.Owin}/*.dll"/>
+				<include name="${packagepath.Microsoft.Owin}/*.xml"/>
+			</fileset>
+		</copy> 
+
+		<property name="current.path.build.extensions" value="${path.build}/${build.platform}/${build.config}/extensions"/>
+		<mkdir dir="${current.path.build.extensions}" if="${not(directory::exists(current.path.build.extensions))}"/>
+
+		<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" 
+		     output="${current.path.build}/${product.name}.SelfHost.dll" doc="${current.path.build}/${product.name}.SelfHost.xml" keyfile="${path.src}/${product.keyfile}">
+			<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
+			<sources basedir="${path.src}">
+				<include name="${build.asminfo}"/>
+				<include name="${product.name}.OwinHost/**/*.cs"/>
+			</sources>
+			<references basedir="${current.path.build}">
+       				<include name="mscorlib.dll"/>
+				<include name="System.dll"/>
+				<include name="System.Core.dll"/>
+				<include name="System.Web.dll"/>
+				<include name="${path.packages}/Microsoft.Net.Http.*/lib/net40/System.Net.Http.dll"/>
+				<include name="${path.packages}/Microsoft.AspNet.WebApi.Core.*/lib/net45/System.Web.Http.dll"/>
+				<include name="${path.lib}/Ninject/${build.platform}/Ninject.dll"/>
+				<include name="${path.lib}/Ninject.Web.Common/${build.platform}/Ninject.Web.Common.dll"/>
+				<include name="${path.lib}/Ninject.Extensions.ContextPreservation/${build.platform}/Ninject.Extensions.ContextPreservation.dll"/>
+				<include name="${path.lib}/Ninject.Extensions.NamedScope/${build.platform}/Ninject.Extensions.NamedScope.dll"/>
+				<include name="${current.path.build}/${product.assembly}"/>
+
+        <include name="${current.path.lib.Owin}/Owin.dll" />
+				<include name="${current.path.lib.Microsoft.Owin}/Microsoft.Owin.dll" />
+				<include name="${current.path.build}/${product.assembly}"/>
+			</references>
+		</csc>
+	</target>
+
 	<target name="selfhost" depends="core">
 		<property name="current.path.build.extensions" value="${path.build}/${build.platform}/${build.config}/extensions"/>
 		<mkdir dir="${current.path.build.extensions}" if="${not(directory::exists(current.path.build.extensions))}"/>
@@ -119,4 +175,21 @@
 		<property name="nant.settings.currentframework" value="net-4.0"/>
 		<call target="nuget-run"/>
 	</target>	
+
+	<target name="nuget-owinhost">
+		<property name="nuget.sourcedir" value="${path.base}/nuget-owinhost" />
+		<property name="nuget.basedir" value="${path.base}/build/nuget-owinhost" />
+		<property name="nuget.platforms" value="net-4.5" />
+		<property name="nuget.name" value="${product.name}.OwinHost" />
+		<property name="nuget.releaseDirectory" value="${path.build}\${build.platform}\release" dynamic="true"/>
+		<property name="nuget.dependencies" value="${product.name}" />
+		<property name="nuget.additionalFiles" value="-" />
+		<property name="nuget.packageName" value="${nuget.name}${product.packagePostfix}" />	
+		<property name="nuget.symbol.basedir" value="${path.base}/build/nuget-owinhost_symbol" />
+		<property name="nuget.project" value="${path.src}/${product.name}.OwinHost/${product.name}.OwinHost.csproj" />
+
+		<property name="nant.settings.currentframework" value="net-4.0"/>
+		<msbuild project="${nuget.project}" />
+		<call target="nuget-run"/>
+	</target>	
 </project>

Ninject.Web.WebApi.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77BE2A9F-F61F-45D4-A5C5-1DF0DA05EA42}"
 	ProjectSection(SolutionItems) = preProject
 		README.markdown = README.markdown
@@ -19,6 +19,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{7580A5
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Owin-SampleApplication", "src\Owin-SampleApplication\Owin-SampleApplication.csproj", "{DF31E98F-3021-4571-AF82-FF62EC43DA7D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.Web.WebApi.OwinHost", "src\Ninject.Web.WebApi.OwinHost\Ninject.Web.WebApi.OwinHost.csproj", "{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AutomatedRelease|Any CPU = AutomatedRelease|Any CPU
@@ -92,6 +96,36 @@ Global
 		{A8925F38-F4AB-44B4-A4AC-C37CF7EA6A37}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{A8925F38-F4AB-44B4-A4AC-C37CF7EA6A37}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A8925F38-F4AB-44B4-A4AC-C37CF7EA6A37}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.AutomatedRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.AutomatedRelease|Any CPU.Build.0 = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.AutomatedRelease|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.AutomatedRelease|Mixed Platforms.Build.0 = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.AutomatedRelease|x86.ActiveCfg = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DF31E98F-3021-4571-AF82-FF62EC43DA7D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.AutomatedRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.AutomatedRelease|Any CPU.Build.0 = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.AutomatedRelease|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.AutomatedRelease|Mixed Platforms.Build.0 = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.AutomatedRelease|x86.ActiveCfg = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E322DFD7-FAF1-4EEA-B601-B15E08E3F6A4}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Ninject.include

@@ -45,14 +45,11 @@
 	<property name="build.platform" value="net-3.5" overwrite="true"/>
 	<property name="build.target" value="net-3.5" overwrite="false"/>
 	<property name="build.asminfo" value="SharedAssemblyInfo.cs"/>
-
-	<property name="OsMajorVersion" value="${version::get-major(operating-system::get-version(environment::get-operating-system()))}" dynamic="true" />
-	<property name="OsMinorVersion" value="${version::get-minor(operating-system::get-version(environment::get-operating-system()))}" dynamic="true" />
 
 	<property name="package" value="false" readonly="false" overwrite="false"/>
 	<property name="skip.tests" value="false" readonly="false" overwrite="false"/>
 	<property name="skip.silverlightTests" value="false" readonly="false" overwrite="false"/>
-	<property name="skip.silverlightWPTests" value="${OsMajorVersion > '6' or (OsMajorVersion == '6' and OsMinorVersion > '1')}" readonly="false" overwrite="false"/>
+	<property name="skip.silverlightWPTests" value="false" readonly="false" overwrite="false"/>
 
 	<property name="Is64BitOperatingSystem" value="false" />
 	<property name="Is64BitProcess" value="false" />
@@ -104,10 +101,6 @@
 
 		<property name="IsWow64Process" value="${PInvoke::IsWow64Process()}" />
 		<echo message="Setting the [IsWow64Process] property to ${IsWow64Process}." />
-
-		<echo message="OSVersion: ${OsMajorVersion}.${OsMinorVersion}" />
-		<echo message="Skipping Silverlight UnitTests" if="${skip.silverlightTests}" />
-		<echo message="Skipping WP7 UnitTests" if="${skip.silverlightWPTests}" />
 	</target>
 
 	<target name="DetectIf64BitProcess">
@@ -594,11 +587,11 @@
 			<property name="asm" value="${asm2}" if="${file::exists(asm2)}"/>
 			<property name="asm" value="${asm1}" if="${file::exists(asm1)}"/>
 
-			<property name="version" value="${assemblyname::get-version(assemblyname::get-assembly-name(asm))}"/>
+			<property name="dependencyVersion" value="${assemblyname::get-version(assemblyname::get-assembly-name(asm))}"/>
 			<property name="maxVersion" value=""/>
 			<property name="versionPrerelease" value=""/>
 			<property name="i" value="0"/>
-			<foreach item="String" in="${version}" delim="." property="versionPart">
+			<foreach item="String" in="${dependencyVersion}" delim="." property="versionPart">
 				<property name="i" value="${int::parse(i) + 1}"/>
 				<property name="maxVersion" value="${maxVersion + '.'}" unless="${i == '1'}"/>
 				<property name="maxVersion" value="${maxVersion + versionPart}" if="${i == '1'}"/>
@@ -613,7 +606,7 @@
 		    <property name="versionPrerelease" value="${versionPrerelease + version.prerelease}"/>
 			<xmlpoke file="${nuget.basedir}/${nuget.name}.nuspec" 
 			         xpath="//package/nu:metadata/nu:dependencies/nu:dependency[@id='${dependency}']/@version" 
-					 value="${'[' + version + ',' + maxVersion + ')'}"
+					 value="${'[' + dependencyVersion + ',' + maxVersion + ')'}"
 					 if="${version.prerelease == ''}">
 				<namespaces>
 					<namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance" />

lib/Ninject.Extensions.Contextpreservation/RequiredDependency.txt

@@ -0,0 +1 @@
+Add the various Ninject.Extensions.Contextpreservation platform builds here. The simplest way is to add the Zip files generated by the Ninject release build and call the UnzipDependencies.cmd in the main folder.

lib/Ninject.Extensions.NamedScope/RequiredDependency.txt

@@ -0,0 +1 @@
+Add the various Ninject.Extensions.Contextpreservation platform builds here. The simplest way is to add the Zip files generated by the Ninject release build and call the UnzipDependencies.cmd in the main folder.

nuget-owinhost/Ninject.Web.WebApi.OwinHost.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>Ninject.Web.WebApi.OwinHost</id>
+	<title>Ninject OWIN host for WebApi 2</title>
+    <version>3.0.0.0</version>
+    <authors>Remo Gloor</authors>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <licenseUrl>https://github.com/ninject/ninject.web.webapi/raw/master/LICENSE.txt</licenseUrl>
+    <description>Extension for Ninject providing integration with ASP.NET MVC WebAPI 2 OWIN host</description>
+    <summary>Extension for Ninject providing integration with ASP.NET MVC WebAPI 2 OWIN host</summary>
+    <language>en-US</language>
+    <tags>Ninject ioc di web mvc api owin host</tags>
+    <iconUrl>https://github.com/ninject/ninject/raw/master/logos/Ninject-Logo32.png</iconUrl>
+    <projectUrl>http://www.ninject.org</projectUrl>
+    <dependencies>
+      <dependency id="Ninject.Web.Common.OwinHost" version="3.0.0.0" />
+      <dependency id="Ninject.Web.WebApi" version="3.0.0.0" />
+      <dependency id="Microsoft.AspNet.WebApi.OwinHost" version="[5.0.20918.0,6.0)" />
+      <dependency id="Microsoft.AspNet.WebApi.WebHost" version="[5.0.20710.0,6.0)" />
+    </dependencies>
+  </metadata>
+</package>

packages/Microsoft.AspNet.WebApi.4.0.20710.0/Microsoft.AspNet.WebApi.4.0.20710.0.nuspec

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.AspNet.WebApi</id>
+    <version>4.0.20710.0</version>
+    <title>Microsoft ASP.NET Web API</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <licenseUrl>http://www.microsoft.com/web/webpi/eula/MVC_4_eula_ENU.htm</licenseUrl>
+    <projectUrl>http://www.asp.net/web-api</projectUrl>
+    <iconUrl>https://download-codeplex.sec.s-msft.com/Download?ProjectName=aspnetwebstack&amp;DownloadId=360555</iconUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>This package contains everything you need to host ASP.NET Web API on IIS. ASP.NET Web API is a framework that makes it easy to build HTTP services that reach a broad range of clients, including browsers and mobile devices. ASP.NET Web API is an ideal platform for building RESTful applications on the .NET Framework.</description>
+    <tags>Microsoft AspNet WebApi AspNetWebApi</tags>
+    <dependencies>
+      <dependency id="Microsoft.AspNet.WebApi.WebHost" version="[4.0.20710.0, 4.1)" />
+    </dependencies>
+  </metadata>
+</package>

packages/Microsoft.AspNet.WebApi.Owin.5.0.0/Microsoft.AspNet.WebApi.Owin.5.0.0.nuspec

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.AspNet.WebApi.Owin</id>
+    <version>5.0.0</version>
+    <title>Microsoft ASP.NET Web API 2 OWIN</title>
+    <authors>Microsoft</authors>
+    <owners>Microsoft</owners>
+    <licenseUrl>http://www.microsoft.com/web/webpi/eula/aspnetcomponent_rtw_ENU.htm</licenseUrl>
+    <projectUrl>http://www.asp.net/web-api</projectUrl>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <description>This package allows you to host ASP.NET Web API within an OWIN server and provides access to additional OWIN features.</description>
+    <summary>This package allows you to host ASP.NET Web API within an OWIN server and provides access to additional OWIN features.</summary>
+    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
+    <language>en-US</language>
+    <tags>Microsoft AspNet WebApi AspNetWebApi OWIN</tags>
+    <dependencies>
+      <dependency id="Microsoft.AspNet.WebApi.Core" version="5.0.0" />
+      <dependency id="Microsoft.Owin" version="2.0.0" />
+      <dependency id="Owin" version="1.0" />
+    </dependencies>
+  </metadata>
+</package>