Merge branch 'master' into usings

MediaBrowser.Model/Configuration/EncodingOptions.cs

@@ -40,6 +40,7 @@ namespace MediaBrowser.Model.Configuration
             VaapiDevice = "/dev/dri/renderD128";
             H264Crf = 23;
             H265Crf = 28;
+            DeinterlaceMethod = "yadif";
             EnableHardwareEncoding = true;
             EnableSubtitleExtraction = true;
             HardwareDecodingCodecs = new string[] { "h264", "vc1" };

MediaBrowser.Model/Entities/ChapterInfo.cs

@@ -26,6 +26,7 @@ namespace MediaBrowser.Model.Entities
         /// </summary>
         /// <value>The image path.</value>
         public string ImagePath { get; set; }
+
         public DateTime ImageDateModified { get; set; }
 
         public string ImageTag { get; set; }

MediaBrowser.Model/Extensions/StringHelper.cs

@@ -22,6 +22,11 @@ namespace MediaBrowser.Model.Extensions
                 return str;
             }
 
+#if NETSTANDARD2_0
+            char[] a = str.ToCharArray();
+            a[0] = char.ToUpperInvariant(a[0]);
+            return new string(a);
+#else
             return string.Create(
                 str.Length,
                 str,
@@ -33,6 +38,7 @@ namespace MediaBrowser.Model.Extensions
                         chars[i] = buf[i];
                     }
                 });
+#endif
         }
     }
 }

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors Condition=" '$(Configuration)' == 'Release' ">true</TreatWarningsAsErrors>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
     <PackageReference Include="System.Globalization" Version="4.3.0" />
     <PackageReference Include="System.Text.Json" Version="4.7.0" />
   </ItemGroup>