diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index d4333de95..bc4a6ce75 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -34,9 +34,14 @@ - - False - ..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll + + ..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll + + + ..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll + + + ..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll @@ -81,15 +86,15 @@ MediaBrowser.Model - - - + + + xcopy "$(TargetPath)" "$(SolutionDir)\ProgramData\Plugins\$(ProjectName)\" /y diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config index 47102a263..1e24977e2 100644 --- a/MediaBrowser.Api/packages.config +++ b/MediaBrowser.Api/packages.config @@ -1,4 +1,6 @@  - + + + \ No newline at end of file diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index bd3a58c04..6d7037e22 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -33,18 +33,23 @@ - + False - ..\packages\ServiceStack.Text.3.9.4\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll - - False - ..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll + + ..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll + + + ..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll + + + ..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index ad9f8efad..6d863a76a 100644 --- a/MediaBrowser.Common/packages.config +++ b/MediaBrowser.Common/packages.config @@ -1,5 +1,7 @@  - - + + + + \ No newline at end of file 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 @@ - - ..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll + + ..\packages\Rx-Core.2.0.20814\lib\Net45\System.Reactive.Core.dll + + + ..\packages\Rx-Interfaces.2.0.20814\lib\Net45\System.Reactive.Interfaces.dll + + + ..\packages\Rx-Linq.2.0.20814\lib\Net45\System.Reactive.Linq.dll 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 @@  - + + + \ No newline at end of file diff --git a/MediaBrowser.sln b/MediaBrowser.sln index a6e5e400d..b37685812 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -21,6 +21,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.ServerApplicat EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.WebDashboard", "MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj", "{5624B7B5-B5A7-41D8-9F10-CC5611109619}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F0E0E64C-2A6F-4E35-9533-D53AC07C2CD1}" + ProjectSection(SolutionItems) = preProject + .nuget\packages.config = .nuget\packages.config + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU