Permalink
Browse files

Removed Hosting.Common altogether.

  • Loading branch information...
1 parent ef055b0 commit acebe530a4502303ffb6b669dce0a73bf2ef172d @davidfowl davidfowl committed Nov 21, 2012
Showing with 10 additions and 125 deletions.
  1. +0 −12 Microsoft.AspNet.SignalR.sln
  2. +0 −1 build/Build.proj
  3. +2 −6 samples/Microsoft.AspNet.SignalR.Client.Samples/Microsoft.AspNet.SignalR.Client.Samples.csproj
  4. +0 −4 ...soft.AspNet.SignalR.Hosting.AspNet.Samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj
  5. +0 −4 samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj
  6. +0 −74 src/Microsoft.AspNet.SignalR.Hosting.Common/Microsoft.AspNet.SignalR.Hosting.Common.csproj
  7. +0 −6 src/Microsoft.AspNet.SignalR.Hosting.Common/Properties/AssemblyInfo.cs
  8. 0 src/{Microsoft.AspNet.SignalR.Hosting.Common → Microsoft.AspNet.SignalR.Hosting.Memory}/Host.cs
  9. 0 ...Microsoft.AspNet.SignalR.Hosting.Common → Microsoft.AspNet.SignalR.Hosting.Memory}/HttpUtility.cs
  10. +1 −1 ...alR.Hosting.Common → Microsoft.AspNet.SignalR.Hosting.Memory}/Infrastructure/ProcessExtensions.cs
  11. 0 ...et.SignalR.Hosting.Common → Microsoft.AspNet.SignalR.Hosting.Memory}/Infrastructure/UrlDecoder.cs
  12. +6 −4 src/Microsoft.AspNet.SignalR.Hosting.Memory/Microsoft.AspNet.SignalR.Hosting.Memory.csproj
  13. 0 ....AspNet.SignalR.Hosting.Common → Microsoft.AspNet.SignalR.Hosting.Memory}/Routing/RouteManager.cs
  14. 0 ...Microsoft.AspNet.SignalR.Hosting.Common → Microsoft.AspNet.SignalR.Hosting.Memory}/RoutingHost.cs
  15. +1 −1 src/Microsoft.AspNet.SignalR.Stress/Infrastructure/Utility.cs
  16. +0 −4 src/Microsoft.AspNet.SignalR.Stress/Microsoft.AspNet.SignalR.Stress.csproj
  17. +0 −4 tests/Microsoft.AspNet.SignalR.FunctionalTests/Microsoft.AspNet.SignalR.FunctionalTests.csproj
  18. +0 −4 tests/Microsoft.AspNet.SignalR.Tests/Microsoft.AspNet.SignalR.Tests.csproj
@@ -24,8 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{505538C3
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.Memory", "src\Microsoft.AspNet.SignalR.Hosting.Memory\Microsoft.AspNet.SignalR.Hosting.Memory.csproj", "{055F2118-FE29-4219-A28A-3D6F0889652E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.Common", "src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj", "{3B71F0AE-D4B6-4F47-BF62-333D45615673}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7E3D992A-8F37-4C5D-AD42-E052522816C5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Hosting.AspNet.Samples", "samples\Microsoft.AspNet.SignalR.Hosting.AspNet.Samples\Microsoft.AspNet.SignalR.Hosting.AspNet.Samples.csproj", "{1EA34A62-E03E-45CF-A9C9-82D2DA0FCD82}"
@@ -143,16 +141,6 @@ Global
{055F2118-FE29-4219-A28A-3D6F0889652E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{055F2118-FE29-4219-A28A-3D6F0889652E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{055F2118-FE29-4219-A28A-3D6F0889652E}.Release|x86.ActiveCfg = Release|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Debug|x86.ActiveCfg = Debug|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Release|Any CPU.Build.0 = Release|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {3B71F0AE-D4B6-4F47-BF62-333D45615673}.Release|x86.ActiveCfg = Release|Any CPU
{1EA34A62-E03E-45CF-A9C9-82D2DA0FCD82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EA34A62-E03E-45CF-A9C9-82D2DA0FCD82}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EA34A62-E03E-45CF-A9C9-82D2DA0FCD82}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
View
@@ -146,7 +146,6 @@
<ItemGroup>
<AnalysisProjects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj"></AnalysisProjects>
<AnalysisProjects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client\Microsoft.AspNet.SignalR.Client.csproj"></AnalysisProjects>
- <AnalysisProjects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj"></AnalysisProjects>
<AnalysisProjects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Hosting.Memory\Microsoft.AspNet.SignalR.Hosting.Memory.csproj"></AnalysisProjects>
<AnalysisProjects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Owin\Microsoft.AspNet.SignalR.Owin.csproj"></AnalysisProjects>
<AnalysisProjects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Owin45\Microsoft.AspNet.SignalR.Owin45.csproj"></AnalysisProjects>
@@ -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">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -53,10 +53,6 @@
<Project>{EB46B9C6-EE37-48F9-835E-E49580E40E0A}</Project>
<Name>Microsoft.AspNet.SignalR.Client</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Memory\Microsoft.AspNet.SignalR.Hosting.Memory.csproj">
<Project>{055F2118-FE29-4219-A28A-3D6F0889652E}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.Memory</Name>
@@ -79,4 +75,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -308,10 +308,6 @@
<Project>{9f0c72d8-e43f-4f01-9deb-9e8fe0ae179e}</Project>
<Name>Microsoft.Owin.Host.SystemWeb45</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
<Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
<Name>Microsoft.AspNet.SignalR.Core</Name>
@@ -208,10 +208,6 @@
<Project>{1b9a82c4-bca1-4834-a33e-226f17be070b}</Project>
<Name>Microsoft.AspNet.SignalR.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3b71f0ae-d4b6-4f47-bf62-333d45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Owin45\Microsoft.AspNet.SignalR.Owin45.csproj">
<Project>{45892477-ef4e-4f45-a431-822755a38ea0}</Project>
<Name>Microsoft.AspNet.SignalR.Owin45</Name>
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Microsoft.AspNet.SignalR.Hosting.Common</RootNamespace>
- <AssemblyName>Microsoft.AspNet.SignalR.Hosting.Common</AssemblyName>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Debug\Microsoft.AspNet.SignalR.Hosting.Common.XML</DocumentationFile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Release\Microsoft.AspNet.SignalR.Hosting.Common.XML</DocumentationFile>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\Common\CommonAssemblyInfo.cs">
- <Link>Properties\CommonAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="..\Common\CommonVersionInfo.cs">
- <Link>Properties\CommonVersionInfo.cs</Link>
- </Compile>
- <Compile Include="Host.cs" />
- <Compile Include="Infrastructure\ProcessExtensions.cs" />
- <Compile Include="Infrastructure\UrlDecoder.cs" />
- <Compile Include="RoutingHost.cs" />
- <Compile Include="HttpUtility.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Routing\RouteManager.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
- <Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
- <Name>Microsoft.AspNet.SignalR.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="Properties\Microsoft.AspNet.SignalR.Hosting.Common.nuspec" />
- </ItemGroup>
- <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.md in the project root for license information.
-
-using System.Reflection;
-
-[assembly: AssemblyTitle("Microsoft.AspNet.SignalR.Hosting.Common")]
-[assembly: AssemblyDescription("Assembly containing common components for implementing SignalR hosts.")]
@@ -6,7 +6,7 @@
using System.Globalization;
using System.Threading;
-namespace Microsoft.AspNet.SignalR.Hosting.Common
+namespace Microsoft.AspNet.SignalR.Infrastructure
{
public static class ProcessExtensions
{
@@ -55,20 +55,22 @@
<Link>Infrastructure\TaskAsyncHelper.cs</Link>
</Compile>
<Compile Include="AsyncResult.cs" />
+ <Compile Include="Host.cs" />
+ <Compile Include="HttpUtility.cs" />
+ <Compile Include="Infrastructure\ProcessExtensions.cs" />
+ <Compile Include="Infrastructure\UrlDecoder.cs" />
<Compile Include="MemoryHost.cs" />
<Compile Include="Request.cs" />
<Compile Include="Response.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="RoutingHost.cs" />
+ <Compile Include="Routing\RouteManager.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.AspNet.SignalR.Client\Microsoft.AspNet.SignalR.Client.csproj">
<Project>{EB46B9C6-EE37-48F9-835E-E49580E40E0A}</Project>
<Name>Microsoft.AspNet.SignalR.Client</Name>
</ProjectReference>
- <ProjectReference Include="..\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
<Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
<Name>Microsoft.AspNet.SignalR.Core</Name>
@@ -4,7 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading;
-using Microsoft.AspNet.SignalR.Hosting.Common;
+using Microsoft.AspNet.SignalR.Infrastructure;
namespace Microsoft.AspNet.SignalR.Stress.Infrastructure
{
@@ -82,10 +82,6 @@
<Project>{EB46B9C6-EE37-48F9-835E-E49580E40E0A}</Project>
<Name>Microsoft.AspNet.SignalR.Client</Name>
</ProjectReference>
- <ProjectReference Include="..\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\Microsoft.AspNet.SignalR.Hosting.Memory\Microsoft.AspNet.SignalR.Hosting.Memory.csproj">
<Project>{055F2118-FE29-4219-A28A-3D6F0889652E}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.Memory</Name>
@@ -137,10 +137,6 @@
<Project>{1b9a82c4-bca1-4834-a33e-226f17be070b}</Project>
<Name>Microsoft.AspNet.SignalR.Core</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3b71f0ae-d4b6-4f47-bf62-333d45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Memory\Microsoft.AspNet.SignalR.Hosting.Memory.csproj">
<Project>{055f2118-fe29-4219-a28a-3d6f0889652e}</Project>
<Name>Microsoft.AspNet.SignalR.Hosting.Memory</Name>
@@ -102,10 +102,6 @@
<Project>{EB46B9C6-EE37-48F9-835E-E49580E40E0A}</Project>
<Name>Microsoft.AspNet.SignalR.Client</Name>
</ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Hosting.Common\Microsoft.AspNet.SignalR.Hosting.Common.csproj">
- <Project>{3B71F0AE-D4B6-4F47-BF62-333D45615673}</Project>
- <Name>Microsoft.AspNet.SignalR.Hosting.Common</Name>
- </ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
<Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
<Name>Microsoft.AspNet.SignalR.Core</Name>

0 comments on commit acebe53

Please sign in to comment.