diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-29 08:21:56 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-29 08:21:56 -0400 |
| commit | cb7f04e4d3ff0a14dabb89ff828dde5a4703dc6b (patch) | |
| tree | 67324c73e189d83af7ca2cce605907b0af9b77c8 /MediaBrowser.Common | |
| parent | de746097844954d2467157ba4fdc7f978e26decb (diff) | |
Upgraded Protobuf, and added api support for it
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 5 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Common/packages.config | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 22a7b5920..d80303d1f 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -36,8 +36,9 @@ </Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
- <Reference Include="protobuf-net">
- <HintPath>..\packages\protobuf-net.2.0.0.480\lib\net40\protobuf-net.dll</HintPath>
+ <Reference Include="protobuf-net, Version=2.0.0.580, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\protobuf-net.2.0.0.580\lib\net40\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Text, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
diff --git a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs index a0696d4a6..1a366c158 100644 --- a/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs +++ b/MediaBrowser.Common/Net/Handlers/BaseSerializationHandler.cs @@ -5,7 +5,7 @@ using MediaBrowser.Common.Serialization; namespace MediaBrowser.Common.Net.Handlers
{
- public abstract class BaseSerializationHandler<T> : BaseHandler
+ public abstract class BaseJsonHandler<T> : BaseHandler
{
public SerializationFormat SerializationFormat
{
diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index 3b8aa6748..60910df1c 100644 --- a/MediaBrowser.Common/packages.config +++ b/MediaBrowser.Common/packages.config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MahApps.Metro" version="0.9.0.0" targetFramework="net45" />
- <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />
+ <package id="protobuf-net" version="2.0.0.580" 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" />
|