diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-18 12:51:47 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-18 12:51:47 -0400 |
| commit | 1e61debf2db53b49f9f71162ee389b045eb06904 (patch) | |
| tree | 6cef709af0ed48e59570892aed63e7ec9d5b9357 /MediaBrowser.Controller | |
| parent | 6d7c29f6c833badb15d01c153005515bcb3381b5 (diff) | |
Updated service stack json and reactive extensions to the latest
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 10 | ||||
| -rw-r--r-- | MediaBrowser.Controller/packages.config | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index d0ad18e26..ea5944126 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -33,8 +33,14 @@ <Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
- <Reference Include="System.Reactive">
- <HintPath>..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll</HintPath>
+ <Reference Include="System.Reactive.Core">
+ <HintPath>..\packages\Rx-Core.2.0.20814\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>
+ <Reference Include="System.Reactive.Linq">
+ <HintPath>..\packages\Rx-Linq.2.0.20814\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 47102a263..1e24977e2 100644 --- a/MediaBrowser.Controller/packages.config +++ b/MediaBrowser.Controller/packages.config @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Rx-Main" version="1.0.11226" 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" />
</packages>
\ No newline at end of file |