aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-02-21 12:22:22 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-02-21 12:22:41 -0500
commit5e08d95b92bccd86109a11a347746d643531a1ed (patch)
tree3b3fde363b495e04ab06d75bbce83d028bcd88c7
parent3bac0a516fe074404d815341a7064c1e13c24c6b (diff)
fixed x64
-rw-r--r--.gitignore1
-rw-r--r--MediaBrowser.Common/MediaBrowser.Common.csproj1
-rw-r--r--MediaBrowser.Controller/Extensions/XmlExtensions.cs (renamed from MediaBrowser.Common/Extensions/XmlExtensions.cs)2
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj1
-rw-r--r--MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs4
-rw-r--r--MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs1
-rw-r--r--MediaBrowser.Plugins.Trailers/AppleTrailerListingDownloader.cs1
7 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 0535685c3..c9edc3051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ ProgramData-UI*/
[Dd]ebug/
[Rr]elease/
-x64/
build/
[Bb]in/
[Oo]bj/
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 8929f4bd5..fa4d956db 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -132,7 +132,6 @@
<Compile Include="Events\GenericEventArgs.cs" />
<Compile Include="Extensions\NamedLock.cs" />
<Compile Include="Extensions\ResourceNotFoundException.cs" />
- <Compile Include="Extensions\XmlExtensions.cs" />
<Compile Include="IO\FileSystem.cs" />
<Compile Include="IO\FileSystemRepository.cs" />
<Compile Include="IO\IIsoManager.cs" />
diff --git a/MediaBrowser.Common/Extensions/XmlExtensions.cs b/MediaBrowser.Controller/Extensions/XmlExtensions.cs
index 6f626d328..00bee7d1d 100644
--- a/MediaBrowser.Common/Extensions/XmlExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/XmlExtensions.cs
@@ -2,7 +2,7 @@
using System.Globalization;
using System.Xml;
-namespace MediaBrowser.Common.Extensions
+namespace MediaBrowser.Controller.Extensions
{
/// <summary>
/// Class XmlExtensions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 478877218..0db617335 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -105,6 +105,7 @@
<Compile Include="Entities\Video.cs" />
<Compile Include="Entities\CollectionFolder.cs" />
<Compile Include="Entities\Year.cs" />
+ <Compile Include="Extensions\XmlExtensions.cs" />
<Compile Include="IO\FileSystemManager.cs" />
<Compile Include="Library\ChildrenChangedEventArgs.cs" />
<Compile Include="Library\DtoBuilder.cs" />
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
index dbe744ed4..d1d931a62 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
@@ -1,6 +1,6 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Resolvers.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Net;
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
index 901d39040..985aa0262 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Resolvers.TV;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Net;
diff --git a/MediaBrowser.Plugins.Trailers/AppleTrailerListingDownloader.cs b/MediaBrowser.Plugins.Trailers/AppleTrailerListingDownloader.cs
index a32223837..76d7569b9 100644
--- a/MediaBrowser.Plugins.Trailers/AppleTrailerListingDownloader.cs
+++ b/MediaBrowser.Plugins.Trailers/AppleTrailerListingDownloader.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Extensions;
using MediaBrowser.Model.Entities;
using System;
using System.Collections.Generic;