open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated reactive extensions

Browse Source
pull/702/head
LukePulverenti Luke Pulverenti luke pulverenti 12 years ago
parent 992bd8c1d9
commit 2b8f23dff4
8 changed files with 61 additions and 28 deletions
Show Stats Download Patch File Download Diff File

15
MediaBrowser.Api/MediaBrowser.Api.csproj
Unescape View File

@ -34,14 +34,17 @@
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive.Core"> <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.0.20823\lib\Net45\System.Reactive.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Interfaces"> <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.0.20823\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Linq"> <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />

6
MediaBrowser.Api/packages.config
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Rx-Core" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Linq" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />
</packages> </packages>

16
MediaBrowser.Common/MediaBrowser.Common.csproj
Unescape View File

@ -45,14 +45,17 @@
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Reactive.Core"> <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.0.20823\lib\Net45\System.Reactive.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Interfaces"> <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.0.20823\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Linq"> <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Runtime.Remoting" /> <Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Xaml" /> <Reference Include="System.Xaml" />
@ -100,6 +103,7 @@
<Compile Include="UI\SingleInstance.cs" /> <Compile Include="UI\SingleInstance.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
MediaBrowser.Common/app.config
Unescape View File

@ -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>

6
MediaBrowser.Common/packages.config
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="protobuf-net" version="2.0.0.480" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />
<package id="Rx-Core" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Linq" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.5" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.5" targetFramework="net45" />
</packages> </packages>

15
MediaBrowser.Controller/MediaBrowser.Controller.csproj
Unescape View File

@ -37,14 +37,17 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" /> <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Reactive.Core"> <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Core.2.0.20823\lib\Net45\System.Reactive.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Interfaces"> <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Interfaces.2.0.20823\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Reactive.Linq"> <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
</Reference> </Reference>
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />

6
MediaBrowser.Controller/packages.config
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="protobuf-net" version="2.0.0.480" targetFramework="net45" /> <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />
<package id="Rx-Core" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Core" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.0.20823" targetFramework="net45" />
<package id="Rx-Linq" version="2.0.20814" targetFramework="net45" /> <package id="Rx-Linq" version="2.0.20823" targetFramework="net45" />
</packages> </packages>

10
MediaBrowser.ServerApplication/App.config
Unescape View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<appSettings> <appSettings>
<add key="ProgramDataPath" value="..\..\..\ProgramData" /> <add key="ProgramDataPath" value="..\..\..\ProgramData" />
@ -12,6 +12,14 @@
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly> </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> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
Write Preview
Loading…
Cancel
Save