From 620e54580db1ede597ab94570d512ee0d7537685 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 18 Jun 2020 05:10:17 +1000 Subject: [PATCH] Enable CA1052 and fix noncompliance "Static holder types should be Static or NotInheritable" (classes with only static members should be static classes) --- Common.ruleset | 3 --- src/BizHawk.Bizware.BizwareGL/TexAtlas.cs | 2 +- src/BizHawk.Client.Common/OpenAdvanced.cs | 2 +- src/BizHawk.Client.Common/QuickBmpFile.cs | 2 +- src/BizHawk.Client.Common/lua/EnvironmentSandbox.cs | 2 +- src/BizHawk.Client.DiscoHawk/AudioExtractor.cs | 2 +- src/BizHawk.Client.EmuHawk/Communication.cs | 2 +- src/BizHawk.Client.EmuHawk/JumpLists.cs | 2 +- src/BizHawk.Common/BinaryQuickSerializer.cs | 2 +- src/BizHawk.Common/DeepEquality.cs | 2 +- src/BizHawk.Common/SettingsUtil.cs | 2 +- src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs | 2 +- .../Consoles/Nintendo/Gameboy/GBColors.cs | 2 +- .../Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs | 2 +- 14 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Common.ruleset b/Common.ruleset index b53ccc1aa3..e36f992415 100644 --- a/Common.ruleset +++ b/Common.ruleset @@ -62,9 +62,6 @@ - - - diff --git a/src/BizHawk.Bizware.BizwareGL/TexAtlas.cs b/src/BizHawk.Bizware.BizwareGL/TexAtlas.cs index e777ae795f..f7416038a6 100644 --- a/src/BizHawk.Bizware.BizwareGL/TexAtlas.cs +++ b/src/BizHawk.Bizware.BizwareGL/TexAtlas.cs @@ -5,7 +5,7 @@ using System.Drawing; namespace BizHawk.Bizware.BizwareGL { - public class TexAtlas + public static class TexAtlas { public class RectItem { diff --git a/src/BizHawk.Client.Common/OpenAdvanced.cs b/src/BizHawk.Client.Common/OpenAdvanced.cs index e062c60604..c13933d424 100644 --- a/src/BizHawk.Client.Common/OpenAdvanced.cs +++ b/src/BizHawk.Client.Common/OpenAdvanced.cs @@ -35,7 +35,7 @@ namespace BizHawk.Client.Common } - public class OpenAdvancedSerializer + public static class OpenAdvancedSerializer { public static IOpenAdvanced ParseWithLegacy(string text) { diff --git a/src/BizHawk.Client.Common/QuickBmpFile.cs b/src/BizHawk.Client.Common/QuickBmpFile.cs index 6efa5fb258..a5fee187c4 100644 --- a/src/BizHawk.Client.Common/QuickBmpFile.cs +++ b/src/BizHawk.Client.Common/QuickBmpFile.cs @@ -11,7 +11,7 @@ using BizHawk.Emulation.Common; // ReSharper disable StyleCop.SA1401 namespace BizHawk.Client.Common { - public class QuickBmpFile + public static class QuickBmpFile { [StructLayout(LayoutKind.Sequential, Pack = 1)] private class BITMAPFILEHEADER diff --git a/src/BizHawk.Client.Common/lua/EnvironmentSandbox.cs b/src/BizHawk.Client.Common/lua/EnvironmentSandbox.cs index 3042a821c9..3f201935e9 100644 --- a/src/BizHawk.Client.Common/lua/EnvironmentSandbox.cs +++ b/src/BizHawk.Client.Common/lua/EnvironmentSandbox.cs @@ -3,7 +3,7 @@ // TODO - kill this file (or renew the concept as distinct from the LuaSandbox?) namespace BizHawk.Client.Common { - public class EnvironmentSandbox + public static class EnvironmentSandbox { public static void Sandbox(Action callback) { diff --git a/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs b/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs index 93f782dddf..2184bbb5f8 100644 --- a/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs +++ b/src/BizHawk.Client.DiscoHawk/AudioExtractor.cs @@ -4,7 +4,7 @@ using BizHawk.Emulation.DiscSystem; namespace BizHawk.Client.DiscoHawk { - public class AudioExtractor + public static class AudioExtractor { public static string FFmpegPath; diff --git a/src/BizHawk.Client.EmuHawk/Communication.cs b/src/BizHawk.Client.EmuHawk/Communication.cs index 4125a6389c..cc9473ef32 100644 --- a/src/BizHawk.Client.EmuHawk/Communication.cs +++ b/src/BizHawk.Client.EmuHawk/Communication.cs @@ -12,7 +12,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - public class Communication + public static class Communication { public class HttpCommunication { diff --git a/src/BizHawk.Client.EmuHawk/JumpLists.cs b/src/BizHawk.Client.EmuHawk/JumpLists.cs index 0b3710c01d..8d628c9014 100644 --- a/src/BizHawk.Client.EmuHawk/JumpLists.cs +++ b/src/BizHawk.Client.EmuHawk/JumpLists.cs @@ -4,7 +4,7 @@ using System.Reflection; namespace BizHawk.Client.EmuHawk { - public class JumpLists + public static class JumpLists { private static readonly Type JumpList; private static readonly Type JumpTask; diff --git a/src/BizHawk.Common/BinaryQuickSerializer.cs b/src/BizHawk.Common/BinaryQuickSerializer.cs index a7a88591a5..a4917cd737 100644 --- a/src/BizHawk.Common/BinaryQuickSerializer.cs +++ b/src/BizHawk.Common/BinaryQuickSerializer.cs @@ -14,7 +14,7 @@ namespace BizHawk.Common { // fields are serialized/deserialized in their memory order as reported by Marshal.OffsetOf // to do anything useful, passed targets should be [StructLayout.Sequential] or [StructLayout.Explicit] - public class BinaryQuickSerializer + public static class BinaryQuickSerializer { private static MethodInfo FromExpression(Expression e) { diff --git a/src/BizHawk.Common/DeepEquality.cs b/src/BizHawk.Common/DeepEquality.cs index e02961c0e5..c1719a3b8b 100644 --- a/src/BizHawk.Common/DeepEquality.cs +++ b/src/BizHawk.Common/DeepEquality.cs @@ -13,7 +13,7 @@ namespace BizHawk.Common { } - public class DeepEquality + public static class DeepEquality { /// /// return true if an array type is not 0-based diff --git a/src/BizHawk.Common/SettingsUtil.cs b/src/BizHawk.Common/SettingsUtil.cs index a795d3ab57..bf6a979fe0 100644 --- a/src/BizHawk.Common/SettingsUtil.cs +++ b/src/BizHawk.Common/SettingsUtil.cs @@ -9,7 +9,7 @@ using System.ComponentModel; namespace BizHawk.Common { - public class SettingsUtil + public static class SettingsUtil { private sealed class DefaultValueSetter { diff --git a/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs b/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs index d1d4e1da45..2c9b870bd3 100644 --- a/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs +++ b/src/BizHawk.Emulation.Cores/CPUs/ARM/Darm.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; namespace BizHawk.Emulation.Cores.Components.ARM { - public class Darm + public static class Darm { public const string dllname = "libdarm.dll"; public const CallingConvention cc = CallingConvention.Cdecl; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs index 78a53a16c1..be7fcde259 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GBColors.cs @@ -2,7 +2,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy { - public class GBColors + public static class GBColors { /* * The GBC uses a RGB555 color space, but it most definately does not resemble sRGB at all. diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs index 0c041c3280..2e9c09d2c9 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/Nes_NTSC_Colors.cs @@ -2,7 +2,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES { - public class Nes_NTSC_Colors + public static class Nes_NTSC_Colors { // just the color deemphasis routines from nes_ntsc