mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-04 03:27:21 -05:00 
			
		
		
		
	updated nuget
This commit is contained in:
		
							parent
							
								
									29e1330c3a
								
							
						
					
					
						commit
						9fb1e8c00f
					
				@ -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
 | 
					 | 
				
			||||||
@ -1,20 +0,0 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8" ?>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<Package
 | 
					 | 
				
			||||||
  xmlns="http://schemas.microsoft.com/developer/2004/01/bootstrapper"
 | 
					 | 
				
			||||||
  Name="DisplayName"
 | 
					 | 
				
			||||||
  Culture="Culture"
 | 
					 | 
				
			||||||
>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <!-- Defines a localizable string table for error messages-->
 | 
					 | 
				
			||||||
    <Strings>
 | 
					 | 
				
			||||||
        <String Name="DisplayName">Visual C++ 2010 Runtime Libraries (x86)</String>
 | 
					 | 
				
			||||||
        <String Name="Culture">en</String>
 | 
					 | 
				
			||||||
        <String Name="AdminRequired">You do not have the permissions required to install Visual C++ 2010 Runtime Libraries (x86). Please contact your administrator.</String>
 | 
					 | 
				
			||||||
        <String Name="InvalidPlatformWin9x">Installation of Visual C++ 2010 Runtime Libraries (x86) is not supported on Windows 95. Contact your application vendor.</String>
 | 
					 | 
				
			||||||
        <String Name="InvalidPlatformWinNT">Installation of Visual C++ 2010 Runtime Libraries (x86) is not supported on Windows NT 4.0. Contact your application vendor.</String>
 | 
					 | 
				
			||||||
        <String Name="GeneralFailure">A failure occurred attempting to install Visual C++ 2010 Runtime Libraries (x86).</String>
 | 
					 | 
				
			||||||
        <String Name="VCRedistExe">http://go.microsoft.com/fwlink/?LinkID=210621</String>
 | 
					 | 
				
			||||||
    </Strings>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</Package>
 | 
					 | 
				
			||||||
@ -1,45 +0,0 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8" ?> 
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<Product
 | 
					 | 
				
			||||||
  xmlns="http://schemas.microsoft.com/developer/2004/01/bootstrapper"
 | 
					 | 
				
			||||||
  ProductCode="Microsoft.Visual.C++.10.0.x86"
 | 
					 | 
				
			||||||
>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  <!-- Defines list of files to be copied on build -->
 | 
					 | 
				
			||||||
  <PackageFiles>
 | 
					 | 
				
			||||||
    <PackageFile Name="vcredist_x86.exe" HomeSite="VCRedistExe"/>
 | 
					 | 
				
			||||||
  </PackageFiles>
 | 
					 | 
				
			||||||
<InstallChecks>
 | 
					 | 
				
			||||||
    <MsiProductCheck Property="VCRedistInstalled" Product="{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}"/>
 | 
					 | 
				
			||||||
</InstallChecks>
 | 
					 | 
				
			||||||
  
 | 
					 | 
				
			||||||
  <!-- Defines how to invoke the setup for the Visual C++ 10.0 redist -->
 | 
					 | 
				
			||||||
  <!-- TODO: Needs EstrimatedTempSpace, LogFile, and an update of EstimatedDiskSpace -->
 | 
					 | 
				
			||||||
  <Commands Reboot="Defer">
 | 
					 | 
				
			||||||
    <Command PackageFile="vcredist_x86.exe" 
 | 
					 | 
				
			||||||
	     Arguments=' /q:a ' 
 | 
					 | 
				
			||||||
	     >
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      <!-- These checks determine whether the package is to be installed -->
 | 
					 | 
				
			||||||
      <InstallConditions>
 | 
					 | 
				
			||||||
        <BypassIf Property="VCRedistInstalled" Compare="ValueGreaterThanOrEqualTo" Value="3"/>
 | 
					 | 
				
			||||||
        <!-- Block install if user does not have admin privileges -->
 | 
					 | 
				
			||||||
        <FailIf Property="AdminUser" Compare="ValueEqualTo" Value="false" String="AdminRequired"/>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- Block install on Win95 -->
 | 
					 | 
				
			||||||
        <FailIf Property="Version9X" Compare="VersionLessThan" Value="4.10" String="InvalidPlatformWin9x"/>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        <!-- Block install on NT 4 or less -->
 | 
					 | 
				
			||||||
        <FailIf Property="VersionNT" Compare="VersionLessThan" Value="5.00" String="InvalidPlatformWinNT"/>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      </InstallConditions>
 | 
					 | 
				
			||||||
      
 | 
					 | 
				
			||||||
      <ExitCodes>
 | 
					 | 
				
			||||||
        <ExitCode Value="0" Result="Success"/>
 | 
					 | 
				
			||||||
        <ExitCode Value="3010" Result="SuccessReboot"/>
 | 
					 | 
				
			||||||
        <DefaultExitCode Result="Fail" FormatMessageFromSystem="true" String="GeneralFailure" />
 | 
					 | 
				
			||||||
      </ExitCodes>
 | 
					 | 
				
			||||||
      
 | 
					 | 
				
			||||||
    </Command>
 | 
					 | 
				
			||||||
  </Commands>
 | 
					 | 
				
			||||||
</Product>
 | 
					 | 
				
			||||||
@ -50,7 +50,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            return Task.Run(() =>
 | 
					            return Task.Run(() =>
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                var minDateModified = DateTime.UtcNow.AddMonths(-2);
 | 
					                var minDateModified = DateTime.UtcNow.AddDays(-45);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                DeleteCacheFilesFromDirectory(cancellationToken, ApplicationPaths.CachePath, minDateModified, progress);
 | 
					                DeleteCacheFilesFromDirectory(cancellationToken, ApplicationPaths.CachePath, minDateModified, progress);
 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
 | 
				
			|||||||
@ -420,15 +420,25 @@ namespace MediaBrowser.Controller.Dto
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // Add audio info
 | 
					            // Add audio info
 | 
				
			||||||
 | 
					            if (fields.Contains(ItemFields.AudioInfo))
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
                var audio = item as Audio;
 | 
					                var audio = item as Audio;
 | 
				
			||||||
                if (audio != null)
 | 
					                if (audio != null)
 | 
				
			||||||
            {
 | 
					 | 
				
			||||||
                if (fields.Contains(ItemFields.AudioInfo))
 | 
					 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    dto.Album = audio.Album;
 | 
					                    dto.Album = audio.Album;
 | 
				
			||||||
                    dto.AlbumArtist = audio.AlbumArtist;
 | 
					                    dto.AlbumArtist = audio.AlbumArtist;
 | 
				
			||||||
                    dto.Artist = audio.Artist;
 | 
					                    dto.Artist = audio.Artist;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                var album = item as MusicAlbum;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                if (album != null)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    var songs = album.Children.OfType<Audio>().ToList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                    dto.AlbumArtist = songs.Select(i => i.AlbumArtist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
 | 
				
			||||||
 | 
					                    dto.Artist = songs.Select(i => i.Artist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // Add video info
 | 
					            // Add video info
 | 
				
			||||||
@ -503,6 +513,13 @@ namespace MediaBrowser.Controller.Dto
 | 
				
			|||||||
                    dto.SeriesName = series.Name;
 | 
					                    dto.SeriesName = series.Name;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            var game = item as BaseGame;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if (game != null)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                dto.Players = game.PlayersSupported;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
@ -521,7 +538,7 @@ namespace MediaBrowser.Controller.Dto
 | 
				
			|||||||
            double totalPercentPlayed = 0;
 | 
					            double totalPercentPlayed = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // Loop through each recursive child
 | 
					            // Loop through each recursive child
 | 
				
			||||||
            foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder))
 | 
					            foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder).ToList())
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                var userdata = await userDataRepository.GetUserData(user.Id, child.GetUserDataKey()).ConfigureAwait(false);
 | 
					                var userdata = await userDataRepository.GetUserData(user.Id, child.GetUserDataKey()).ConfigureAwait(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -46,7 +46,7 @@ namespace MediaBrowser.Controller.Providers.Music
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            get
 | 
					            get
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                return "3-12-13.3";
 | 
					                return "04-24-2013";
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -50,7 +50,7 @@ namespace MediaBrowser.Model.Configuration
 | 
				
			|||||||
        public BaseApplicationConfiguration()
 | 
					        public BaseApplicationConfiguration()
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            EnableAutoUpdate = true;
 | 
					            EnableAutoUpdate = true;
 | 
				
			||||||
            LogFileRetentionDays = 14;
 | 
					            LogFileRetentionDays = 7;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if (DEBUG)
 | 
					#if (DEBUG)
 | 
				
			||||||
            EnableDebugLevelLogging = true;
 | 
					            EnableDebugLevelLogging = true;
 | 
				
			||||||
 | 
				
			|||||||
@ -96,6 +96,12 @@ namespace MediaBrowser.Model.Dto
 | 
				
			|||||||
        /// <value>The production year.</value>
 | 
					        /// <value>The production year.</value>
 | 
				
			||||||
        public int? ProductionYear { get; set; }
 | 
					        public int? ProductionYear { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// Gets or sets the players supported by a game.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <value>The players.</value>
 | 
				
			||||||
 | 
					        public int? Players { get; set; }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Gets or sets the index number.
 | 
					        /// Gets or sets the index number.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
 | 
				
			|||||||
@ -43,12 +43,41 @@ namespace MediaBrowser.Model.Querying
 | 
				
			|||||||
        /// <value>The fields.</value>
 | 
					        /// <value>The fields.</value>
 | 
				
			||||||
        public ItemFields[] Fields { get; set; }
 | 
					        public ItemFields[] Fields { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// Gets or sets the exclude item types.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <value>The exclude item types.</value>
 | 
				
			||||||
 | 
					        public string[] ExcludeItemTypes { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// Gets or sets the include item types.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <value>The include item types.</value>
 | 
				
			||||||
 | 
					        public string[] IncludeItemTypes { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// Gets or sets the media types.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <value>The media types.</value>
 | 
				
			||||||
 | 
					        public string[] MediaTypes { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        /// What to sort the results by
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        /// <value>The sort by.</value>
 | 
				
			||||||
 | 
					        public string[] SortBy { get; set; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        /// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
 | 
					        /// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
        public ItemsByNameQuery()
 | 
					        public ItemsByNameQuery()
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            Fields = new ItemFields[] {};
 | 
					            Fields = new ItemFields[] {};
 | 
				
			||||||
 | 
					            Recursive = true;
 | 
				
			||||||
 | 
					            MediaTypes = new string[] { };
 | 
				
			||||||
 | 
					            SortBy = new string[] { };
 | 
				
			||||||
 | 
					            ExcludeItemTypes = new string[] { };
 | 
				
			||||||
 | 
					            IncludeItemTypes = new string[] { };
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 | 
					<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 | 
				
			||||||
    <metadata>
 | 
					    <metadata>
 | 
				
			||||||
        <id>MediaBrowser.Common.Internal</id>
 | 
					        <id>MediaBrowser.Common.Internal</id>
 | 
				
			||||||
        <version>3.0.82</version>
 | 
					        <version>3.0.83</version>
 | 
				
			||||||
        <title>MediaBrowser.Common.Internal</title>
 | 
					        <title>MediaBrowser.Common.Internal</title>
 | 
				
			||||||
        <authors>Luke</authors>
 | 
					        <authors>Luke</authors>
 | 
				
			||||||
        <owners>ebr,Luke,scottisafool</owners>
 | 
					        <owners>ebr,Luke,scottisafool</owners>
 | 
				
			||||||
@ -12,7 +12,7 @@
 | 
				
			|||||||
        <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
 | 
					        <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
 | 
				
			||||||
        <copyright>Copyright © Media Browser 2013</copyright>
 | 
					        <copyright>Copyright © Media Browser 2013</copyright>
 | 
				
			||||||
        <dependencies>
 | 
					        <dependencies>
 | 
				
			||||||
            <dependency id="MediaBrowser.Common" version="3.0.82" />
 | 
					            <dependency id="MediaBrowser.Common" version="3.0.83" />
 | 
				
			||||||
            <dependency id="NLog" version="2.0.1.2" />
 | 
					            <dependency id="NLog" version="2.0.1.2" />
 | 
				
			||||||
            <dependency id="ServiceStack.Text" version="3.9.38" />
 | 
					            <dependency id="ServiceStack.Text" version="3.9.38" />
 | 
				
			||||||
            <dependency id="SimpleInjector" version="2.2.1" />
 | 
					            <dependency id="SimpleInjector" version="2.2.1" />
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 | 
					<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 | 
				
			||||||
    <metadata>
 | 
					    <metadata>
 | 
				
			||||||
        <id>MediaBrowser.Common</id>
 | 
					        <id>MediaBrowser.Common</id>
 | 
				
			||||||
        <version>3.0.82</version>
 | 
					        <version>3.0.83</version>
 | 
				
			||||||
        <title>MediaBrowser.Common</title>
 | 
					        <title>MediaBrowser.Common</title>
 | 
				
			||||||
        <authors>Media Browser Team</authors>
 | 
					        <authors>Media Browser Team</authors>
 | 
				
			||||||
        <owners>ebr,Luke,scottisafool</owners>
 | 
					        <owners>ebr,Luke,scottisafool</owners>
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 | 
					<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 | 
				
			||||||
    <metadata>
 | 
					    <metadata>
 | 
				
			||||||
        <id>MediaBrowser.Server.Core</id>
 | 
					        <id>MediaBrowser.Server.Core</id>
 | 
				
			||||||
        <version>3.0.82</version>
 | 
					        <version>3.0.83</version>
 | 
				
			||||||
        <title>Media Browser.Server.Core</title>
 | 
					        <title>Media Browser.Server.Core</title>
 | 
				
			||||||
        <authors>Media Browser Team</authors>
 | 
					        <authors>Media Browser Team</authors>
 | 
				
			||||||
        <owners>ebr,Luke,scottisafool</owners>
 | 
					        <owners>ebr,Luke,scottisafool</owners>
 | 
				
			||||||
@ -12,7 +12,7 @@
 | 
				
			|||||||
        <description>Contains core components required to build plugins for Media Browser Server.</description>
 | 
					        <description>Contains core components required to build plugins for Media Browser Server.</description>
 | 
				
			||||||
        <copyright>Copyright © Media Browser 2013</copyright>
 | 
					        <copyright>Copyright © Media Browser 2013</copyright>
 | 
				
			||||||
        <dependencies>
 | 
					        <dependencies>
 | 
				
			||||||
            <dependency id="MediaBrowser.Common" version="3.0.82" />
 | 
					            <dependency id="MediaBrowser.Common" version="3.0.83" />
 | 
				
			||||||
        </dependencies>
 | 
					        </dependencies>
 | 
				
			||||||
    </metadata>
 | 
					    </metadata>
 | 
				
			||||||
    <files>
 | 
					    <files>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user