Merge branch 'release' into dev

Conflicts: build/Microsoft.AspNet.SignalR.versions.targets samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/hubs.js samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js samples/Microsoft.AspNet.SignalR.LoadTestHarness/Scripts/jquery.signalR.js samples/Microsoft.AspNet.SignalR.LoadTestHarness/Scripts/jquery.signalR.min.js src/Common/CommonVersionInfo.cs src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.core.js src/Microsoft.AspNet.SignalR.Core/Scripts/hubs.js tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Scripts/jquery.signalR.js
SignalR · May 1, 2013 · b44387f · b44387f
2 parents 1a10a06 + 5819b87
commit b44387f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 30 deletions.
diff --git a/src/Microsoft.AspNet.SignalR.Core/Messaging/ScaleoutConfiguration.cs b/src/Microsoft.AspNet.SignalR.Core/Messaging/ScaleoutConfiguration.cs
@@ -13,19 +13,6 @@ public class ScaleoutConfiguration
 
         private int _maxQueueLength;
 
-        /// <summary>
-        /// The number of messages to include in a batch before delivering to the scale-out message bus.
-        /// Use in conjunction with the BatchTimeout property to configure message batching.
-        /// Set this property to 0 to disable batching (the default).
-        /// </summary>
-        public uint BatchSize { get; set; }
-
-        /// <summary>
-        /// The amount of time to wait before delivering a batch of messages to the scale-out message bus.
-        /// Use in conjunction with the BatchSize property to configure message batching.
-        /// </summary>
-        public TimeSpan BatchTimeout { get; set; }
-
         /// <summary>
         /// The maximum length of the outgoing send queue. Messages being sent to the backplane are queued
         /// up to this length. After the max length is reached, further sends will throw an <see cref="System.InvalidOperationException">InvalidOperationException</see>.

diff --git a/src/Microsoft.AspNet.SignalR.Redis/RedisScaleoutConfiguration.cs b/src/Microsoft.AspNet.SignalR.Redis/RedisScaleoutConfiguration.cs
@@ -44,7 +44,7 @@ public RedisScaleoutConfiguration(Func<RedisConnection> connectionFactory, strin
         /// <summary>
         /// The Redis event key to use.
         /// </summary>
-        public string EventKey { get; set; }
+        public string EventKey { get; private set; }
 
         private static Func<RedisConnection> MakeConnectionFactory(string server, int port, string password)
         {

diff --git a/src/Microsoft.AspNet.SignalR.ServiceBus/Microsoft.AspNet.SignalR.ServiceBus.csproj b/src/Microsoft.AspNet.SignalR.ServiceBus/Microsoft.AspNet.SignalR.ServiceBus.csproj
@@ -39,11 +39,11 @@
   <ItemGroup>
     <Reference Include="Microsoft.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\WindowsAzure.ServiceBus.2.0.0-beta\lib\net40-full\Microsoft.ServiceBus.dll</HintPath>
+      <HintPath>..\..\packages\WindowsAzure.ServiceBus.2.0.1.0\lib\net40-full\Microsoft.ServiceBus.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.7.0.3\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.0.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/src/Microsoft.AspNet.SignalR.ServiceBus/packages.config b/src/Microsoft.AspNet.SignalR.ServiceBus/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.7.0.3" targetFramework="net40" />
-  <package id="WindowsAzure.ServiceBus" version="2.0.0-beta" targetFramework="net40" />
+  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.0.0" targetFramework="net40" />
+  <package id="WindowsAzure.ServiceBus" version="2.0.1.0" targetFramework="net40" />
 </packages>
diff --git a/src/Microsoft.AspNet.SignalR.SqlServer/Microsoft.AspNet.SignalR.SqlServer.csproj b/src/Microsoft.AspNet.SignalR.SqlServer/Microsoft.AspNet.SignalR.SqlServer.csproj
@@ -34,10 +34,6 @@
     <DocumentationFile>bin\Release\Microsoft.AspNet.SignalR.SqlServer.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
@@ -93,9 +89,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="install.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/src/Microsoft.AspNet.SignalR.SqlServer/packages.config b/src/Microsoft.AspNet.SignalR.SqlServer/packages.config