From 6e63e52dc555291b1671670ba082266546377f9a Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Wed, 10 Nov 2021 21:17:58 -0700
Subject: [PATCH] Fix build.yaml, fix new build errors

---
 .../OpenSubtitleDownloader.cs                 |  9 ++++---
 build.yaml                                    |  2 +-
 jellyfin.ruleset                              | 26 ++++++++++++++++---
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/Jellyfin.Plugin.OpenSubtitles/OpenSubtitleDownloader.cs b/Jellyfin.Plugin.OpenSubtitles/OpenSubtitleDownloader.cs
index f8f52a2..77e8274 100644
--- a/Jellyfin.Plugin.OpenSubtitles/OpenSubtitleDownloader.cs
+++ b/Jellyfin.Plugin.OpenSubtitles/OpenSubtitleDownloader.cs
@@ -101,10 +101,11 @@ namespace Jellyfin.Plugin.OpenSubtitles
             string hash;
             try
             {
-                await using (var fileStream = File.OpenRead(request.MediaPath))
-                {
-                    hash = OpenSubtitlesRequestHelper.ComputeHash(fileStream);
-                }
+                #pragma warning disable CA2007
+                await using var fileStream = File.OpenRead(request.MediaPath);
+                #pragma warning restore CA2007
+
+                hash = OpenSubtitlesRequestHelper.ComputeHash(fileStream);
             }
             catch (IOException ex)
             {
diff --git a/build.yaml b/build.yaml
index a825d4a..4ce8002 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3,7 +3,7 @@ guid: "4b9ed42f-5185-48b5-9803-6ff2989014c4"
 imageUrl: "https://repo.jellyfin.org/releases/plugin/images/jellyfin-plugin-opensubtitles.png"
 version: "14"
 targetAbi: "10.8.0.0"
-framework: "net5.0"
+framework: "net6.0"
 owner: "jellyfin"
 overview: "Download subtitles for your media"
 description: "Download subtitles from the internet to use with your media files."
diff --git a/jellyfin.ruleset b/jellyfin.ruleset
index bec22dd..8af791c 100644
--- a/jellyfin.ruleset
+++ b/jellyfin.ruleset
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="Rules for Jellyfin.Server" Description="Code analysis rules for Jellyfin.Server.csproj" ToolsVersion="14.0">
     <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-        <!-- disable warning CA1040: Avoid empty interfaces -->
-        <Rule Id="CA1040" Action="Info" />
-
         <!-- disable warning SA1009: Closing parenthesis should be followed by a space. -->
         <Rule Id="SA1009" Action="None" />
         <!-- disable warning SA1011: Closing square bracket should be followed by a space. -->
@@ -12,6 +9,8 @@
         <Rule Id="SA1101" Action="None" />
         <!-- disable warning SA1108: Block statements should not contain embedded comments -->
         <Rule Id="SA1108" Action="None" />
+        <!-- disable warning SA1118: Parameter must not span multiple lines. -->
+        <Rule Id="SA1118" Action="None" />
         <!-- disable warning SA1128:: Put constructor initializers on their own line -->
         <Rule Id="SA1128" Action="None" />
         <!-- disable warning SA1130: Use lambda syntax -->
@@ -39,9 +38,19 @@
     </Rules>
 
     <Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.Design">
+        <!-- error on CA1305: Specify IFormatProvider -->
+        <Rule Id="CA1305" Action="Error" />
+        <!-- error on CA1725: Parameter names should match base declaration -->
+        <Rule Id="CA1725" Action="Error" />
+        <!-- error on CA1725: Call async methods when in an async method -->
+        <Rule Id="CA1727" Action="Error" />
+        <!-- error on CA1843: Do not use 'WaitAll' with a single task -->
+        <Rule Id="CA1843" Action="Error" />
         <!-- error on CA2016: Forward the CancellationToken parameter to methods that take one
             or pass in 'CancellationToken.None' explicitly to indicate intentionally not propagating the token -->
         <Rule Id="CA2016" Action="Error" />
+        <!-- error on CA2254: Template should be a static expression -->
+        <Rule Id="CA2254" Action="Error" />
 
         <!-- disable warning CA1014: Mark assemblies with CLSCompliantAttribute -->
         <Rule Id="CA1014" Action="Info" />
@@ -51,12 +60,19 @@
         <Rule Id="CA1031" Action="Info" />
         <!-- disable warning CA1032: Implement standard exception constructors -->
         <Rule Id="CA1032" Action="Info" />
+        <!-- disable warning CA1040: Avoid empty interfaces -->
+        <Rule Id="CA1040" Action="Info" />
         <!-- disable warning CA1062: Validate arguments of public methods -->
         <Rule Id="CA1062" Action="Info" />
+        <!-- TODO: enable when false positives are fixed -->
+        <!-- disable warning CA1508: Avoid dead conditional code -->
+        <Rule Id="CA1508" Action="Info" />
         <!-- disable warning CA1716: Identifiers should not match keywords -->
         <Rule Id="CA1716" Action="Info" />
         <!-- disable warning CA1720: Identifiers should not contain type names -->
         <Rule Id="CA1720" Action="Info" />
+        <!-- disable warning CA1724: Type names should not match namespaces -->
+        <Rule Id="CA1724" Action="Info" />
         <!-- disable warning CA1805: Do not initialize unnecessarily -->
         <Rule Id="CA1805" Action="Info" />
         <!-- disable warning CA1812: internal class that is apparently never instantiated.
@@ -67,6 +83,8 @@
         <Rule Id="CA1822" Action="Info" />
         <!-- disable warning CA2000: Dispose objects before losing scope -->
         <Rule Id="CA2000" Action="Info" />
+        <!-- disable warning CA2253: Named placeholders should not be numeric values -->
+        <Rule Id="CA2253" Action="Info" />
         <!-- disable warning CA5394: Do not use insecure randomness -->
         <Rule Id="CA5394" Action="Info" />
 
@@ -80,6 +98,8 @@
         <Rule Id="CA1303" Action="None" />
         <!-- disable warning CA1308: Normalize strings to uppercase -->
         <Rule Id="CA1308" Action="None" />
+        <!-- disable warning CA1848: Use the LoggerMessage delegates -->
+        <Rule Id="CA1848" Action="None" />
         <!-- disable warning CA2101: Specify marshaling for P/Invoke string arguments -->
         <Rule Id="CA2101" Action="None" />
         <!-- disable warning CA2234: Pass System.Uri objects instead of strings -->