From 0f6e6a5a037865ae2f2f67d3d683d908a87f2d73 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 22 Jul 2022 07:09:07 +1000
Subject: [PATCH] Enable MA0084 and fix noncompliance (except in Cores)

"Local variable should not hide other symbols"
---
 Common.ruleset                                       |  2 +-
 src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs        | 12 ++++++------
 .../BizHawk.Emulation.Cores.csproj                   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Common.ruleset b/Common.ruleset
index a7ac2590b1..c743a52470 100644
--- a/Common.ruleset
+++ b/Common.ruleset
@@ -363,7 +363,7 @@
 		<Rule Id="MA0083" Action="Error" />
 
 		<!-- Local variable should not hide other symbols -->
-		<Rule Id="MA0084" Action="Hidden" />
+		<Rule Id="MA0084" Action="Warning" />
 
 		<!-- Anonymous delegates should not be used to unsubscribe from Events -->
 		<Rule Id="MA0085" Action="Error" />
diff --git a/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs b/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
index 94abc02a02..7acd35e11f 100644
--- a/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
+++ b/src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
@@ -516,8 +516,8 @@ namespace BizHawk.Client.EmuHawk
 
 				AVIWriterImports.AVICOMPRESSOPTIONS comprOptions = new AVIWriterImports.AVICOMPRESSOPTIONS();
 
-				byte[] Format;
-				byte[] Parms;
+				byte[] format;
+				byte[] parms;
 
 				try
 				{
@@ -534,8 +534,8 @@ namespace BizHawk.Client.EmuHawk
 					comprOptions.cbParms = b.ReadInt32();
 					comprOptions.dwInterleaveEvery = b.ReadInt32();
 
-					Format = b.ReadBytes(comprOptions.cbFormat);
-					Parms = b.ReadBytes(comprOptions.cbParms);
+					format = b.ReadBytes(comprOptions.cbFormat);
+					parms = b.ReadBytes(comprOptions.cbParms);
 				}
 				catch (IOException)
 				{
@@ -550,8 +550,8 @@ namespace BizHawk.Client.EmuHawk
 				var ret = new CodecToken
 				{
 					_comprOptions = comprOptions,
-					Format = Format,
-					Parms = Parms,
+					Format = format,
+					Parms = parms,
 					codec = Decode_mmioFOURCC(comprOptions.fccHandler)
 				};
 				return ret;
diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index 1009991cb6..b383cab16d 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -5,7 +5,7 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<NoWarn>$(NoWarn);CA1806;CA1825;CA2214;SA1100;SA1120;SA1129;SA1137;SA1205;SA1208;SA1400</NoWarn>
+		<NoWarn>$(NoWarn);CA1806;CA1825;CA2214;MA0084;SA1100;SA1120;SA1129;SA1137;SA1205;SA1208;SA1400</NoWarn>
 		<Nullable>disable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>