Permalink
Browse files

Merge tag '2.0.2'

Conflicts:
	build/Microsoft.AspNet.SignalR.versions.targets
	samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj
	samples/Microsoft.AspNet.SelfHost.Samples/packages.config
	samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj
	samples/Microsoft.AspNet.SignalR.LoadTestHarness/packages.config
	samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj
	samples/Microsoft.AspNet.SignalR.Samples/packages.config
	src/Common/CommonVersionInfo.cs
	src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js
	src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.version.js
	src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
	src/Microsoft.AspNet.SignalR.Core/Scripts/hubs.js
	src/Microsoft.AspNet.SignalR.Core/packages.config
	src/Microsoft.AspNet.SignalR.Hosting.Memory/MemoryHost.cs
	src/Microsoft.AspNet.SignalR.Hosting.Memory/Microsoft.AspNet.SignalR.Hosting.Memory.csproj
	src/Microsoft.AspNet.SignalR.Hosting.Memory/packages.config
	src/Microsoft.AspNet.SignalR.SystemWeb/Microsoft.AspNet.SignalR.SystemWeb.csproj
	src/Microsoft.AspNet.SignalR.SystemWeb/packages.config
	tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Microsoft.AspNet.SignalR.Client.JS.Tests.csproj
	tests/Microsoft.AspNet.SignalR.Client.JS.Tests/packages.config
	tests/Microsoft.AspNet.SignalR.FunctionalTests/Microsoft.AspNet.SignalR.FunctionalTests.csproj
	tests/Microsoft.AspNet.SignalR.FunctionalTests/packages.config
	tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj
	tests/Microsoft.AspNet.SignalR.Tests.Common/packages.config
	tests/Microsoft.AspNet.SignalR.Tests/Core/Transports/ForeverFrameTransportFacts.cs
  • Loading branch information...
2 parents 2f6649e + f9e2543 commit cf3045180d034d29591a581e0d12041ab93d00b8 @DamianEdwards DamianEdwards committed Jan 28, 2014
Showing with 3,739 additions and 3,600 deletions.
  1. +2 −1 .gitignore
  2. +26 −41 .nuget/NuGet.targets
  3. +25 −58 Microsoft.AspNet.SignalR.Mono.Mobile.sln
  4. +17 −16 Microsoft.AspNet.SignalR.sln
  5. +43 −35 build/Build.proj
  6. +15 −0 build/Microsoft.AspNet.SignalR.Projects.Properties.proj
  7. +3 −3 build/Microsoft.AspNet.SignalR.versions.targets
  8. +0 −21 nuspecs/Microsoft.AspNet.SignalR.Sample.nuspec
  9. +1 −1 nuspecs/Microsoft.AspNet.SignalR.ServiceBus.nuspec
  10. +25 −12 samples/Common/CommonClient.cs
  11. +5 −5 samples/Microsoft.AspNet.SelfHost.Samples/Microsoft.AspNet.SelfHost.Samples.csproj
  12. +6 −5 samples/Microsoft.AspNet.SelfHost.Samples/packages.config
  13. +19 −6 ...soft.AspNet.SignalR.Client.Android.Samples/Microsoft.AspNet.SignalR.Client.Android.Samples.csproj
  14. +6 −0 samples/Microsoft.AspNet.SignalR.Client.Android.Samples/Properties/AndroidManifest.xml
  15. +10 −10 samples/Microsoft.AspNet.SignalR.Client.Android.Samples/Resources/Resource.designer.cs
  16. +0 −19 samples/Microsoft.AspNet.SignalR.Client.WindowsStoreJavaScript.Samples/Scripts/CommonClient.js
  17. +15 −4 ...es/Microsoft.AspNet.SignalR.Client.iOS.Samples/Microsoft.AspNet.SignalR.Client.iOS.Samples.csproj
  18. +20 −4 samples/Microsoft.AspNet.SignalR.Client40.Samples/Client.cs
  19. +2 −2 samples/Microsoft.AspNet.SignalR.LoadTestHarness/Microsoft.AspNet.SignalR.LoadTestHarness.csproj
  20. +2 −2 samples/Microsoft.AspNet.SignalR.LoadTestHarness/packages.config
  21. +32 −2 samples/Microsoft.AspNet.SignalR.Samples/App_Start/Startup.cs
  22. +6 −9 samples/Microsoft.AspNet.SignalR.Samples/Microsoft.AspNet.SignalR.Samples.csproj
  23. +1 −1 samples/Microsoft.AspNet.SignalR.Samples/Scripts/hubs.js
  24. +6 −0 samples/Microsoft.AspNet.SignalR.Samples/Web.config
  25. +5 −5 samples/Microsoft.AspNet.SignalR.Samples/packages.config
  26. +1 −0 src/Common/CommonAssemblyInfo.cs
  27. +2 −2 src/Common/CommonVersionInfo.cs
  28. +0 −250 src/Microsoft.AspNet.SignalR.Client.Android/Microsoft.AspNet.SignalR.Client.Android.csproj
  29. +0 −14 src/Microsoft.AspNet.SignalR.Client.Android/Properties/AssemblyInfo.cs
  30. 0 src/Microsoft.AspNet.SignalR.Client.Android/Resources/Resource.Designer.cs
  31. +101 −88 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js
  32. +13 −24 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.hubs.js
  33. +98 −59 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.common.js
  34. +52 −20 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.foreverFrame.js
  35. +12 −4 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.longPolling.js
  36. +1 −1 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.serverSentEvents.js
  37. +16 −5 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.webSockets.js
  38. +1 −1 src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.version.js
  39. +3 −3 src/Microsoft.AspNet.SignalR.Client.Portable/Microsoft.AspNet.SignalR.Client.Portable.csproj
  40. +3 −3 src/Microsoft.AspNet.SignalR.Client.WinRT/Microsoft.AspNet.SignalR.Client.WinRT.csproj
  41. +3 −0 src/Microsoft.AspNet.SignalR.Client.WinRT/Resources.resw
  42. +0 −297 src/Microsoft.AspNet.SignalR.Client.iOS/Microsoft.AspNet.SignalR.Client.iOS.csproj
  43. +0 −10 src/Microsoft.AspNet.SignalR.Client.iOS/Properties/AssemblyInfo.cs
  44. +138 −40 src/Microsoft.AspNet.SignalR.Client/Connection.cs
  45. +27 −6 src/Microsoft.AspNet.SignalR.Client/HeartBeatMonitor.cs
  46. +11 −4 src/Microsoft.AspNet.SignalR.Client/Http/DefaultHttpClient.cs
  47. +6 −1 src/Microsoft.AspNet.SignalR.Client/IConnection.cs
  48. +1 −4 src/Microsoft.AspNet.SignalR.Client/KeepAliveData.cs
  49. +4 −2 src/Microsoft.AspNet.SignalR.Client/Microsoft.AspNet.SignalR.Client.csproj
  50. +11 −2 src/Microsoft.AspNet.SignalR.Client/Resources.Designer.cs
  51. +3 −0 src/Microsoft.AspNet.SignalR.Client/Resources.resx
  52. +0 −52 src/Microsoft.AspNet.SignalR.Client/Transports/ConnectingMessageBuffer.cs
  53. +1 −1 src/Microsoft.AspNet.SignalR.Client/Transports/HttpBasedTransport.cs
  54. +5 −0 src/Microsoft.AspNet.SignalR.Client/Transports/LongPollingTransport.cs
  55. +11 −0 src/Microsoft.AspNet.SignalR.Client/Transports/ServerSentEventsTransport.cs
  56. +21 −2 src/Microsoft.AspNet.SignalR.Client/Transports/TransportHelper.cs
  57. +9 −4 src/Microsoft.AspNet.SignalR.Client45/Http/DefaultHttpClient.cs
  58. +0 −3 src/Microsoft.AspNet.SignalR.Client45/Microsoft.AspNet.SignalR.Client45.csproj
  59. +16 −2 src/Microsoft.AspNet.SignalR.Client45/Transports/WebSocketTransport.cs
  60. +5 −0 src/Microsoft.AspNet.SignalR.Core/Hosting/IResponse.cs
  61. +1 −1 src/Microsoft.AspNet.SignalR.Core/Hubs/HubDispatcher.cs
  62. +38 −7 src/Microsoft.AspNet.SignalR.Core/Hubs/Lookup/ReflectedHubDescriptorProvider.cs
  63. +7 −10 src/Microsoft.AspNet.SignalR.Core/Infrastructure/TaskQueue.cs
  64. +5 −5 src/Microsoft.AspNet.SignalR.Core/Messaging/ScaleoutStream.cs
  65. +2 −2 src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
  66. +6 −0 src/Microsoft.AspNet.SignalR.Core/Owin/ServerResponse.cs
  67. +35 −8 src/Microsoft.AspNet.SignalR.Core/PersistentConnection.cs
  68. +26 −3 src/Microsoft.AspNet.SignalR.Core/Resources.Designer.cs
  69. +12 −1 src/Microsoft.AspNet.SignalR.Core/Resources.resx
  70. +1 −1 src/Microsoft.AspNet.SignalR.Core/Scripts/hubs.js
  71. +1 −1 src/Microsoft.AspNet.SignalR.Core/TaskAsyncHelper.cs
  72. +3 −1 src/Microsoft.AspNet.SignalR.Core/Transports/WebSocketTransport.cs
  73. +2 −2 src/Microsoft.AspNet.SignalR.Core/packages.config
  74. +0 −180 src/Microsoft.AspNet.SignalR.Hosting.Memory/AsyncResult.cs
  75. +0 −233 src/Microsoft.AspNet.SignalR.Hosting.Memory/ClientStream.cs
  76. +0 −13 src/Microsoft.AspNet.SignalR.Hosting.Memory/INetworkObserver.cs
  77. +0 −48 src/Microsoft.AspNet.SignalR.Hosting.Memory/Infrastructure/Headers.cs
  78. +0 −258 src/Microsoft.AspNet.SignalR.Hosting.Memory/MemoryHost.cs
  79. +0 −112 src/Microsoft.AspNet.SignalR.Hosting.Memory/Microsoft.AspNet.SignalR.Hosting.Memory.csproj
  80. +0 −61 src/Microsoft.AspNet.SignalR.Hosting.Memory/NetworkObservable.cs
  81. +0 −260 src/Microsoft.AspNet.SignalR.Hosting.Memory/OwinEnvironment.cs
  82. +0 −6 src/Microsoft.AspNet.SignalR.Hosting.Memory/Properties/AssemblyInfo.cs
  83. +0 −103 src/Microsoft.AspNet.SignalR.Hosting.Memory/Request.cs
  84. +0 −37 src/Microsoft.AspNet.SignalR.Hosting.Memory/Response.cs
  85. +0 −98 src/Microsoft.AspNet.SignalR.Hosting.Memory/ServerStream.cs
  86. +0 −6 src/Microsoft.AspNet.SignalR.Hosting.Memory/packages.config
  87. +4 −16 src/Microsoft.AspNet.SignalR.ServiceBus/Microsoft.AspNet.SignalR.ServiceBus.csproj
  88. +0 −247 src/Microsoft.AspNet.SignalR.ServiceBus/Resources.Designer.cs
  89. +0 −184 src/Microsoft.AspNet.SignalR.ServiceBus/Resources.resx
  90. +116 −36 src/Microsoft.AspNet.SignalR.ServiceBus/ServiceBusConnection.cs
  91. +137 −0 src/Microsoft.AspNet.SignalR.ServiceBus/ServiceBusConnectionContext.cs
  92. +33 −14 src/Microsoft.AspNet.SignalR.ServiceBus/ServiceBusMessageBus.cs
  93. +37 −1 src/Microsoft.AspNet.SignalR.ServiceBus/ServiceBusScaleoutConfiguration.cs
  94. +0 −75 src/Microsoft.AspNet.SignalR.ServiceBus/ServiceBusSubscription.cs
  95. +20 −0 src/Microsoft.AspNet.SignalR.ServiceBus/SubscriptionContext.cs
  96. +1 −1 src/Microsoft.AspNet.SignalR.ServiceBus/packages.config
  97. +1 −28 src/Microsoft.AspNet.SignalR.SqlServer/Resources.Designer.cs
  98. +0 −9 src/Microsoft.AspNet.SignalR.SqlServer/Resources.resx
  99. +0 −4 src/Microsoft.AspNet.SignalR.Stress/Microsoft.AspNet.SignalR.Stress.csproj
  100. +1 −1 src/Microsoft.AspNet.SignalR.Stress/Performance/SendReceiveRun.cs
  101. +2 −2 src/Microsoft.AspNet.SignalR.SystemWeb/Microsoft.AspNet.SignalR.SystemWeb.csproj
  102. +3 −1 src/Microsoft.AspNet.SignalR.SystemWeb/RequestExtensions.cs
  103. +2 −2 src/Microsoft.AspNet.SignalR.SystemWeb/packages.config
  104. +10 −3 src/Microsoft.AspNet.SignalR.Utils/Commands/GenerateHubProxyCommand.cs
  105. +11 −2 src/Microsoft.AspNet.SignalR.Utils/Resources.Designer.cs
  106. +4 −1 src/Microsoft.AspNet.SignalR.Utils/Resources.resx
  107. +16 −1 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Build/test.config.js
  108. +3 −2 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Microsoft.AspNet.SignalR.Client.JS.Tests.csproj
  109. +4 −1 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Scripts/test.utilities.js
  110. +21 −17 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Common/KeepAliveFacts.js
  111. +10 −5 ...Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Common/ResponseRedirectionFacts.js
  112. +1 −1 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Hubs/HubEventHandlerFacts.js
  113. +37 −2 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Hubs/HubProxyFacts.js
  114. +65 −2 .../Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Transports/All/ConnectionFacts.js
  115. +8 −16 ...osoft.AspNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Transports/All/ConnectionStateFacts.js
  116. +64 −0 ...pNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Transports/Fallback/FallbackConnectionFacts.js
  117. +69 −0 ...spNet.SignalR.Client.JS.Tests/Tests/FunctionalTests/Transports/WebSocketsFacts/WebSocketsFacts.js
  118. +35 −88 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Common/KeepAliveFacts.js
  119. +8 −20 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Common/ProcessMessagesFacts.js
  120. +16 −0 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Common/UtilityFacts.js
  121. +28 −6 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Connections/ConnectionFacts.js
  122. +15 −0 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Connections/ConnectionStateFacts.js
  123. +51 −18 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Connections/ConnectionUtilityFacts.js
  124. +26 −0 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Tests/UnitTests/Transports/WebSocketsFacts.js
  125. +1 −0 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/default.html
  126. +2 −2 tests/Microsoft.AspNet.SignalR.Client.JS.Tests/packages.config
  127. +10 −5 tests/Microsoft.AspNet.SignalR.Client.Tests/Client/ConnectionFacts.cs
  128. +49 −31 tests/Microsoft.AspNet.SignalR.Client.Tests/Client/KeepAliveFacts.cs
  129. +30 −2 tests/Microsoft.AspNet.SignalR.Client.Tests/Client/TransportFacts.cs
  130. +74 −0 tests/Microsoft.AspNet.SignalR.DailyTests/Microsoft.AspNet.SignalR.DailyTests.csproj
  131. +91 −0 tests/Microsoft.AspNet.SignalR.DailyTests/NuGet/CommonNuGet.cs
  132. +31 −0 tests/Microsoft.AspNet.SignalR.DailyTests/NuGet/OwinFacts.cs
  133. +102 −0 tests/Microsoft.AspNet.SignalR.DailyTests/NuGet/SignalRFacts.cs
  134. +78 −0 tests/Microsoft.AspNet.SignalR.DailyTests/NuGet/SignalRLocFacts.cs
  135. +36 −0 tests/Microsoft.AspNet.SignalR.DailyTests/Properties/AssemblyInfo.cs
  136. +5 −0 tests/Microsoft.AspNet.SignalR.DailyTests/packages.config
  137. +191 −0 tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/ConnectionFacts.cs
  138. +72 −13 tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/HubProxyFacts.cs
  139. +7 −7 tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/KeepAliveFacts.cs
  140. +50 −0 tests/Microsoft.AspNet.SignalR.FunctionalTests/Client/WebSocketFacts.cs
  141. +5 −8 tests/Microsoft.AspNet.SignalR.FunctionalTests/Microsoft.AspNet.SignalR.FunctionalTests.csproj
  142. +9 −12 tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Connections/ConnectionFacts.cs
  143. +1 −1 tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Connections/PersistentConnectionFacts.cs
  144. +6 −12 tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/HubFacts.cs
  145. +2 −2 tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Hubs/SecurityFacts.cs
  146. +3 −3 tests/Microsoft.AspNet.SignalR.FunctionalTests/packages.config
  147. +70 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/App_Start/Initializer.cs
  148. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Hubs/OnConnectedBufferHub.cs
  149. +0 −25 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/BasicAuthenticationProvider.cs
  150. +91 −0 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/CommonCommandLine.cs
  151. +40 −0 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/CommonLog.cs
  152. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/ExternalTestHost.cs
  153. +65 −0 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/HostedTest.cs
  154. +3 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/IIS/SiteManager.cs
  155. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/IISExpressTestHost.cs
  156. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/ITestHost.cs
  157. +59 −0 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/MemoryHost.cs
  158. +28 −0 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/MemoryHostHttpHandler.cs
  159. +3 −3 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/MemoryTestHost.cs
  160. 0 ...Hosting.Memory → tests/Microsoft.AspNet.SignalR.Tests.Common}/Infrastructure/ProcessExtensions.cs
  161. +1 −1 tests/Microsoft.AspNet.SignalR.Tests.Common/Infrastructure/TracingTestHost.cs
  162. +19 −10 tests/Microsoft.AspNet.SignalR.Tests.Common/Microsoft.AspNet.SignalR.Tests.Common.csproj
  163. +6 −4 tests/Microsoft.AspNet.SignalR.Tests.Common/packages.config
  164. +2 −0 tests/Microsoft.AspNet.SignalR.Tests/Core/Transports/ForeverFrameTransportFacts.cs
  165. +49 −14 tests/Microsoft.AspNet.SignalR.Tests/PersistentConnectionFacts.cs
  166. +10 −4 tools/chutzpah/JSRunners/chutzpahRunner.js
  167. +18 −6 tools/chutzpah/JSRunners/qunitRunner.js
  168. +26 −0 tools/chutzpah/TestFiles/QUnit/qunit.html
  169. BIN tools/chutzpah/chutzpah.console.exe
  170. BIN tools/chutzpah/chutzpah.dll
  171. +9 −0 xamarin/SignalRPackage/component/Details.md
  172. +50 −0 xamarin/SignalRPackage/component/GettingStarted.md
  173. +116 −0 xamarin/SignalRPackage/component/License.md
  174. +24 −0 xamarin/SignalRPackage/component/component.yaml
  175. BIN xamarin/SignalRPackage/component/icons/signalr_128x128.png
  176. BIN xamarin/SignalRPackage/component/icons/signalr_512x512.png
  177. +25 −0 xamarin/SignalRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample.sln
  178. +19 −0 ...n/SignalRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Assets/AboutAssets.txt
  179. +14 −0 xamarin/SignalRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/MainActivity.cs
  180. +64 −0 ...nt/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Microsoft.AspNet.SignalR.Xamarin.Sample.csproj
  181. +6 −0 ...RPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Properties/AndroidManifest.xml
  182. +23 −0 ...gnalRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Properties/AssemblyInfo.cs
  183. +44 −0 ...alRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Resources/AboutResources.txt
  184. +112 −0 ...RPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Resources/Resource.designer.cs
  185. BIN ...nalRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Resources/drawable/Icon.png
  186. +14 −0 ...gnalRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Resources/layout/Main.axml
  187. +5 −0 ...alRPackage/component/samples/Microsoft.AspNet.SignalR.Xamarin.Sample/Resources/values/Strings.xml
  188. BIN xamarin/xamarin-component/mdoc.exe
  189. BIN xamarin/xamarin-component/monodoc.dll
  190. BIN xamarin/xamarin-component/xamarin-component.exe
View
@@ -30,4 +30,5 @@ PublishProfiles/
/tests/Microsoft.AspNet.SignalR.FunctionalTests/artifacts/
/samples/Microsoft.AspNet.SignalR.Client.WindowsStoreJavaScript.Samples/bld/
jquery.signalR.js
-jquery.signalR.min.js
+jquery.signalR.min.js
+xamarin/SignalRPackage/component/lib/mobile/
View
@@ -8,13 +8,15 @@
<!-- Property that enables building a package from a project -->
<BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+ <!-- Determines if package restore consent is required to restore packages -->
+ <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
<!-- Download NuGet.exe if it does not already exist -->
- <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+ <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
</PropertyGroup>
<ItemGroup Condition=" '$(PackageSources)' == '' ">
- <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
<PackageSource Include="https://nuget.org/api/v2/" />
<PackageSource Include="http://www.myget.org/F/aspnetwebstacknightly/" />
</ItemGroup>
@@ -23,44 +25,40 @@
<!-- Windows specific commands -->
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
<PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
- <PackagesDir Condition="$(PackagesDir) == ''">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
- <NuGetExeFile>nuget.exe</NuGetExeFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
<!-- We need to launch nuget.exe with the mono command if we're not on windows -->
<NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
<PackagesConfig>packages.config</PackagesConfig>
- <PackagesDir Condition="$(PackagesDir) == ''">$(SolutionDir)packages</PackagesDir>
- <NuGetExeFile>NuGet.exe</NuGetExeFile>
</PropertyGroup>
<PropertyGroup>
<!-- NuGet command -->
- <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\$(NuGetExeFile)</NuGetExePath>
+ <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
<PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
<NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
- <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono $(NuGetExePath)</NuGetCommand>
+ <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
<PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+ <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+ <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+ <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+ <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
<!-- Commands -->
- <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" -o "$(PackagesDir)" -nocache</RestoreCommand>
+ <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) -nocache</RestoreCommand>
+ <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
- <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p "Configuration=$(Configuration);LocalToolsPath=$(LocalToolsPath)" -o "$(PackageOutputDir)" -symbols</BuildCommand>
-
- <!-- Make the build depend on restore packages -->
+ <!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">
RestorePackages;
$(BuildDependsOn);
</BuildDependsOn>
- <PipelinePreDeployCopyAllFilesToOneFolderDependsOn Condition="$(RestorePackages) == 'true'">
- RestorePackages;
- $(PipelinePreDeployCopyAllFilesToOneFolderDependsOn);
- </PipelinePreDeployCopyAllFilesToOneFolderDependsOn>
-
<!-- Make the build depend on restore packages -->
<BuildDependsOn Condition="$(BuildPackage) == 'true'">
$(BuildDependsOn);
@@ -71,8 +69,16 @@
<Target Name="CheckPrerequisites">
<!-- Raise an error if we're unable to locate nuget.exe -->
<Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
- <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
- <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+ <!--
+ Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+ This effectively acts as a lock that makes sure that the download operation will only happen once and all
+ parallel builds will have to wait for it to complete.
+ -->
+ <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+ </Target>
+
+ <Target Name="_DownloadNuGet">
+ <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
</Target>
<Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
@@ -85,8 +91,6 @@
</Target>
<Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
- <Message Importance="high" Text="NuGet.targets: LocalToolsPath = $(LocalToolsPath)" />
-
<Exec Command="$(BuildCommand)"
Condition=" '$(OS)' != 'Windows_NT' " />
@@ -113,7 +117,7 @@
Log.LogMessage("Downloading latest version of NuGet.exe...");
WebClient webClient = new WebClient();
- webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
+ webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
return true;
}
@@ -125,23 +129,4 @@
</Code>
</Task>
</UsingTask>
-
- <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
- <ParameterGroup>
- <EnvKey ParameterType="System.String" Required="true" />
- <EnvValue ParameterType="System.String" Required="true" />
- </ParameterGroup>
- <Task>
- <Using Namespace="System" />
- <Code Type="Fragment" Language="cs">
- <![CDATA[
- try {
- Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
- }
- catch {
- }
- ]]>
- </Code>
- </Task>
- </UsingTask>
</Project>
@@ -1,74 +1,36 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.Android", "src\Microsoft.AspNet.SignalR.Client.Android\Microsoft.AspNet.SignalR.Client.Android.csproj", "{677A3843-1774-48D8-B00C-01F1151AF2BC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.iOS", "src\Microsoft.AspNet.SignalR.Client.iOS\Microsoft.AspNet.SignalR.Client.iOS.csproj", "{44FABCC9-52E0-43AD-ABA9-C1FA909941E0}"
-EndProject
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.Android.Samples", "samples\Microsoft.AspNet.SignalR.Client.Android.Samples\Microsoft.AspNet.SignalR.Client.Android.Samples.csproj", "{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.SignalR.Client.iOS.Samples", "samples\Microsoft.AspNet.SignalR.Client.iOS.Samples\Microsoft.AspNet.SignalR.Client.iOS.Samples.csproj", "{DBFB861C-DF65-4784-B2B7-85DBFF01E787}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- Debug|iPhoneSimulator = Debug|iPhoneSimulator
- Release|iPhoneSimulator = Release|iPhoneSimulator
- Debug|iPhone = Debug|iPhone
- Release|iPhone = Release|iPhone
+ Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
Ad-Hoc|iPhone = Ad-Hoc|iPhone
- AppStore|iPhone = AppStore|iPhone
Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+ AppStore|Any CPU = AppStore|Any CPU
+ AppStore|iPhone = AppStore|iPhone
AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+ Debug|Any CPU = Debug|Any CPU
+ Debug|iPhone = Debug|iPhone
+ Debug|iPhoneSimulator = Debug|iPhoneSimulator
+ Release|Any CPU = Release|Any CPU
+ Release|iPhone = Release|iPhone
+ Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.AppStore|iPhone.Build.0 = AppStore|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Debug|iPhone.ActiveCfg = Debug|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Debug|iPhone.Build.0 = Debug|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Release|iPhone.ActiveCfg = Release|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Release|iPhone.Build.0 = Release|iPhone
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
- {44FABCC9-52E0-43AD-ABA9-C1FA909941E0}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.AppStore|iPhone.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Debug|iPhone.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Release|Any CPU.Build.0 = Release|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Release|iPhone.ActiveCfg = Release|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Release|iPhone.Build.0 = Release|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {677A3843-1774-48D8-B00C-01F1151AF2BC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
- {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+ {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+ {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+ {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
- {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
- {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|iPhone.Build.0 = Debug|Any CPU
+ {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+ {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+ {AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|iPhone.Build.0 = Release|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -83,10 +45,12 @@ Global
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Release|iPhone.Build.0 = Release|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{AA8BF4BF-7805-40C0-977F-0D5D7AA4D948}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+ {DBFB861C-DF65-4784-B2B7-85DBFF01E787}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.AppStore|iPhone.Build.0 = AppStore|iPhone
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.AppStore|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
@@ -104,7 +68,10 @@ Global
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{DBFB861C-DF65-4784-B2B7-85DBFF01E787}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = samples\Microsoft.AspNet.SignalR.Client.iOS.Samples\Microsoft.AspNet.SignalR.Client.iOS.Samples.csproj
+ StartupItem = samples\Microsoft.AspNet.SignalR.Client.Android.Samples\Microsoft.AspNet.SignalR.Client.Android.Samples.csproj
EndGlobalSection
EndGlobal
Oops, something went wrong.

0 comments on commit cf30451

Please sign in to comment.