Skip to content

Commit

Permalink
Adding katana as a submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
loudej committed Oct 30, 2012
1 parent 5a5a556 commit 657e948
Show file tree
Hide file tree
Showing 12 changed files with 182 additions and 24 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "katana"]
path = katana
url = https://git01.codeplex.com/katanaproject
14 changes: 14 additions & 0 deletions Microsoft.AspNet.SignalR.sln
Expand Up @@ -77,6 +77,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.AspNet45", "src\Microsoft.AspNet.SignalR.Hosting.AspNet45\Microsoft.AspNet.SignalR.Hosting.AspNet45.csproj", "{6F53F576-0E35-4E89-8D4D-B6B40084A16C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.AspNet45", "src\Microsoft.AspNet.SignalR.Hosting.AspNet45\Microsoft.AspNet.SignalR.Hosting.AspNet45.csproj", "{6F53F576-0E35-4E89-8D4D-B6B40084A16C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.Self45", "src\Microsoft.AspNet.SignalR.Hosting.Self45\Microsoft.AspNet.SignalR.Hosting.Self45.csproj", "{1617158B-2CFD-4354-A33F-9937E508D69A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.Self45", "src\Microsoft.AspNet.SignalR.Hosting.Self45\Microsoft.AspNet.SignalR.Hosting.Self45.csproj", "{1617158B-2CFD-4354-A33F-9937E508D69A}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "katana", "katana", "{4DFA135C-CB60-497D-8868-A81AEB84D30B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Owin.Host.SystemWeb", "katana\src\Microsoft.Owin.Host.SystemWeb\Microsoft.Owin.Host.SystemWeb.csproj", "{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -348,6 +351,16 @@ Global
{1617158B-2CFD-4354-A33F-9937E508D69A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {1617158B-2CFD-4354-A33F-9937E508D69A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{1617158B-2CFD-4354-A33F-9937E508D69A}.Release|Mixed Platforms.Build.0 = Release|Any CPU {1617158B-2CFD-4354-A33F-9937E508D69A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{1617158B-2CFD-4354-A33F-9937E508D69A}.Release|x86.ActiveCfg = Release|Any CPU {1617158B-2CFD-4354-A33F-9937E508D69A}.Release|x86.ActiveCfg = Release|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Debug|x86.ActiveCfg = Debug|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Release|Any CPU.Build.0 = Release|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Expand All @@ -362,5 +375,6 @@ Global
{9A64F050-8F95-46B2-906C-0BFCA7A27E94} = {7E3D992A-8F37-4C5D-AD42-E052522816C5} {9A64F050-8F95-46B2-906C-0BFCA7A27E94} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
{3F79472C-5EA7-4260-B124-BBD209B329FF} = {7E3D992A-8F37-4C5D-AD42-E052522816C5} {3F79472C-5EA7-4260-B124-BBD209B329FF} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
{B94E0027-2664-4DAC-BA32-7AA12BFCEE10} = {7E3D992A-8F37-4C5D-AD42-E052522816C5} {B94E0027-2664-4DAC-BA32-7AA12BFCEE10} = {7E3D992A-8F37-4C5D-AD42-E052522816C5}
{E31826E6-C29A-4F08-BD4F-E17ACA793BBC} = {4DFA135C-CB60-497D-8868-A81AEB84D30B}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
1 change: 1 addition & 0 deletions katana
Submodule katana added at 506c0b
Expand Up @@ -314,6 +314,10 @@
<Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project> <Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
<Name>Microsoft.AspNet.SignalR.Core</Name> <Name>Microsoft.AspNet.SignalR.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Server.Routing\Microsoft.AspNet.SignalR.Server.Routing.csproj">
<Project>{37c04b69-0989-458a-b80c-a1ed574adbe4}</Project>
<Name>Microsoft.AspNet.SignalR.Server.Routing</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="SignalR.Master" /> <Content Include="SignalR.Master" />
Expand Down
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
Expand All @@ -11,7 +11,7 @@
<AssemblyName>Microsoft.AspNet.SignalR.Server.Routing</AssemblyName> <AssemblyName>Microsoft.AspNet.SignalR.Server.Routing</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<DisableSigning>true</DisableSigning> <DisableSigning>true</DisableSigning>
</PropertyGroup> </PropertyGroup>
Expand All @@ -33,17 +33,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.AspNet.Owin, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Owin">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\packages\Owin.0.5\lib\net40\Owin.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNet.Owin.0.7\lib\Microsoft.AspNet.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Owin.Startup, Version=0.4.0.0, Culture=neutral, PublicKeyToken=f585506a2da1fef4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Owin.Startup.0.4\lib\net40\Owin.Startup.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
Expand All @@ -61,6 +52,10 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\katana\src\Microsoft.Owin.Host.SystemWeb\Microsoft.Owin.Host.SystemWeb.csproj">
<Project>{E31826E6-C29A-4F08-BD4F-E17ACA793BBC}</Project>
<Name>Microsoft.Owin.Host.SystemWeb</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj"> <ProjectReference Include="..\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
<Project>{3b71f0ae-d4b6-4f47-bf62-333d45615673}</Project> <Project>{3b71f0ae-d4b6-4f47-bf62-333d45615673}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.Common</Name> <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
Expand All @@ -87,4 +82,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>
Expand Up @@ -6,7 +6,7 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web; using System.Web;
using System.Web.Routing; using System.Web.Routing;
using Microsoft.AspNet.Owin; using Microsoft.Owin.Host.SystemWeb;
using Owin; using Owin;
using Microsoft.AspNet.SignalR.Server; using Microsoft.AspNet.SignalR.Server;


Expand Down
4 changes: 1 addition & 3 deletions src/Microsoft.AspNet.SignalR.Server.Routing/packages.config
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Microsoft.AspNet.Owin" version="0.7" targetFramework="net40" /> <package id="Owin" version="0.5" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Owin.Startup" version="0.4" targetFramework="net40" />
</packages> </packages>
@@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace Owin
{
using AppFunc = Func<IDictionary<string, object>, Task>;

internal static partial class StartupExtensions
{
public static IAppBuilder UseFunc<TApp>(this IAppBuilder builder, Func<TApp, TApp> middleware)
{
return builder.Use(middleware);
}

public static IAppBuilder UseFunc(this IAppBuilder builder, Func<AppFunc, AppFunc> middleware)
{
return builder.Use(middleware);
}

public static IAppBuilder UseFunc<T1>(this IAppBuilder builder, Func<AppFunc, T1, AppFunc> middleware, T1 arg1)
{
return builder.UseFunc<AppFunc>(app => middleware(app, arg1));
}

public static IAppBuilder UseFunc<T1, T2>(this IAppBuilder builder, Func<AppFunc, T1, T2, AppFunc> middleware, T1 arg1, T2 arg2)
{
return builder.UseFunc<AppFunc>(app => middleware(app, arg1, arg2));
}

public static IAppBuilder UseFunc<T1, T2, T3>(this IAppBuilder builder, Func<AppFunc, T1, T2, T3, AppFunc> middleware, T1 arg1, T2 arg2, T3 arg3)
{
return builder.UseFunc<AppFunc>(app => middleware(app, arg1, arg2, arg3));
}

public static IAppBuilder UseFunc<T1, T2, T3, T4>(this IAppBuilder builder, Func<AppFunc, T1, T2, T3, T4, AppFunc> middleware, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
{
return builder.UseFunc<AppFunc>(app => middleware(app, arg1, arg2, arg3, arg4));
}

public static IAppBuilder UseFunc<T1>(this IAppBuilder builder, Func<T1, Func<AppFunc, AppFunc>> middleware, T1 arg1)
{
return builder.UseFunc<AppFunc>(app => middleware(arg1)(app));
}

public static IAppBuilder UseFunc<T1, T2>(this IAppBuilder builder, Func<T1, T2, Func<AppFunc, AppFunc>> middleware, T1 arg1, T2 arg2)
{
return builder.UseFunc<AppFunc>(app => middleware(arg1, arg2)(app));
}

public static IAppBuilder UseFunc<T1, T2, T3>(this IAppBuilder builder, Func<T1, T2, T3, Func<AppFunc, AppFunc>> middleware, T1 arg1, T2 arg2, T3 arg3)
{
return builder.UseFunc<AppFunc>(app => middleware(arg1, arg2, arg3)(app));
}

public static IAppBuilder UseFunc<T1, T2, T3, T4>(this IAppBuilder builder, Func<T1, T2, T3, T4, Func<AppFunc, AppFunc>> middleware, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
{
return builder.UseFunc<AppFunc>(app => middleware(arg1, arg2, arg3, arg4)(app));
}
}
}
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace Owin
{
using AppFunc = Func<IDictionary<string, object>, Task>;

internal static partial class StartupExtensions
{
public static IAppBuilder UseType<TMiddleware>(this IAppBuilder builder, params object[] args)
{
return builder.Use(typeof(TMiddleware), args);
}

public static IAppBuilder UseType(this IAppBuilder builder, Type type, params object[] args)
{
return builder.Use(type, args);
}
}
}
@@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;

namespace Owin
{
using AppFunc = Func<IDictionary<string, object>, Task>;

internal static partial class StartupExtensions
{
public static void Run(this IAppBuilder builder, object app)
{
builder.Use(new Func<object, object>(ignored => app));
}

public static AppFunc Build(this IAppBuilder builder)
{
return builder.Build<AppFunc>();
}

public static TApp Build<TApp>(this IAppBuilder builder)
{
return (TApp)builder.Build(typeof(TApp));
}

public static AppFunc BuildNew(
this IAppBuilder builder,
Action<IAppBuilder> configuration)
{
return builder.BuildNew<AppFunc>(configuration);
}

public static TApp BuildNew<TApp>(
this IAppBuilder builder,
Action<IAppBuilder> configuration)
{
var nested = builder.New();
configuration(nested);
return nested.Build<TApp>();
}

public static void AddSignatureConversion(
this IAppBuilder builder,
Delegate conversion)
{
object value;
if (builder.Properties.TryGetValue("builder.AddSignatureConversion", out value) &&
value is Action<Delegate>)
{
((Action<Delegate>)value).Invoke(conversion);
}
else
{
throw new InvalidOperationException("IAppBuilder does not contain builder.AddSignatureConversion method");
}
}
}
}
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
Expand Down Expand Up @@ -36,9 +36,8 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Owin.Startup, Version=0.4.0.0, Culture=neutral, PublicKeyToken=f585506a2da1fef4, processorArchitecture=MSIL"> <Reference Include="Owin">
<SpecificVersion>False</SpecificVersion> <HintPath>..\..\packages\Owin.0.5\lib\net40\Owin.dll</HintPath>
<HintPath>..\..\packages\Owin.Startup.0.4\lib\net40\Owin.Startup.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
Expand All @@ -54,6 +53,9 @@
<Compile Include="..\Microsoft.AspNet.SignalR.Core\TaskAsyncHelper.cs"> <Compile Include="..\Microsoft.AspNet.SignalR.Core\TaskAsyncHelper.cs">
<Link>Infrastructure\TaskAsyncHelper.cs</Link> <Link>Infrastructure\TaskAsyncHelper.cs</Link>
</Compile> </Compile>
<Compile Include="App_Packages\Owin.Extensions.Sources.0.5\StartupExtensions.cs" />
<Compile Include="App_Packages\Owin.Extensions.Sources.0.5\StartupExtensions.Func.cs" />
<Compile Include="App_Packages\Owin.Extensions.Sources.0.5\StartupExtensions.Type.cs" />
<Compile Include="Infrastructure\Headers.cs" /> <Compile Include="Infrastructure\Headers.cs" />
<Compile Include="Infrastructure\OwinConstants.cs" /> <Compile Include="Infrastructure\OwinConstants.cs" />
<Compile Include="Infrastructure\ParamDictionary.cs" /> <Compile Include="Infrastructure\ParamDictionary.cs" />
Expand Down Expand Up @@ -93,4 +95,4 @@
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>
3 changes: 2 additions & 1 deletion src/Microsoft.AspNet.SignalR.Server/packages.config
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Owin.Startup" version="0.4" targetFramework="net40" /> <package id="Owin" version="0.5" targetFramework="net40" />
<package id="Owin.Extensions.Sources" version="0.5" targetFramework="net40" />
</packages> </packages>

0 comments on commit 657e948

Please sign in to comment.