Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts: MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll
11 years ago · 84507736a0
parent a2d215b6ae 4a46612c3f
commit 84507736a0
24 changed files with 2542 additions and 2420 deletions
--- a/.gitignore
+++ b/.gitignore
@ -145,6 +145,7 @@ publish/
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 packages/
+dlls/

 # Windows Azure Build Output
 csx
--- 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">
--- 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)
        {
--- 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">
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@ -228,6 +228,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">
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@ -227,8 +227,7 @@
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
    <PreBuildEvent>
--- 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
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@ -125,8 +125,7 @@
  </ItemGroup>
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@ -66,7 +66,7 @@
    <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>
  <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
  </PropertyGroup>
  <PropertyGroup>
    <ManifestCertificateThumbprint>9633DCDB4A07D3328EFB99299C6DFB1823EBC4BE</ManifestCertificateThumbprint>
@ -373,7 +373,22 @@
  <ItemGroup />
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y</PostBuildEvent>
+    <PostBuildEvent>xcopy "$(SolutionDir)\packages\System.Data.SQLite.1.0.84.0\content\net40\x86\SQLite.Interop.dll" "$(TargetDir)" /y
+
+if $(ConfigurationName) == Release (
+xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y
+mkdir "$(SolutionDir)..\Deploy\Server\System\x64"
+xcopy "$(TargetDir)x64" "$(SolutionDir)..\Deploy\Server\System\x64" /y
+
+mkdir "$(SolutionDir)..\Deploy\Server\System\x86"
+xcopy "$(TargetDir)x86" "$(SolutionDir)..\Deploy\Server\System\x86" /y
+
+mkdir "$(SolutionDir)..\Deploy\Server\System\CorePlugins"
+xcopy "$(TargetDir)CorePlugins" "$(SolutionDir)..\Deploy\Server\System\CorePlugins" /y
+
+del 
+"$(SolutionDir)7za" a -tzip "$(SolutionDir)..\Deploy\MBServer.zip" "$(SolutionDir)..\Deploy\Server\*"
+)</PostBuildEvent>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/MediaBrowser.UI.Controls/MediaBrowser.UI.Controls.csproj
+++ b/MediaBrowser.UI.Controls/MediaBrowser.UI.Controls.csproj
@ -97,6 +97,9 @@
    </Page>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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">
--- a/MediaBrowser.UI/MediaBrowser.UI.csproj
+++ b/MediaBrowser.UI/MediaBrowser.UI.csproj
@ -1311,6 +1311,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">
--- a/MediaBrowser.WebDashboard/Html/css/images/mblogoblackfull.png
+++ b/MediaBrowser.WebDashboard/Html/css/images/mblogoblackfull.png
--- a/MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png
+++ b/MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png
--- a/MediaBrowser.WebDashboard/Html/css/images/mblogotextblack.png
+++ b/MediaBrowser.WebDashboard/Html/css/images/mblogotextblack.png
--- a/MediaBrowser.WebDashboard/Html/css/images/mblogotextwhite.png
+++ b/MediaBrowser.WebDashboard/Html/css/images/mblogotextwhite.png
--- a/MediaBrowser.WebDashboard/Html/css/images/mblogowhitefull.png
+++ b/MediaBrowser.WebDashboard/Html/css/images/mblogowhitefull.png
--- a/MediaBrowser.WebDashboard/Html/css/site.css
+++ b/MediaBrowser.WebDashboard/Html/css/site.css
--- a/MediaBrowser.WebDashboard/Html/scripts/site.js
+++ b/MediaBrowser.WebDashboard/Html/scripts/site.js
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@ -1,416 +1,413 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5624B7B5-B5A7-41D8-9F10-CC5611109619}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MediaBrowser.WebDashboard</RootNamespace>
-    <AssemblyName>MediaBrowser.WebDashboard</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ServiceStack, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.3.9.37\lib\net35\ServiceStack.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Common, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Common.3.9.37\lib\net35\ServiceStack.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Interfaces, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Common.3.9.37\lib\net35\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.OrmLite, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.37\lib\ServiceStack.OrmLite.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.37\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Redis, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Redis.3.9.37\lib\net35\ServiceStack.Redis.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.3.9.37\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Text.3.9.37\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs">
-      <Link>Properties\SharedVersion.cs</Link>
-    </Compile>
-    <Compile Include="Api\DashboardInfo.cs" />
-    <Compile Include="Api\DashboardService.cs" />
-    <Compile Include="Api\DashboardInfoWebSocketListener.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
-      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
-      <Name>MediaBrowser.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
-      <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
-      <Name>MediaBrowser.Controller</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
-      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
-      <Name>MediaBrowser.Model</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\index.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\advanced.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\dashboard.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\Site.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\site.css" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\library.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\metadata.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\userProfiles.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\plugins.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\login.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\logindefault.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\uiSettings.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\editUser.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\favicon.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\touchicon.png" />
-    <EmbeddedResource Include="Html\css\images\touchicon114.png" />
-    <EmbeddedResource Include="Html\css\images\touchicon72.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\iossplash.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\updatePassword.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\userImage.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\IndexPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\mblogowhitefull.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\mblogoblackfull.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\defaultCollectionImage.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\toolsWhite.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\currentUserDefaultWhite.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\rightArrow.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\userFlyoutDefault.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\MediaLibraryPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\DisplaySettingsPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\PluginsPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\MetadataConfigurationPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\LoginPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\UpdatePasswordPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\AdvancedConfigurationPage.js" />
-    <EmbeddedResource Include="Html\scripts\EditUserPage.js" />
-    <EmbeddedResource Include="Html\scripts\UserImagePage.js" />
-    <EmbeddedResource Include="Html\scripts\UserProfilesPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\advancedMetadata.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\AdvancedMetadataConfigurationPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\pluginUpdates.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\PluginUpdatesPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\addPlugin.html" />
-    <EmbeddedResource Include="Html\scripts\AddPluginPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\bg.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\pluginCatalog.html" />
-    <EmbeddedResource Include="Html\scripts\PluginCatalogPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\leftArrowBlack.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\leftArrowWhite.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\currentUserDefaultBlack.png" />
-    <EmbeddedResource Include="Html\css\images\toolsBlack.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scheduledTasks.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\ScheduledTasksPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scheduledTask.html" />
-    <EmbeddedResource Include="Html\scripts\ScheduledTaskPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\wizardStart.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\wizardFinish.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\wizardUser.html" />
-    <EmbeddedResource Include="Html\wizardLibrary.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\WizardStartPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\WizardUserPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\cloudNetwork.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\movieFolder.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\checkmarkblack.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\log.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\LogPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\metadataImages.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\MetadataImagesPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\DashboardPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\checkMarkGreen.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\clients\html5.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\clients\android.png" />
-    <EmbeddedResource Include="Html\css\images\clients\ios.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\clients\mb.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\clients\windowsrt.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\clients\windowsphone.png" />
-    <EmbeddedResource Include="Html\css\images\clients\win8.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\notifications\download.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\Extensions.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\support.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\SupporterPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\supporter.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\suppbadge.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\premiumflag.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\supporterKey.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\SupporterKeyPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\donatepp.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\faicons-v2.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\faicons.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\ajax-loader.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-18-black-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-18-white-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-36-black-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-36-white-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\index.html" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\jqm-icon-pack-3.0.0-fa.css" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\ajax-loader.gif" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\ajax-loader.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-18-black-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-18-white-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-36-black-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-36-white-pack.png" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\index.html" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\jqm-icon-pack-2.0-original.css" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\fontawesome-webfont.eot" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\fontawesome-webfont.ttf" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\fontawesome-webfont.woff" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\FontAwesome.otf" />
-    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\jqm-icon-pack-3.0.0-fa.scss" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\registerpp.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\home.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\notifications\done.png" />
-    <EmbeddedResource Include="Html\css\images\notifications\error.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\notifications\cancelled.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\notifications\info.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\itemDetails.html" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\scripts\ItemDetailPage.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Html\css\images\media\playCircle.png" />
-    <EmbeddedResource Include="Html\css\images\media\nextTrack.png" />
-    <EmbeddedResource Include="Html\css\images\media\pause.png" />
-    <EmbeddedResource Include="Html\css\images\media\play.png" />
-    <EmbeddedResource Include="Html\css\images\media\previousTrack.png" />
-    <EmbeddedResource Include="Html\css\images\media\stop.png" />
-    <EmbeddedResource Include="Html\css\images\itemDetails\videoDefault.png" />
-    <EmbeddedResource Include="Html\css\images\itemDetails\audioDefault.png" />
-    <EmbeddedResource Include="Html\css\images\itemDetails\gameDefault.png" />
-    <Content Include="Html\css\images\stars.png" />
-    <EmbeddedResource Include="Html\scripts\MediaPlayer.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\MediaBrowser.ServerApplication\CorePlugins\" /y</PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{5624B7B5-B5A7-41D8-9F10-CC5611109619}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MediaBrowser.WebDashboard</RootNamespace>
+    <AssemblyName>MediaBrowser.WebDashboard</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ServiceStack, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.3.9.37\lib\net35\ServiceStack.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Common, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.37\lib\net35\ServiceStack.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Interfaces, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.37\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.OrmLite, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.37\lib\ServiceStack.OrmLite.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.OrmLite.SqlServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.37\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Redis, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Redis.3.9.37\lib\net35\ServiceStack.Redis.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.ServiceInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.3.9.37\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text, Version=3.9.37.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.37\lib\net35\ServiceStack.Text.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs">
+      <Link>Properties\SharedVersion.cs</Link>
+    </Compile>
+    <Compile Include="Api\DashboardInfo.cs" />
+    <Compile Include="Api\DashboardService.cs" />
+    <Compile Include="Api\DashboardInfoWebSocketListener.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+      <Name>MediaBrowser.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
+      <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
+      <Name>MediaBrowser.Controller</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\index.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\advanced.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\dashboard.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\Site.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\site.css" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\library.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\metadata.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\userProfiles.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\plugins.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\login.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\logindefault.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\uiSettings.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\editUser.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\favicon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\touchicon.png" />
+    <EmbeddedResource Include="Html\css\images\touchicon114.png" />
+    <EmbeddedResource Include="Html\css\images\touchicon72.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\iossplash.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\updatePassword.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\userImage.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\IndexPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\defaultCollectionImage.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\toolsWhite.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\currentUserDefaultWhite.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\rightArrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\userFlyoutDefault.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\MediaLibraryPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\DisplaySettingsPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\PluginsPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\MetadataConfigurationPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\LoginPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\UpdatePasswordPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\AdvancedConfigurationPage.js" />
+    <EmbeddedResource Include="Html\scripts\EditUserPage.js" />
+    <EmbeddedResource Include="Html\scripts\UserImagePage.js" />
+    <EmbeddedResource Include="Html\scripts\UserProfilesPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\advancedMetadata.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\AdvancedMetadataConfigurationPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\pluginUpdates.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\PluginUpdatesPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\addPlugin.html" />
+    <EmbeddedResource Include="Html\scripts\AddPluginPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\bg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\pluginCatalog.html" />
+    <EmbeddedResource Include="Html\scripts\PluginCatalogPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\leftArrowBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\leftArrowWhite.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\currentUserDefaultBlack.png" />
+    <EmbeddedResource Include="Html\css\images\toolsBlack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scheduledTasks.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\ScheduledTasksPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scheduledTask.html" />
+    <EmbeddedResource Include="Html\scripts\ScheduledTaskPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\wizardStart.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\wizardFinish.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\wizardUser.html" />
+    <EmbeddedResource Include="Html\wizardLibrary.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\WizardStartPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\WizardUserPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\cloudNetwork.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\movieFolder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\checkmarkblack.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\log.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\LogPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\metadataImages.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\MetadataImagesPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\DashboardPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\checkMarkGreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\clients\html5.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\clients\android.png" />
+    <EmbeddedResource Include="Html\css\images\clients\ios.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\clients\mb.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\clients\windowsrt.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\clients\windowsphone.png" />
+    <EmbeddedResource Include="Html\css\images\clients\win8.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\notifications\download.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\Extensions.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\support.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\SupporterPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\supporter.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\suppbadge.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\premiumflag.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\supporterKey.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\SupporterKeyPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\donatepp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\faicons-v2.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\faicons.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\ajax-loader.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-18-black-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-18-white-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-36-black-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\images\icons-36-white-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\index.html" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\jqm-icon-pack-3.0.0-fa.css" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\ajax-loader.gif" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\ajax-loader.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-18-black-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-18-white-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-36-black-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\images\icons-36-white-pack.png" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\index.html" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\original\jqm-icon-pack-2.0-original.css" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\fontawesome-webfont.eot" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\fontawesome-webfont.ttf" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\fontawesome-webfont.woff" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\font\FontAwesome.otf" />
+    <EmbeddedResource Include="Html\thirdparty\jqm-icon-pack-3.0\font-awesome\jqm-icon-pack-3.0.0-fa.scss" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\registerpp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\home.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\notifications\done.png" />
+    <EmbeddedResource Include="Html\css\images\notifications\error.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\notifications\cancelled.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\notifications\info.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\itemDetails.html" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\scripts\ItemDetailPage.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Html\css\images\media\playCircle.png" />
+    <EmbeddedResource Include="Html\css\images\media\nextTrack.png" />
+    <EmbeddedResource Include="Html\css\images\media\pause.png" />
+    <EmbeddedResource Include="Html\css\images\media\play.png" />
+    <EmbeddedResource Include="Html\css\images\media\previousTrack.png" />
+    <EmbeddedResource Include="Html\css\images\media\stop.png" />
+    <EmbeddedResource Include="Html\css\images\itemDetails\videoDefault.png" />
+    <EmbeddedResource Include="Html\css\images\itemDetails\audioDefault.png" />
+    <EmbeddedResource Include="Html\css\images\itemDetails\gameDefault.png" />
+    <Content Include="Html\css\images\mblogoicon.png" />
+    <Content Include="Html\css\images\mblogotextblack.png" />
+    <Content Include="Html\css\images\mblogotextwhite.png" />
+    <Content Include="Html\css\images\stars.png" />
+    <EmbeddedResource Include="Html\scripts\MediaPlayer.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\MediaBrowser.ServerApplication\CorePlugins\" /y</PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <!-- 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">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
--- a/Nuget/MediaBrowser.ApiClient.nuspec
+++ 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>
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>MediaBrowser.Common</id>
+        <version>1.0.1</version>
+        <title>MediaBrowser.Common</title>
+        <authors>Media Browser Team</authors>
+        <owners />
+        <projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains common model objects and interfaces used by all Media Browser solutions.</description>
+    </metadata>
+    <files>
+        <file src="dlls\MediaBrowser.Common.dll" target="lib\net45\MediaBrowser.Common.dll" />
+        <file src="dlls\MediaBrowser.Model.dll" target="lib\net45\MediaBrowser.Model.dll" />
+        <file src="dlls\MediaBrowser.Model.dll" target="lib\portable-net4+sl4+wp7+win8\MediaBrowser.Model.dll" />
+    </files>
+</package>
--- a/Nuget/MediaBrowser.Server.Core.nupkg.REMOVED.git-id
+++ b/Nuget/MediaBrowser.Server.Core.nupkg.REMOVED.git-id
@ -1 +0,0 @@
-da3d30d634468465d8995ba6cb1c0872959b3e9c
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>MediaBrowser.Server.Core</id>
+        <version>1.0.0</version>
+        <title>Media Browser.Server.Core</title>
+        <authors>Media Browser Team</authors>
+        <owners />
+        <projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains core components required to build plugins for Media Browser Server.</description>
+        <dependencies>
+            <dependency id="MediaBrowser.Common" version="1.0.1" />
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="dlls\MediaBrowser.Controller.dll" target="lib\net45\MediaBrowser.Controller.dll" />
+    </files>
+</package>
--- a/Nuget/MediaBrowser.Theater.Core.nuspec
+++ b/Nuget/MediaBrowser.Theater.Core.nuspec
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>MediaBrowser.Theater.Core</id>
+        <version>1.0.0</version>
+        <title>MediaBrowser.Theater.Core</title>
+        <authors>Media Browser Team</authors>
+        <owners />
+        <projectUrl>https://github.com/MediaBrowser/MediaBrowser.Theater</projectUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains components required to build plugins for Media Browser Theater.</description>
+        <dependencies>
+            <dependency id="MediaBrowser.Common" version="1.0.1" />
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="dlls\MediaBrowser.UI.Controls.dll" target="lib\net45\MediaBrowser.UI.Controls.dll" />
+        <file src="dlls\MediaBrowser.UI.dll" target="lib\net45\MediaBrowser.UI.dll" />
+    </files>
+</package>