Permalink
Browse files

Adding UWP client to the NuGet package

  • Loading branch information...
1 parent 4a46099 commit 9e5449bdff81b9f85a9605739651db5d14234c5f @moozzyk moozzyk committed Nov 18, 2015
View
@@ -34,5 +34,6 @@ jquery.signalR.min.js
xamarin/SignalRPackage/component/lib/mobile/
tests/Microsoft.AspNet.SignalR.Client.Store.Tests/AppPackages/
/Microsoft.AspNet.SignalR.sln.ide
+<<<<<<< HEAD
/.vs/
.lock.json
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30321.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.24711.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Core", "src\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj", "{1B9A82C4-BCA1-4834-A33E-226F17BE070B}"
EndProject
@@ -110,6 +110,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Cl
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Redis.Tests", "tests\Microsoft.AspNet.SignalR.Redis.Tests\Microsoft.AspNet.SignalR.Redis.Tests.csproj", "{C281927C-2082-4E2A-A1DB-9CD7225F5CED}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.UWP", "src\Microsoft.AspNet.SignalR.Client.UWP\Microsoft.AspNet.SignalR.Client.UWP.csproj", "{AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -694,6 +696,26 @@ Global
{C281927C-2082-4E2A-A1DB-9CD7225F5CED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C281927C-2082-4E2A-A1DB-9CD7225F5CED}.Release|x64.ActiveCfg = Release|Any CPU
{C281927C-2082-4E2A-A1DB-9CD7225F5CED}.Release|x86.ActiveCfg = Release|Any CPU
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|ARM.ActiveCfg = Debug|ARM
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|ARM.Build.0 = Debug|ARM
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|x64.ActiveCfg = Debug|x64
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|x64.Build.0 = Debug|x64
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|x86.ActiveCfg = Debug|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Debug|x86.Build.0 = Debug|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|ARM.ActiveCfg = Release|ARM
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|ARM.Build.0 = Release|ARM
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|Mixed Platforms.Build.0 = Release|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|x64.ActiveCfg = Release|x64
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|x64.Build.0 = Release|x64
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|x86.ActiveCfg = Release|x86
+ {AAAE1A6A-3A7E-4EE2-9624-3907FD1CDC1A}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -64,6 +64,8 @@
<WP8SDKInstalled Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v8.0\Microsoft.WindowsPhone.v8.0.Overrides.targets')">false</WP8SDKInstalled>
<WinRTSDKInstalled Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\WindowsXaml')">true</WinRTSDKInstalled>
<WinRTSDKInstalled Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\WindowsXaml')">false</WinRTSDKInstalled>
+ <NetNativeInstalled>false</NetNativeInstalled>
+ <NetNativeInstalled Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\.NetNative')">true</NetNativeInstalled>
</PropertyGroup>
<ItemGroup>
@@ -96,6 +98,10 @@
<Platform>portable-win81+wpa81</Platform>
<RunFxCop>false</RunFxCop>
</Projects>
+ <Projects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client.UWP\Microsoft.AspNet.SignalR.Client.UWP.csproj">
+ <Build Condition="!$(NetNativeInstalled)">false</Build>
+ <Platform>netcore50</Platform>
+ </Projects>
<!-- The SignalR .NET client is the only remaining project that targets .NET 4.0 starting in SignalR 2.0 -->
<Projects Include="$(ProjectRoot)\src\Microsoft.AspNet.SignalR.Client\Microsoft.AspNet.SignalR.Client.csproj">
<Platform>Net40</Platform>
@@ -42,5 +42,7 @@
<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.Xml" target="lib\netcore50" />
</files>
</package>
@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Microsoft.AspNet.SignalR.Client</RootNamespace>
- <AssemblyName>Microsoft.AspNet.SignalR.Client.UWP</AssemblyName>
+ <AssemblyName>Microsoft.AspNet.SignalR.Client</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
@@ -26,6 +26,7 @@
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Debug\Microsoft.AspNet.SignalR.Client.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,6 +36,7 @@
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\Release\Microsoft.AspNet.SignalR.Client.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<PlatformTarget>ARM</PlatformTarget>
@@ -131,9 +133,21 @@
<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>
@@ -161,15 +175,42 @@
<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>
@@ -191,93 +232,43 @@
<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\Resources.Designer.cs">
- <Link>Resources.Designer.cs</Link>
- </Compile>
- <Compile Include="..\Microsoft.AspNet.SignalR.Client\HeartBeatMonitor.cs">
- <Link>HeartBeatMonitor.cs</Link>
- </Compile>
<Compile Include="..\Microsoft.AspNet.SignalR.Client\KeepAliveData.cs">
<Link>KeepAliveData.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\ClientTransportBase.cs">
- <Link>Transports\ClientTransportBase.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.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\Hubs\IHubConnection.cs">
- <Link>Hubs\IHubConnection.cs</Link>
+ <Compile Include="..\Microsoft.AspNet.SignalR.Client\NegotiationResponse.cs">
+ <Link>NegotiationResponse.cs</Link>
</Compile>
- <Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\ExceptionHelper.cs">
- <Link>Infrastructure\ExceptionHelper.cs</Link>
+ <Compile Include="..\Microsoft.AspNet.SignalR.Client\ObservableConnection.cs">
+ <Link>ObservableConnection.cs</Link>
</Compile>
+ <Compile Include="Resources.Designer.cs" />
<Compile Include="..\Microsoft.AspNet.SignalR.Client\StateChange.cs">
<Link>StateChange.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\HubInvocation.cs">
- <Link>Hubs\HubInvocation.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\Infrastructure\ThreadSafeInvoker.cs">
- <Link>Infrastructure\ThreadSafeInvoker.cs</Link>
- </Compile>
- <Compile Include="..\Microsoft.AspNet.SignalR.Client\Infrastructure\StreamExtensions.cs">
- <Link>Infrastructure\StreamExtensions.cs</Link>
- </Compile>
- <Compile Include="..\Microsoft.AspNet.SignalR.Client\NegotiationResponse.cs">
- <Link>NegotiationResponse.cs</Link>
+ <Compile Include="..\Microsoft.AspNet.SignalR.Client\TraceLevels.cs">
+ <Link>TraceLevels.cs</Link>
</Compile>
- <Compile Include="..\Microsoft.AspNet.SignalR.Client\ObservableConnection.cs">
- <Link>ObservableConnection.cs</Link>
+ <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>
@@ -305,19 +296,28 @@
<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>TaskAsyncHelper.cs</Link>
+ <Link>Infrastructure\TaskAsyncHelper.cs</Link>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="..\Microsoft.AspNet.SignalR.Client\Resources.resx">
+ <EmbeddedResource Include="Resources.resx">
<Link>Resources.resx</Link>
</EmbeddedResource>
</ItemGroup>
@@ -327,9 +327,9 @@
<Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<Target Name="BeforeBuild">
- <Copy SourceFiles="..\Microsoft.AspNet.SignalR.Client\Resources.resx" DestinationFiles="$(ProjectDir)\Resources.resw" SkipUnchangedFiles="true" />
+ <Copy SourceFiles="..\Microsoft.AspNet.SignalR.Client\Resources.resx" DestinationFiles="$(ProjectDir)Resources.resx" SkipUnchangedFiles="true" />
</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.
<Target Name="AfterBuild">
</Target>
Oops, something went wrong.

0 comments on commit 9e5449b

Please sign in to comment.