Promote BHI1007 to a build error, fixing some cases and muting others
"Don't use target-typed new for throw expressions" where there was a type name checked-in before being removed, I've restored it (they were all `Exception`)
This commit is contained in:
parent
a72b0f7e8c
commit
29c15adbbf
|
@ -18,7 +18,7 @@ dotnet_diagnostic.BHI1005.severity = error
|
||||||
# Do not discard local variables
|
# Do not discard local variables
|
||||||
dotnet_diagnostic.BHI1006.severity = error
|
dotnet_diagnostic.BHI1006.severity = error
|
||||||
# Don't use target-typed new for throw expressions
|
# Don't use target-typed new for throw expressions
|
||||||
dotnet_diagnostic.BHI1007.severity = suggestion
|
dotnet_diagnostic.BHI1007.severity = error
|
||||||
# Don't call this.GetType() in sealed type, use typeof operator
|
# Don't call this.GetType() in sealed type, use typeof operator
|
||||||
dotnet_diagnostic.BHI1100.severity = error
|
dotnet_diagnostic.BHI1100.severity = error
|
||||||
# Don't call this.GetType(), use typeof operator (or replace subtype check with better encapsulation)
|
# Don't call this.GetType(), use typeof operator (or replace subtype check with better encapsulation)
|
||||||
|
|
|
@ -7,6 +7,8 @@ using BizHawk.Common.NumberExtensions;
|
||||||
|
|
||||||
using static SDL2.SDL;
|
using static SDL2.SDL;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Bizware.Audio
|
namespace BizHawk.Bizware.Audio
|
||||||
{
|
{
|
||||||
internal sealed class SDL2WavStream : Stream, ISpanStream
|
internal sealed class SDL2WavStream : Stream, ISpanStream
|
||||||
|
|
|
@ -3,6 +3,8 @@ using System.Numerics;
|
||||||
|
|
||||||
using Silk.NET.OpenGL;
|
using Silk.NET.OpenGL;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Bizware.Graphics
|
namespace BizHawk.Bizware.Graphics
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -9,6 +9,8 @@ using BizHawk.Common;
|
||||||
|
|
||||||
using static SDL2.SDL;
|
using static SDL2.SDL;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Bizware.Graphics
|
namespace BizHawk.Bizware.Graphics
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -7,6 +7,8 @@ using BizHawk.Common.CollectionExtensions;
|
||||||
|
|
||||||
using static SDL2.SDL;
|
using static SDL2.SDL;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Bizware.Graphics
|
namespace BizHawk.Bizware.Graphics
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -31,7 +31,10 @@ namespace BizHawk.Bizware.Input
|
||||||
|
|
||||||
if (Display == IntPtr.Zero)
|
if (Display == IntPtr.Zero)
|
||||||
{
|
{
|
||||||
throw new("Could not open XDisplay");
|
// There doesn't seem to be a convention for what exception type to throw in these situations. Can't use NRE. Well...
|
||||||
|
// _ = Unsafe.AsRef<X11.Display>()!; // hmm
|
||||||
|
// InvalidOperationException doesn't match. Exception it is. --yoshi
|
||||||
|
throw new Exception("Could not open XDisplay");
|
||||||
}
|
}
|
||||||
|
|
||||||
using (new XLock(Display))
|
using (new XLock(Display))
|
||||||
|
|
|
@ -9,6 +9,8 @@ using BizHawk.Common.CollectionExtensions;
|
||||||
|
|
||||||
using static SDL2.SDL;
|
using static SDL2.SDL;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Bizware.Input
|
namespace BizHawk.Bizware.Input
|
||||||
{
|
{
|
||||||
public sealed class SDL2InputAdapter : OSTailoredKeyInputAdapter
|
public sealed class SDL2InputAdapter : OSTailoredKeyInputAdapter
|
||||||
|
|
|
@ -66,7 +66,7 @@ namespace BizHawk.Client.Common
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw new($"Couldn't load XMLGame Asset \"{filename}\"");
|
throw new Exception($"Couldn't load XMLGame Asset \"{filename}\"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -96,7 +96,7 @@ namespace BizHawk.Client.Common
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
throw new($"Couldn't load XMLGame LoadAsset \"{filename}\"", e);
|
throw new Exception($"Couldn't load XMLGame LoadAsset \"{filename}\"", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
if (!_workerT.IsAlive)
|
if (!_workerT.IsAlive)
|
||||||
{
|
{
|
||||||
throw new("AVI Worker thread died!");
|
throw new Exception("AVI Worker thread died!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -194,7 +194,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
if (!_workerT.IsAlive)
|
if (!_workerT.IsAlive)
|
||||||
{
|
{
|
||||||
throw new("AVI Worker thread died!");
|
throw new Exception("AVI Worker thread died!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -977,7 +977,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
public void SetDefaultVideoCodecToken(Config config)
|
public void SetDefaultVideoCodecToken(Config config)
|
||||||
{
|
{
|
||||||
var ct = CodecToken.DeSerialize(config.AviCodecToken);
|
var ct = CodecToken.DeSerialize(config.AviCodecToken);
|
||||||
_currVideoCodecToken = ct ?? throw new($"No default {nameof(config.AviCodecToken)} in config!");
|
_currVideoCodecToken = ct ?? throw new Exception($"No default {nameof(config.AviCodecToken)} in config!");
|
||||||
}
|
}
|
||||||
|
|
||||||
public string DesiredExtension()
|
public string DesiredExtension()
|
||||||
|
|
|
@ -11,6 +11,8 @@ using BizHawk.Emulation.Common;
|
||||||
using BizHawk.Emulation.Cores.Arcades.MAME;
|
using BizHawk.Emulation.Cores.Arcades.MAME;
|
||||||
using BizHawk.Emulation.DiscSystem;
|
using BizHawk.Emulation.DiscSystem;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Client.EmuHawk
|
namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
public partial class RCheevos
|
public partial class RCheevos
|
||||||
|
|
|
@ -10,6 +10,8 @@ using BizHawk.Common.IOExtensions;
|
||||||
using BizHawk.Client.Common;
|
using BizHawk.Client.Common;
|
||||||
using BizHawk.Emulation.Common;
|
using BizHawk.Emulation.Common;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Client.EmuHawk
|
namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
public partial class RCheevos : RetroAchievements
|
public partial class RCheevos : RetroAchievements
|
||||||
|
|
|
@ -13,6 +13,8 @@ using BizHawk.Common.StringExtensions;
|
||||||
using BizHawk.Emulation.Common;
|
using BizHawk.Emulation.Common;
|
||||||
using BizHawk.Emulation.DiscSystem;
|
using BizHawk.Emulation.DiscSystem;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Client.EmuHawk
|
namespace BizHawk.Client.EmuHawk
|
||||||
{
|
{
|
||||||
public abstract partial class RetroAchievements
|
public abstract partial class RetroAchievements
|
||||||
|
|
|
@ -191,7 +191,7 @@ namespace BizHawk.Client.EmuHawk
|
||||||
lib.APIs = _apiContainer;
|
lib.APIs = _apiContainer;
|
||||||
if (!ServiceInjector.UpdateServices(newServiceProvider, lib, mayCache: true))
|
if (!ServiceInjector.UpdateServices(newServiceProvider, lib, mayCache: true))
|
||||||
{
|
{
|
||||||
throw new("Lua lib has required service(s) that can't be fulfilled");
|
throw new Exception("Lua lib has required service(s) that can't be fulfilled");
|
||||||
}
|
}
|
||||||
|
|
||||||
lib.Restarted();
|
lib.Restarted();
|
||||||
|
|
|
@ -219,7 +219,9 @@ namespace BizHawk.Common.PathExtensions
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var dirPath = AppContext.BaseDirectory;
|
var dirPath = AppContext.BaseDirectory;
|
||||||
DataDirectoryPath = ExeDirectoryPath = string.IsNullOrEmpty(dirPath) ? throw new("failed to get location of executable, very bad things must have happened") : dirPath.RemoveSuffix('\\');
|
DataDirectoryPath = ExeDirectoryPath = string.IsNullOrEmpty(dirPath)
|
||||||
|
? throw new Exception("failed to get location of executable, very bad things must have happened")
|
||||||
|
: dirPath.RemoveSuffix('\\');
|
||||||
DllDirectoryPath = Path.Combine(ExeDirectoryPath, "dll");
|
DllDirectoryPath = Path.Combine(ExeDirectoryPath, "dll");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -279,7 +279,7 @@ namespace BizHawk.Common
|
||||||
using var proc = ConstructSubshell(cmd, args);
|
using var proc = ConstructSubshell(cmd, args);
|
||||||
proc.Start();
|
proc.Start();
|
||||||
var stdout = proc.StandardOutput;
|
var stdout = proc.StandardOutput;
|
||||||
if (stdout.EndOfStream) throw new($"{noOutputMsg} ({cmd} wrote nothing to stdout)");
|
if (stdout.EndOfStream) throw new Exception($"{noOutputMsg} ({cmd} wrote nothing to stdout)");
|
||||||
return stdout.ReadLine()!;
|
return stdout.ReadLine()!;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,8 @@ using System.Runtime.InteropServices;
|
||||||
|
|
||||||
using static SDL2.SDL;
|
using static SDL2.SDL;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Emulation.Common
|
namespace BizHawk.Emulation.Common
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -88,7 +88,7 @@ namespace BizHawk.Emulation.Cores.Arcades.MAME
|
||||||
if (_loadFailure != string.Empty)
|
if (_loadFailure != string.Empty)
|
||||||
{
|
{
|
||||||
Dispose();
|
Dispose();
|
||||||
throw new("\n\n" + _loadFailure);
|
throw new Exception("\n\n" + _loadFailure);
|
||||||
}
|
}
|
||||||
|
|
||||||
// concat all SHA1 hashes together (unprefixed), then hash that
|
// concat all SHA1 hashes together (unprefixed), then hash that
|
||||||
|
|
|
@ -8,6 +8,8 @@ using BizHawk.BizInvoke;
|
||||||
using BizHawk.Common;
|
using BizHawk.Common;
|
||||||
using BizHawk.Emulation.Common;
|
using BizHawk.Emulation.Common;
|
||||||
|
|
||||||
|
#pragma warning disable BHI1007 // target-typed Exception TODO don't
|
||||||
|
|
||||||
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
|
namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
|
||||||
{
|
{
|
||||||
[PortedCore(CoreNames.Encore, "", "nightly-2104", "https://github.com/CasualPokePlayer/encore", singleInstance: true)]
|
[PortedCore(CoreNames.Encore, "", "nightly-2104", "https://github.com/CasualPokePlayer/encore", singleInstance: true)]
|
||||||
|
|
|
@ -385,7 +385,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
|
||||||
private static byte[] GetTMDData(ulong titleId)
|
private static byte[] GetTMDData(ulong titleId)
|
||||||
{
|
{
|
||||||
using var zip = new ZipArchive(Zstd.DecompressZstdStream(new MemoryStream(Resources.TMDS.Value)), ZipArchiveMode.Read, false);
|
using var zip = new ZipArchive(Zstd.DecompressZstdStream(new MemoryStream(Resources.TMDS.Value)), ZipArchiveMode.Read, false);
|
||||||
using var tmd = zip.GetEntry($"{titleId:x16}.tmd")?.Open() ?? throw new($"Cannot find TMD for title ID {titleId:x16}, please report");
|
using var tmd = zip.GetEntry($"{titleId:x16}.tmd")?.Open() ?? throw new Exception($"Cannot find TMD for title ID {titleId:x16}, please report");
|
||||||
return tmd.ReadAllBytes();
|
return tmd.ReadAllBytes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
|
||||||
{
|
{
|
||||||
if (lp.Discs.Count > 128)
|
if (lp.Discs.Count > 128)
|
||||||
{
|
{
|
||||||
throw new("Too many discs loaded at once!");
|
throw new ArgumentException(paramName: nameof(lp), message: "Too many discs loaded at once!");
|
||||||
}
|
}
|
||||||
|
|
||||||
_cds = lp.Discs.Select(d => d.DiscData).ToArray();
|
_cds = lp.Discs.Select(d => d.DiscData).ToArray();
|
||||||
|
|
Loading…
Reference in New Issue