Merge branch 'RavenDB-5290' of https://github.com/IdanHaim/ravendb in…

…to v3.5
ravendb · Sep 19, 2016 · 4daab50 · 4daab50
2 parents 85d3924 + ab2722d
commit 4daab50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/Raven.Database/Indexing/IndexBatchSizeAutoTuner.cs b/Raven.Database/Indexing/IndexBatchSizeAutoTuner.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using System.Reactive.Disposables;
+using Raven.Abstractions.Extensions;
 
 namespace Raven.Database.Indexing
 {
@@ -82,7 +82,7 @@ public IDisposable ConsiderLimitingNumberOfItemsToProcessForThisBatch(int? maxIn
                 return null;
 
             NumberOfItemsToProcessInSingleBatch = newValue;
-            return Disposable.Create(() => NumberOfItemsToProcessInSingleBatch = oldValue);
+            return new DisposableAction(() => NumberOfItemsToProcessInSingleBatch = oldValue);
         }
     }
 }
diff --git a/Raven.Database/Raven.Database.csproj b/Raven.Database/Raven.Database.csproj
@@ -205,22 +205,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />