diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-11-07 10:50:55 +0100 |
|---|---|---|
| committer | Bond-009 <bond.009@outlook.com> | 2019-11-07 10:50:55 +0100 |
| commit | 983d38a43bd617de11724196f35822f07860a2eb (patch) | |
| tree | 0eb15c7d7a5a4c270f966b6c4a8aee60f4a1a60e /MediaBrowser.Model | |
| parent | 81c135c5bb01fbfb62ce67dc091e3e9f1c6d2c10 (diff) | |
| parent | 2779d9d3bc9a9fd731e118f57d4601de4a55d032 (diff) | |
Merge branch 'master' into installationmanager
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Globalization/ILocalizationManager.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Net/SocketReceiveResult.cs | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/MediaBrowser.Model/Globalization/ILocalizationManager.cs b/MediaBrowser.Model/Globalization/ILocalizationManager.cs index 91d946db83..0b6cfe1b71 100644 --- a/MediaBrowser.Model/Globalization/ILocalizationManager.cs +++ b/MediaBrowser.Model/Globalization/ILocalizationManager.cs @@ -64,10 +64,10 @@ namespace MediaBrowser.Model.Globalization bool HasUnicodeCategory(string value, UnicodeCategory category); /// <summary> - /// Returns the correct <see cref="Cultureinfo" /> for the given language. + /// Returns the correct <see cref="CultureInfo" /> for the given language. /// </summary> /// <param name="language">The language.</param> - /// <returns>The correct <see cref="Cultureinfo" /> for the given language.</returns> + /// <returns>The correct <see cref="CultureInfo" /> for the given language.</returns> CultureDto FindLanguageInfo(string language); } } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 3ed319a0de..53cd08fbd0 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <Authors>Jellyfin Contributors</Authors> @@ -15,7 +15,8 @@ <ItemGroup> <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" /> + <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" /> + <PackageReference Include="System.Globalization" Version="4.3.0" /> <PackageReference Include="System.Text.Json" Version="4.6.0" /> </ItemGroup> diff --git a/MediaBrowser.Model/Net/SocketReceiveResult.cs b/MediaBrowser.Model/Net/SocketReceiveResult.cs index cd7a2e55f8..3a4ad3738e 100644 --- a/MediaBrowser.Model/Net/SocketReceiveResult.cs +++ b/MediaBrowser.Model/Net/SocketReceiveResult.cs @@ -18,7 +18,7 @@ namespace MediaBrowser.Model.Net public int ReceivedBytes { get; set; } /// <summary> - /// The <see cref="IpEndPointInfo"/> the data was received from. + /// The <see cref="IPEndPoint"/> the data was received from. /// </summary> public IPEndPoint RemoteEndPoint { get; set; } public IPAddress LocalIPAddress { get; set; } |