From 2b747d02d3108a9be041a800b15bf4994bf4eedb Mon Sep 17 00:00:00 2001
From: CleanCodeDeveloper
 <16760760+CleanCodeDeveloper@users.noreply.github.com>
Date: Tue, 22 Feb 2022 23:01:48 +0100
Subject: [PATCH] [ImageResizer] Enable analyzer and fix warnings (#16512)

---
 src/modules/imageresizer/tests/ImageResizerUITest.csproj   | 2 ++
 src/modules/imageresizer/tests/Models/ResizeBatchTests.cs  | 2 +-
 src/modules/imageresizer/ui/ImageResizerUI.csproj          | 2 ++
 .../ui/Properties/WrappedJsonValueConverter.cs             | 7 +++----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/imageresizer/tests/ImageResizerUITest.csproj b/src/modules/imageresizer/tests/ImageResizerUITest.csproj
index 6e4a9bb7df..809b5f7230 100644
--- a/src/modules/imageresizer/tests/ImageResizerUITest.csproj
+++ b/src/modules/imageresizer/tests/ImageResizerUITest.csproj
@@ -20,6 +20,8 @@
     <Platform Condition="'$(Platform)'==''">x64</Platform>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IntermediateOutputPath>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\</IntermediateOutputPath>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>Recommended</AnalysisMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs b/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
index 26cb03d8b0..f919b6039a 100644
--- a/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
+++ b/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
@@ -58,7 +58,7 @@ namespace ImageResizer.Models
         [TestMethod]
         public void ProcessAggregatesErrors()
         {
-            var batch = CreateBatch(file => throw new Exception("Error: " + file));
+            var batch = CreateBatch(file => throw new InvalidOperationException("Error: " + file));
             batch.Files.Add("Image1.jpg");
             batch.Files.Add("Image2.jpg");
 
diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj
index 6f59611529..c37f536ecd 100644
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -23,6 +23,8 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <IntermediateOutputPath>$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\</IntermediateOutputPath>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>Recommended</AnalysisMode>
   </PropertyGroup>
   
   <PropertyGroup>
diff --git a/src/modules/imageresizer/ui/Properties/WrappedJsonValueConverter.cs b/src/modules/imageresizer/ui/Properties/WrappedJsonValueConverter.cs
index 80c368bd90..62b2d0598a 100644
--- a/src/modules/imageresizer/ui/Properties/WrappedJsonValueConverter.cs
+++ b/src/modules/imageresizer/ui/Properties/WrappedJsonValueConverter.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
 
 using System;
-using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -17,15 +16,15 @@ namespace ImageResizer.Properties
         }
 
         public override JsonConverter CreateConverter(
-            Type type,
+            Type typeToConvert,
             JsonSerializerOptions options)
         {
-            if (type == null)
+            if (typeToConvert == null)
             {
                 return null;
             }
 
-            Type keyType = type.UnderlyingSystemType;
+            Type keyType = typeToConvert.UnderlyingSystemType;
 
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(
                 typeof(WrappedJsonConverter<>).MakeGenericType(keyType));