Skip to content

Commit

Permalink
IndependenceDay
Browse files Browse the repository at this point in the history
Creating a dedicated SignalR store client
  • Loading branch information
moozzyk committed Dec 17, 2015
1 parent edeacf4 commit fa864e8
Show file tree
Hide file tree
Showing 11 changed files with 223 additions and 27 deletions.
1 change: 0 additions & 1 deletion build/Build.proj
Expand Up @@ -96,7 +96,6 @@
</Projects> </Projects>
<Projects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client.Store\Microsoft.AspNet.SignalR.Client.Store.csproj"> <Projects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client.Store\Microsoft.AspNet.SignalR.Client.Store.csproj">
<Platform>portable-win81+wpa81</Platform> <Platform>portable-win81+wpa81</Platform>
<RunFxCop>false</RunFxCop>
</Projects> </Projects>
<Projects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client.UWP\Microsoft.AspNet.SignalR.Client.UWP.csproj"> <Projects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client.UWP\Microsoft.AspNet.SignalR.Client.UWP.csproj">
<Build Condition="!$(NetNativeInstalled)">false</Build> <Build Condition="!$(NetNativeInstalled)">false</Build>
Expand Down
2 changes: 0 additions & 2 deletions nuspecs/Microsoft.AspNet.SignalR.Client.nuspec
Expand Up @@ -40,8 +40,6 @@
<file src="portable-net45+sl50+win+wpa81+wp80\Microsoft.AspNet.SignalR.Client.xml" target="lib\portable-net45+sl50+win+wpa81+wp80" /> <file src="portable-net45+sl50+win+wpa81+wp80\Microsoft.AspNet.SignalR.Client.xml" target="lib\portable-net45+sl50+win+wpa81+wp80" />
<file src="portable-win81+wpa81\Microsoft.AspNet.SignalR.Client.dll" target="lib\portable-win81+wpa81" /> <file src="portable-win81+wpa81\Microsoft.AspNet.SignalR.Client.dll" target="lib\portable-win81+wpa81" />
<file src="portable-win81+wpa81\Microsoft.AspNet.SignalR.Client.xml" target="lib\portable-win81+wpa81" /> <file src="portable-win81+wpa81\Microsoft.AspNet.SignalR.Client.xml" target="lib\portable-win81+wpa81" />
<file src="portable-win81+wpa81\Microsoft.AspNet.SignalR.Client.Store.dll" target="lib\portable-win81+wpa81" />
<file src="portable-win81+wpa81\Microsoft.AspNet.SignalR.Client.Store.Xml" target="lib\portable-win81+wpa81" />
<file src="netcore50\Microsoft.AspNet.SignalR.Client.dll" target="lib\netcore50" /> <file src="netcore50\Microsoft.AspNet.SignalR.Client.dll" target="lib\netcore50" />
<file src="netcore50\Microsoft.AspNet.SignalR.Client.Xml" target="lib\netcore50" /> <file src="netcore50\Microsoft.AspNet.SignalR.Client.Xml" target="lib\netcore50" />
</files> </files>
Expand Down
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.AspNet.SignalR.Client</RootNamespace> <RootNamespace>Microsoft.AspNet.SignalR.Client</RootNamespace>
<AssemblyName>Microsoft.AspNet.SignalR.Client.Store</AssemblyName> <AssemblyName>Microsoft.AspNet.SignalR.Client</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile32</TargetFrameworkProfile> <TargetFrameworkProfile>Profile32</TargetFrameworkProfile>
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
Expand All @@ -23,28 +23,21 @@
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<DocumentationFile>$(OutputPath)\$(AssemblyName).Xml</DocumentationFile> <DocumentationFile>$(OutputPath)\$(AssemblyName).Xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .NET Framework is automatically included -->
<ProjectReference Include="..\Microsoft.AspNet.SignalR.Client.Portable\Microsoft.AspNet.SignalR.Client.Portable.csproj">
<Project>{47b3f28e-76db-40bd-a8f5-800cf08d84ed}</Project>
<Name>Microsoft.AspNet.SignalR.Client.Portable</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<TargetPlatform Include="WindowsPhoneApp, Version=8.1" /> <TargetPlatform Include="WindowsPhoneApp, Version=8.1" />
<TargetPlatform Include="Windows, Version=8.1" /> <TargetPlatform Include="Windows, Version=8.1" />
Expand All @@ -56,6 +49,204 @@
<Compile Include="..\Common\CommonVersionInfo.cs"> <Compile Include="..\Common\CommonVersionInfo.cs">
<Link>Properties\CommonVersionInfo.cs</Link> <Link>Properties\CommonVersionInfo.cs</Link>
</Compile> </Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client45\Http\DefaultHttpClient.cs">
<Link>Http\DefaultHttpClient.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client45\Http\DefaultHttpHandler.cs">
<Link>Http\DefaultHttpHandler.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client45\Http\HttpRequestMessageWrapper.cs">
<Link>Http\HttpRequestMessageWrapper.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client45\Http\HttpResponseMessageWrapper.cs">
<Link>Http\HttpResponseMessageWrapper.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client45\Infrastructure\HttpClientException.cs">
<Link>Infrastructure\HttpClientException.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Connection.cs">
<Link>Connection.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\ConnectionExtensions.cs">
<Link>ConnectionExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\ConnectionState.cs">
<Link>ConnectionState.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\HeaderDictionary.cs">
<Link>HeaderDictionary.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\HeartBeatMonitor.cs">
<Link>HeartBeatMonitor.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Http\HttpHelper.cs">
<Link>Http\HttpHelper.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Http\IHttpClient.cs">
<Link>Http\IHttpClient.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Http\IHttpClientExtensions.cs">
<Link>Http\IHttpClientExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Http\IRequest.cs">
<Link>Http\IRequest.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Http\IResponse.cs">
<Link>Http\IResponse.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Http\IResponseExtensions.cs">
<Link>Http\IResponseExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\HubConnection.cs">
<Link>HubConnection.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\HubException.cs">
<Link>HubException.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\HubProxyExtensions.cs">
<Link>HubProxyExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\HubInvocation.cs">
<Link>Hubs\HubInvocation.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\HubProgressUpdate.cs">
<Link>Hubs\HubProgressUpdate.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\HubProxy.cs">
<Link>Hubs\HubProxy.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\HubRegistrationData.cs">
<Link>Hubs\HubRegistrationData.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\HubResult.cs">
<Link>Hubs\HubResult.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\Hubservable.cs">
<Link>Hubs\Hubservable.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\IHubConnection.cs">
<Link>Hubs\IHubConnection.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Hubs\Subscription.cs">
<Link>Hubs\Subscription.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\IConnection.cs">
<Link>IConnection.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\IHubProxy.cs">
<Link>IHubProxy.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\ErrorExtensions.cs">
<Link>Infrastructure\ErrorExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\ExceptionHelper.cs">
<Link>Infrastructure\ExceptionHelper.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\ITaskMonitor.cs">
<Link>Infrastructure\ITaskMonitor.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\SignalRError.cs">
<Link>Infrastructure\SignalRError.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\SlowCallbackException.cs">
<Link>Infrastructure\SlowCallbackException.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\StartException.cs">
<Link>Infrastructure\StartException.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\TaskQueueMonitor.cs">
<Link>Infrastructure\TaskQueueMonitor.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\TransportAbortHandler.cs">
<Link>Infrastructure\TransportAbortHandler.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\TransportInitializationHandler.cs">
<Link>Infrastructure\TransportInitializationHandler.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\StreamExtensions.cs">
<Link>Infrastructure\StreamExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\ThreadSafeInvoker.cs">
<Link>Infrastructure\ThreadSafeInvoker.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\UrlBuilder.cs">
<Link>Infrastructure\UrlBuilder.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\UrlEncoder.cs">
<Link>Infrastructure\UrlEncoder.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\KeepAliveData.cs">
<Link>KeepAliveData.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\NegotiationResponse.cs">
<Link>NegotiationResponse.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\ObservableConnection.cs">
<Link>ObservableConnection.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Resources.Designer.cs">
<Link>Resources.Designer.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\StateChange.cs">
<Link>StateChange.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\TraceLevels.cs">
<Link>TraceLevels.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\AsyncStreamReader.cs">
<Link>Transports\AsyncStreamReader.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\AutoTransport.cs">
<Link>Transports\AutoTransport.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\ClientTransportBase.cs">
<Link>Transports\ClientTransportBase.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\HttpBasedTransport.cs">
<Link>Transports\HttpBasedTransport.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\IClientTransport.cs">
<Link>Transports\IClientTransport.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\LongPollingTransport.cs">
<Link>Transports\LongPollingTransport.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\ServerSentEventsTransport.cs">
<Link>Transports\ServerSentEventsTransport.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\ServerSentEvents\ChunkBuffer.cs">
<Link>Transports\ServerSentEvents\ChunkBuffer.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\ServerSentEvents\EventSourceStreamReader.cs">
<Link>Transports\ServerSentEvents\EventSourceStreamReader.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\ServerSentEvents\EventType.cs">
<Link>Transports\ServerSentEvents\EventType.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\ServerSentEvents\SseEvent.cs">
<Link>Transports\ServerSentEvents\SseEvent.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\Transports\TransportHelper.cs">
<Link>Transports\TransportHelper.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Core\Infrastructure\CancellationTokenExtensions.cs">
<Link>Infrastructure\CancellationTokenExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Core\Infrastructure\DisposableAction.cs">
<Link>Infrastructure\DisposableAction.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Core\Infrastructure\Disposer.cs">
<Link>Infrastructure\Disposer.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Core\Infrastructure\ExceptionsExtensions.cs">
<Link>Infrastructure\ExceptionsExtensions.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Core\Infrastructure\TaskQueue.cs">
<Link>Infrastructure\TaskQueue.cs</Link>
</Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Core\TaskAsyncHelper.cs">
<Link>Infrastructure\TaskAsyncHelper.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourcesStore.cs" /> <Compile Include="ResourcesStore.cs" />
<Compile Include="Transports\IWebSocketResponse.cs" /> <Compile Include="Transports\IWebSocketResponse.cs" />
Expand All @@ -71,14 +262,21 @@
</PRIResource> </PRIResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="..\Microsoft.AspNet.SignalR.Client\Resources.resx" />
</ItemGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Net.Http.Extensions"> <Reference Include="System.Net.Http.Extensions">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll</HintPath> <HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Extensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Net.Http.Primitives"> <Reference Include="System.Net.Http.Primitives">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll</HintPath> <HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8+wpa81\System.Net.Http.Primitives.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\src\Common\Microsoft.AspNet.SignalR.targets" /> <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand All @@ -92,7 +290,7 @@
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" /> <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" /> <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
Expand Down
Expand Up @@ -179,7 +179,7 @@ internal static async Task Send(IWebSocket webSocket, string data)
messageWriter.DetachStream(); messageWriter.DetachStream();
} }
} }

private void WebsocketClosed(IWebSocket webSocket, WebSocketClosedEventArgs eventArgs) private void WebsocketClosed(IWebSocket webSocket, WebSocketClosedEventArgs eventArgs)
{ {
_connection.Trace(TraceLevels.Events, "WS: WebsocketClosed - Code: {0}, Reason {1}", eventArgs.Code, eventArgs.Reason); _connection.Trace(TraceLevels.Events, "WS: WebsocketClosed - Code: {0}, Reason {1}", eventArgs.Code, eventArgs.Reason);
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.AspNet.SignalR.Client.Store/packages.config
Expand Up @@ -3,4 +3,5 @@
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-win81+wpa81" /> <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-win81+wpa81" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-win81+wpa81" /> <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-win81+wpa81" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="portable-win81+wpa81" /> <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="portable-win81+wpa81" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable46-win81+wpa81" />
</packages> </packages>
2 changes: 2 additions & 0 deletions src/Microsoft.AspNet.SignalR.Client/Connection.cs
Expand Up @@ -917,6 +917,8 @@ void IConnection.PrepareRequest(IRequest request)
// Cannot set user agent for Portable because SL does not support it. // Cannot set user agent for Portable because SL does not support it.
#elif NETFX_CORE #elif NETFX_CORE
request.UserAgent = CreateUserAgentString("SignalR.Client.WinUAP"); request.UserAgent = CreateUserAgentString("SignalR.Client.WinUAP");
#elif WINDOWS_APP
request.UserAgent = CreateUserAgentString("SignalR.Client.Win8UniversalApp");
#elif NET45 #elif NET45
request.UserAgent = CreateUserAgentString("SignalR.Client.NET45"); request.UserAgent = CreateUserAgentString("SignalR.Client.NET45");
#else #else
Expand Down
Expand Up @@ -27,7 +27,7 @@ public AutoTransport(IHttpClient httpClient)


_transports = new List<IClientTransport>() _transports = new List<IClientTransport>()
{ {
#if NET45 || WINDOWS_UWP #if NET45 || WINDOWS_UWP || WINDOWS_APP
new WebSocketTransport(httpClient), new WebSocketTransport(httpClient),
#endif #endif
new ServerSentEventsTransport(httpClient), new ServerSentEventsTransport(httpClient),
Expand Down
Expand Up @@ -70,7 +70,7 @@ public bool ChangeState(ConnectionState oldState, ConnectionState newState)
{ {
_invocationManager.AddInvocation("ChangeState", oldState, newState); _invocationManager.AddInvocation("ChangeState", oldState, newState);


return _invocationManager.GetReturnValue<bool>("ChangeState"); return _invocationManager.GetReturnValue<bool>("ChangeState");
} }


public IDictionary<string, string> Headers public IDictionary<string, string> Headers
Expand Down Expand Up @@ -186,5 +186,7 @@ public void Setup<T>(string methodName, Func<T> behavior)
{ {
_invocationManager.AddSetup(methodName, behavior); _invocationManager.AddSetup(methodName, behavior);
} }

public IWebProxy Proxy { get; set; }
} }
} }
Expand Up @@ -37,7 +37,7 @@ public async Task WebSocketSendReceiveTest()
} }
}); });


await hubConnection.Start(new WebSocketTransport()); await hubConnection.Start();


for (var i = 0; i < MessageCount; i++) for (var i = 0; i < MessageCount; i++)
{ {
Expand Down
Expand Up @@ -181,10 +181,6 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client.Portable\Microsoft.AspNet.SignalR.Client.Portable.csproj">
<Project>{47b3f28e-76db-40bd-a8f5-800cf08d84ed}</Project>
<Name>Microsoft.AspNet.SignalR.Client.Portable</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client.Store\Microsoft.AspNet.SignalR.Client.Store.csproj"> <ProjectReference Include="..\..\src\Microsoft.AspNet.SignalR.Client.Store\Microsoft.AspNet.SignalR.Client.Store.csproj">
<Project>{29e437b6-c451-4353-bb29-3b85ef16a3cf}</Project> <Project>{29e437b6-c451-4353-bb29-3b85ef16a3cf}</Project>
<Name>Microsoft.AspNet.SignalR.Client.Store</Name> <Name>Microsoft.AspNet.SignalR.Client.Store</Name>
Expand Down Expand Up @@ -214,10 +210,10 @@
</Target> </Target>
<Import Project="..\..\packages\xunit.runner.visualstudio.0.99.8\build\win8\xunit.runner.visualstudio.targets" Condition="Exists('..\..\packages\xunit.runner.visualstudio.0.99.8\build\win8\xunit.runner.visualstudio.targets')" /> <Import Project="..\..\packages\xunit.runner.visualstudio.0.99.8\build\win8\xunit.runner.visualstudio.targets" Condition="Exists('..\..\packages\xunit.runner.visualstudio.0.99.8\build\win8\xunit.runner.visualstudio.targets')" />
<Import Project="..\..\packages\xunit.core.2.0.0-beta4-build2738\build\win8\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.0.0-beta4-build2738\build\win8\xunit.core.targets')" /> <Import Project="..\..\packages\xunit.core.2.0.0-beta4-build2738\build\win8\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.0.0-beta4-build2738\build\win8\xunit.core.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
Expand Down

0 comments on commit fa864e8

Please sign in to comment.