diff --git a/Bootstrapper/readme.txt b/Bootstrapper/readme.txt
deleted file mode 100644
index 0fdcf2aa57..0000000000
--- a/Bootstrapper/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-If Publishing, the folders in here must be copied to:
-
-C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\Bootstrapper\Packages
\ No newline at end of file
diff --git a/Bootstrapper/vcredist10_x86/en/package.xml b/Bootstrapper/vcredist10_x86/en/package.xml
deleted file mode 100644
index 613fc0b84c..0000000000
--- a/Bootstrapper/vcredist10_x86/en/package.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
- Visual C++ 2010 Runtime Libraries (x86)
- en
- You do not have the permissions required to install Visual C++ 2010 Runtime Libraries (x86). Please contact your administrator.
- Installation of Visual C++ 2010 Runtime Libraries (x86) is not supported on Windows 95. Contact your application vendor.
- Installation of Visual C++ 2010 Runtime Libraries (x86) is not supported on Windows NT 4.0. Contact your application vendor.
- A failure occurred attempting to install Visual C++ 2010 Runtime Libraries (x86).
- http://go.microsoft.com/fwlink/?LinkID=210621
-
-
-
diff --git a/Bootstrapper/vcredist10_x86/product.xml b/Bootstrapper/vcredist10_x86/product.xml
deleted file mode 100644
index 76edde6187..0000000000
--- a/Bootstrapper/vcredist10_x86/product.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index be3dd89f75..8a574a70d8 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
{
return Task.Run(() =>
{
- var minDateModified = DateTime.UtcNow.AddMonths(-2);
+ var minDateModified = DateTime.UtcNow.AddDays(-45);
DeleteCacheFilesFromDirectory(cancellationToken, ApplicationPaths.CachePath, minDateModified, progress);
});
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index e662355106..ede1a1e84c 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -420,15 +420,25 @@ namespace MediaBrowser.Controller.Dto
}
// Add audio info
- var audio = item as Audio;
- if (audio != null)
+ if (fields.Contains(ItemFields.AudioInfo))
{
- if (fields.Contains(ItemFields.AudioInfo))
+ var audio = item as Audio;
+ if (audio != null)
{
dto.Album = audio.Album;
dto.AlbumArtist = audio.AlbumArtist;
dto.Artist = audio.Artist;
}
+
+ var album = item as MusicAlbum;
+
+ if (album != null)
+ {
+ var songs = album.Children.OfType