aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.ApiInteraction.Portable/MediaBrowser.ApiInteraction.Portable.csproj3
-rw-r--r--MediaBrowser.ApiInteraction/ApiClient.cs10
-rw-r--r--MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj3
-rw-r--r--MediaBrowser.Model/DTO/UserItemDataDto.cs2
-rw-r--r--Nuget/MediaBrowser.ApiClient.nuspec30
5 files changed, 42 insertions, 6 deletions
diff --git a/MediaBrowser.ApiInteraction.Portable/MediaBrowser.ApiInteraction.Portable.csproj b/MediaBrowser.ApiInteraction.Portable/MediaBrowser.ApiInteraction.Portable.csproj
index 2b6b0b123..973066307 100644
--- a/MediaBrowser.ApiInteraction.Portable/MediaBrowser.ApiInteraction.Portable.csproj
+++ b/MediaBrowser.ApiInteraction.Portable/MediaBrowser.ApiInteraction.Portable.csproj
@@ -98,6 +98,9 @@
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.0-rc\tools\Microsoft.Bcl.Build.targets" />
+ <PropertyGroup>
+ <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index ef8197e16..4f701532b 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -656,7 +656,7 @@ namespace MediaBrowser.ApiInteraction
/// </summary>
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
- /// <returns>Task{DtoUserItemData}.</returns>
+ /// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> ReportPlaybackStartAsync(string itemId, Guid userId)
{
@@ -686,7 +686,7 @@ namespace MediaBrowser.ApiInteraction
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <param name="positionTicks">The position ticks.</param>
- /// <returns>Task{DtoUserItemData}.</returns>
+ /// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks)
{
@@ -718,7 +718,7 @@ namespace MediaBrowser.ApiInteraction
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <param name="positionTicks">The position ticks.</param>
- /// <returns>Task{DtoUserItemData}.</returns>
+ /// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks)
{
@@ -749,7 +749,7 @@ namespace MediaBrowser.ApiInteraction
/// </summary>
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
- /// <returns>Task{DtoUserItemData}.</returns>
+ /// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task ClearUserItemRatingAsync(string itemId, Guid userId)
{
@@ -774,7 +774,7 @@ namespace MediaBrowser.ApiInteraction
/// <param name="itemId">The item id.</param>
/// <param name="userId">The user id.</param>
/// <param name="likes">if set to <c>true</c> [likes].</param>
- /// <returns>Task{DtoUserItemData}.</returns>
+ /// <returns>Task{UserItemDataDto}.</returns>
/// <exception cref="System.ArgumentNullException">itemId</exception>
public Task<UserItemDataDto> UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes)
{
diff --git a/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj b/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
index f3a25e897..0d9938891 100644
--- a/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
+++ b/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj
@@ -75,6 +75,9 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+ <PropertyGroup>
+ <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+ </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
diff --git a/MediaBrowser.Model/DTO/UserItemDataDto.cs b/MediaBrowser.Model/DTO/UserItemDataDto.cs
index bcfbce49e..0a362e796 100644
--- a/MediaBrowser.Model/DTO/UserItemDataDto.cs
+++ b/MediaBrowser.Model/DTO/UserItemDataDto.cs
@@ -4,7 +4,7 @@ using ProtoBuf;
namespace MediaBrowser.Model.Dto
{
/// <summary>
- /// Class DtoUserItemData
+ /// Class UserItemDataDto
/// </summary>
[ProtoContract]
public class UserItemDataDto : INotifyPropertyChanged
diff --git a/Nuget/MediaBrowser.ApiClient.nuspec b/Nuget/MediaBrowser.ApiClient.nuspec
new file mode 100644
index 000000000..2ee732d8a
--- /dev/null
+++ b/Nuget/MediaBrowser.ApiClient.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+ <metadata>
+ <id>MediaBrowser.ApiClient</id>
+ <version>3.0.0.0-beta</version>
+ <title>MediaBrowser.ApiInteraction</title>
+ <authors>Media Browser Team</authors>
+ <owners>Luke</owners>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>Description</description>
+ <copyright>Copyright © 2012</copyright>
+ <dependencies>
+ <group>
+ <dependency id="protobuf-net" version="2.0.0.621" />
+ </group>
+ <group targetFramework=".NETFramework4.5">
+ <dependency id="ServiceStack.Text" version="3.9.37" />
+ </group>
+ <group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
+ <dependency id="Newtonsoft.Json" version="4.5.11" />
+ <dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" />
+ <dependency id="Microsoft.Net.Http" version="2.1.3-beta" />
+ </group>
+ </dependencies>
+ </metadata>
+ <files>
+ <file src="dlls\MediaBrowser.ApiInteraction.dll" target="lib\net45\MediaBrowser.ApiInteraction.dll" />
+ <file src="dlls\MediaBrowser.ApiInteraction.Portable.dll" target="lib\portable-net45+sl4+wp71+win8\MediaBrowser.ApiInteraction.Portable.dll" />
+ </files>
+</package> \ No newline at end of file