Fix some warnings and only disable TreatWarningsAsErrors for CodeAnalysis (#8709)

Emby.Dlna/Emby.Dlna.csproj

@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <!-- Code Analyzers-->

Emby.Drawing/Emby.Drawing.csproj

@@ -11,10 +11,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
     <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />

Emby.Naming/Emby.Naming.csproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Stability)'=='Unstable'">

Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -49,7 +49,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <!-- Code Analyzers-->

Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs

@@ -243,7 +243,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
             {
                 Id = c.Id,
                 Name = c.DisplayName,
-                ImageUrl = c.Icon != null && !string.IsNullOrEmpty(c.Icon.Source) ? c.Icon.Source : null,
+                ImageUrl = string.IsNullOrEmpty(c.Icon.Source) ? null : c.Icon.Source,
                 Number = string.IsNullOrWhiteSpace(c.Number) ? c.Id : c.Number
             }).ToList();
         }

Jellyfin.Api/Jellyfin.Api.csproj

@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <!-- Code analysers-->

MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -39,7 +39,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Stability)'=='Unstable'">

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -2814,7 +2814,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 {
                     algorithm = "bt.2390";
                 }
-
                 else if (string.Equals(options.TonemappingAlgorithm, "none", StringComparison.OrdinalIgnoreCase))
                 {
                     algorithm = "clip";

MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs

@@ -38,7 +38,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         Version EncoderVersion { get; }
 
         /// <summary>
-        /// Whether p key pausing is supported.
+        /// Gets a value indicating whether p key pausing is supported.
         /// </summary>
         /// <value><c>true</c> if p key pausing is supported, <c>false</c> otherwise.</value>
         bool IsPkeyPauseSupported { get; }

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -75,7 +75,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
         private bool _isVaapiDeviceInteli965 = false;
         private bool _isVaapiDeviceSupportVulkanFmtModifier = false;
 
-        private static string[] _vulkanFmtModifierExts = {
+        private static string[] _vulkanFmtModifierExts =
+        {
             "VK_KHR_sampler_ycbcr_conversion",
             "VK_EXT_image_drm_format_modifier",
             "VK_KHR_external_memory_fd",

MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Stability)'=='Unstable'">

MediaBrowser.Providers/MediaBrowser.Providers.csproj

@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 
   <!-- Code Analyzers-->

MediaBrowser.Providers/Music/AlbumMetadataService.cs

@@ -152,6 +152,7 @@ namespace MediaBrowser.Providers.Music
                     return ItemUpdateType.MetadataEdit;
                 }
             }
+
             return ItemUpdateType.None;
         }
 

jellyfin.ruleset

@@ -23,6 +23,8 @@
     <Rule Id="SA1316" Action="Error" />
     <!-- error on SA1414: Tuple types in signatures should have element names -->
     <Rule Id="SA1414" Action="Error" />
+    <!-- disable warning SA1513: Closing brace should be followed by blank line -->
+    <Rule Id="SA1513" Action="Error" />
     <!-- error on SA1518: File is required to end with a single newline character -->
     <Rule Id="SA1518" Action="Error" />
     <!-- error on SA1629: Documentation text should end with a period -->

tests/Jellyfin.Controller.Tests/Entities/BaseItemTests.cs

@@ -1,18 +1,17 @@
 using MediaBrowser.Controller.Entities;
 using Xunit;
 
-namespace Jellyfin.Controller.Tests.Entities
+namespace Jellyfin.Controller.Tests.Entities;
+
+public class BaseItemTests
 {
-    public class BaseItemTests
-    {
-        [Theory]
-        [InlineData("", "")]
-        [InlineData("1", "0000000001")]
-        [InlineData("t", "t")]
-        [InlineData("test", "test")]
-        [InlineData("test1", "test0000000001")]
-        [InlineData("1test 2", "0000000001test 0000000002")]
-        public void BaseItem_ModifySortChunks_Valid(string input, string expected)
-            => Assert.Equal(expected, BaseItem.ModifySortChunks(input));
-    }
+    [Theory]
+    [InlineData("", "")]
+    [InlineData("1", "0000000001")]
+    [InlineData("t", "t")]
+    [InlineData("test", "test")]
+    [InlineData("test1", "test0000000001")]
+    [InlineData("1test 2", "0000000001test 0000000002")]
+    public void BaseItem_ModifySortChunks_Valid(string input, string expected)
+        => Assert.Equal(expected, BaseItem.ModifySortChunks(input));
 }