Updated reactive extensions

8 files changed, 61 insertions, 28 deletions

diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 67c785627..d234beb15 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -34,14 +34,17 @@
     <Reference Include="System.ComponentModel.Composition" />

     <Reference Include="System.Core" />

     <Reference Include="System.Drawing" />

-    <Reference Include="System.Reactive.Core">

-      <HintPath>..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll</HintPath>

+    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Core.2.0.20823\lib\Net45\System.Reactive.Core.dll</HintPath>

     </Reference>

-    <Reference Include="System.Reactive.Interfaces">

-      <HintPath>..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll</HintPath>

+    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Interfaces.2.0.20823\lib\Net45\System.Reactive.Interfaces.dll</HintPath>

     </Reference>

-    <Reference Include="System.Reactive.Linq">

-      <HintPath>..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll</HintPath>

+    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>

     </Reference>

     <Reference Include="System.Runtime.Serialization" />

     <Reference Include="System.Xml.Linq" />

diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config
index 1e24977e2..42f16a267 100644
--- a/MediaBrowser.Api/packages.config
+++ b/MediaBrowser.Api/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="Rx-Core" version="2.0.20814" targetFramework="net45" />

-  <package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" />

-  <package id="Rx-Linq" version="2.0.20814" targetFramework="net45" />

+  <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />

+  <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />

+  <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 2d3d56da9..d1f318ab4 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -45,14 +45,17 @@
     <Reference Include="System.Configuration" />

     <Reference Include="System.Core" />

     <Reference Include="System.Drawing" />

-    <Reference Include="System.Reactive.Core">

-      <HintPath>..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll</HintPath>

+    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Core.2.0.20823\lib\Net45\System.Reactive.Core.dll</HintPath>

     </Reference>

-    <Reference Include="System.Reactive.Interfaces">

-      <HintPath>..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll</HintPath>

+    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Interfaces.2.0.20823\lib\Net45\System.Reactive.Interfaces.dll</HintPath>

     </Reference>

-    <Reference Include="System.Reactive.Linq">

-      <HintPath>..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll</HintPath>

+    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>

     </Reference>

     <Reference Include="System.Runtime.Remoting" />

     <Reference Include="System.Xaml" />

@@ -100,6 +103,7 @@
     <Compile Include="UI\SingleInstance.cs" />

   </ItemGroup>

   <ItemGroup>

+    <None Include="app.config" />

     <None Include="packages.config" />

   </ItemGroup>

   <ItemGroup>

diff --git a/MediaBrowser.Common/app.config b/MediaBrowser.Common/app.config
new file mode 100644
index 000000000..037800f7f
--- /dev/null
+++ b/MediaBrowser.Common/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>

+<configuration>

+  <runtime>

+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

+      <dependentAssembly>

+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="f300afd708cefcd3" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />

+      </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="f300afd708cefcd3" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />

+      </dependentAssembly>

+    </assemblyBinding>

+  </runtime>

+</configuration>
\ No newline at end of file
diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config
index a4e0c9817..96da7ddad 100644
--- a/MediaBrowser.Common/packages.config
+++ b/MediaBrowser.Common/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

   <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />

-  <package id="Rx-Core" version="2.0.20814" targetFramework="net45" />

-  <package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" />

-  <package id="Rx-Linq" version="2.0.20814" targetFramework="net45" />

+  <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />

+  <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />

+  <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />

   <package id="ServiceStack.Text" version="3.9.5" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 610a4cc01..5055ff1fc 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -37,14 +37,17 @@
     <Reference Include="System" />

     <Reference Include="System.ComponentModel.Composition" />

     <Reference Include="System.Core" />

-    <Reference Include="System.Reactive.Core">

-      <HintPath>..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll</HintPath>

+    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Core.2.0.20823\lib\Net45\System.Reactive.Core.dll</HintPath>

     </Reference>

-    <Reference Include="System.Reactive.Interfaces">

-      <HintPath>..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll</HintPath>

+    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Interfaces.2.0.20823\lib\Net45\System.Reactive.Interfaces.dll</HintPath>

     </Reference>

-    <Reference Include="System.Reactive.Linq">

-      <HintPath>..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll</HintPath>

+    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

+      <SpecificVersion>False</SpecificVersion>

+      <HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>

     </Reference>

     <Reference Include="System.Xml.Linq" />

     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/MediaBrowser.Controller/packages.config b/MediaBrowser.Controller/packages.config
index 9f431a0bc..d23d0cb13 100644
--- a/MediaBrowser.Controller/packages.config
+++ b/MediaBrowser.Controller/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

   <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />

-  <package id="Rx-Core" version="2.0.20814" targetFramework="net45" />

-  <package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" />

-  <package id="Rx-Linq" version="2.0.20814" targetFramework="net45" />

+  <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />

+  <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />

+  <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />

 </packages>
\ No newline at end of file
diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config
index 5aff9b350..4b2ffa81d 100644
--- a/MediaBrowser.ServerApplication/App.config
+++ b/MediaBrowser.ServerApplication/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>

+<?xml version="1.0" encoding="utf-8"?>

 <configuration>

   <appSettings>

     <add key="ProgramDataPath" value="..\..\..\ProgramData" />

@@ -12,6 +12,14 @@
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />

       </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="f300afd708cefcd3" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />

+      </dependentAssembly>

+      <dependentAssembly>

+        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="f300afd708cefcd3" culture="neutral" />

+        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />

+      </dependentAssembly>

     </assemblyBinding>

   </runtime>

 </configuration>
\ No newline at end of file