From 65ffa3fc2e85eab220a2238271c65f85591ab336 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 15 Apr 2023 09:53:20 +1000 Subject: [PATCH] Blindly update NuGet deps temporarily disabled MA0020 --- Common.props | 8 ++++---- Common.ruleset | 2 +- ExternalProjects/AnalyzersCommon.props | 8 ++++++-- .../FirstOrDefaultOnStructAnalyzer.cs | 2 +- .../UseTypeofOperatorAnalyzer.cs | 2 +- .../PcxFileTypePlugin.HawkQuantizer.csproj | 2 +- .../DATParser/DATParser.csproj | 2 +- ExternalToolProjects/DBMan/DBMan.csproj | 2 +- .../NET48ExternalToolForm.targets | 2 +- References/BizHawk.Analyzer.dll | Bin 28160 -> 28160 bytes References/BizHawk.SrcGen.ReflectionCache.dll | Bin 13312 -> 13312 bytes References/BizHawk.SrcGen.VersionInfo.dll | Bin 10240 -> 10240 bytes References/FlatBuffers.GenOutput.dll | Bin 44032 -> 44032 bytes References/ISOParser.dll | Bin 16384 -> 16384 bytes References/NLua.dll | Bin 106496 -> 106496 bytes .../PcxFileTypePlugin.HawkQuantizer.dll | Bin 13312 -> 13312 bytes .../BizHawk.Bizware.BizwareGL.csproj | 4 ++-- .../BizHawk.Client.Common.csproj | 2 +- src/BizHawk.Common/BizHawk.Common.csproj | 4 ++-- .../BizHawk.Emulation.Common.csproj | 4 ++-- ...awk.Tests.Testroms.GB.GambatteSuite.csproj | 2 +- .../BizHawk.Tests.Testroms.GB.csproj | 10 +++++----- src/BizHawk.Tests/BizHawk.Tests.csproj | 8 ++++---- .../Client.Common/cheats/CheatDecoderTests.cs | 4 ++-- 24 files changed, 36 insertions(+), 32 deletions(-) diff --git a/Common.props b/Common.props index ae7126afec..e95792861b 100644 --- a/Common.props +++ b/Common.props @@ -32,8 +32,8 @@ - - + + @@ -43,7 +43,7 @@ true - - + + diff --git a/Common.ruleset b/Common.ruleset index c163bab2b8..f2f168e4ed 100644 --- a/Common.ruleset +++ b/Common.ruleset @@ -183,7 +183,7 @@ - + diff --git a/ExternalProjects/AnalyzersCommon.props b/ExternalProjects/AnalyzersCommon.props index b54bb5443c..612a6e54d9 100644 --- a/ExternalProjects/AnalyzersCommon.props +++ b/ExternalProjects/AnalyzersCommon.props @@ -8,9 +8,13 @@ Yes, even with an EXPLICIT to the Common project's assembly. So you get this instead. —yoshi --> + + true + $(NoWarn);RS2008 + - - + + diff --git a/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs index e68f46f01e..ae888bb3a1 100644 --- a/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs +++ b/ExternalProjects/BizHawk.Analyzer/FirstOrDefaultOnStructAnalyzer.cs @@ -42,7 +42,7 @@ public sealed class FirstOrDefaultOnStructAnalyzer : DiagnosticAnalyzer var operation = (IInvocationOperation) oac.Operation; var calledSym = operation.TargetMethod.ConstructedFrom; if (!(firstOrDefaultWithPredSym!.Matches(calledSym) || firstOrDefaultNoPredSym!.Matches(calledSym))) return; - var receiverExprType = (INamedTypeSymbol) operation.SemanticModel.GetTypeInfo((CSharpSyntaxNode) operation.Arguments[0].Syntax)!.ConvertedType!; + var receiverExprType = (INamedTypeSymbol) operation.SemanticModel!.GetTypeInfo((CSharpSyntaxNode) operation.Arguments[0].Syntax)!.ConvertedType!; if (receiverExprType.TypeArguments[0].IsValueType) oac.ReportDiagnostic(Diagnostic.Create(DiagUseFirstOrNull, operation.Syntax.GetLocation())); }, OperationKind.Invocation); diff --git a/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs index 93ed858abd..049364a2d3 100644 --- a/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs +++ b/ExternalProjects/BizHawk.Analyzer/UseTypeofOperatorAnalyzer.cs @@ -42,7 +42,7 @@ public sealed class UseTypeofOperatorAnalyzer : DiagnosticAnalyzer objectDotGetTypeSym ??= oac.Compilation.GetTypeByMetadataName("System.Object")!.GetMembers("GetType")[0]; if (!objectDotGetTypeSym.Matches(operation.TargetMethod)) return; if (operation.Instance.Syntax is not ThisExpressionSyntax and not IdentifierNameSyntax { Identifier.Text: "GetType" }) return; // called on something that isn't `this` - var enclosingType = operation.SemanticModel.GetDeclaredSymbol(((CSharpSyntaxNode) operation.Syntax).EnclosingTypeDeclarationSyntax()!)!; + var enclosingType = operation.SemanticModel!.GetDeclaredSymbol(((CSharpSyntaxNode) operation.Syntax).EnclosingTypeDeclarationSyntax()!)!; oac.ReportDiagnostic(Diagnostic.Create(enclosingType.IsSealed ? DiagNoGetTypeOnThisSealed : DiagNoGetTypeOnThis, operation.Syntax.GetLocation(), enclosingType.Name)); }, OperationKind.Invocation); diff --git a/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj b/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj index 2c9d7a89a5..6230731e26 100644 --- a/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj +++ b/ExternalProjects/PcxFileTypePlugin.HawkQuantizer/PcxFileTypePlugin.HawkQuantizer.csproj @@ -8,6 +8,6 @@ disable - + diff --git a/ExternalToolProjects/DATParser/DATParser.csproj b/ExternalToolProjects/DATParser/DATParser.csproj index a09d32549c..ef15841bf6 100644 --- a/ExternalToolProjects/DATParser/DATParser.csproj +++ b/ExternalToolProjects/DATParser/DATParser.csproj @@ -7,7 +7,7 @@ true - + diff --git a/ExternalToolProjects/DBMan/DBMan.csproj b/ExternalToolProjects/DBMan/DBMan.csproj index 32c3741ee7..f386d85a4b 100644 --- a/ExternalToolProjects/DBMan/DBMan.csproj +++ b/ExternalToolProjects/DBMan/DBMan.csproj @@ -8,7 +8,7 @@ $(NoWarn);MSB3270;SA1400 - + diff --git a/ExternalToolProjects/NET48ExternalToolForm.targets b/ExternalToolProjects/NET48ExternalToolForm.targets index 8b8cfc1d6c..18f23f72f5 100644 --- a/ExternalToolProjects/NET48ExternalToolForm.targets +++ b/ExternalToolProjects/NET48ExternalToolForm.targets @@ -7,7 +7,7 @@ - + diff --git a/References/BizHawk.Analyzer.dll b/References/BizHawk.Analyzer.dll index e59efe202e1c7ccac581dfa8d7abd5eb3a97e7da..59b663b8c37b61c7cf0a8ef41d95cfc3e8b95be6 100644 GIT binary patch delta 293 zcmZp;!`N_#aY6^nf)4rL6MJNsuC+{D6~@>+nUS%c=|{@sCdN9(?VA~yK5KD2XklPb zVtCOq`HzmCHVXqY0}LEs=@J03*UnPy_~z4{&<7pfn2 zE{UJG`9Z`59^SMYDk~TmeFK<)N@FJPO_gVj0ooEX`C+QEx`o@)dFBrp{8uu@L{9Y7 zC}sqzQK@#ytnx@K&(?FyOU$XPN-e6L9G7Nc1XX)q6RH+yuEy_B`Q(zgiLs9H)n-Pf&srP;tqcrG z3=*xA|LEvxGc#~7z`y~PE&&jm6(#_rPqO?0bAjqMhw4^q3si3me<%9X&TZ3c`2*@X>Ee=9g}Psb?}7 zfok+K@^e%5EAxvpGWA{ZlS^|`^Gb^K^@>sp@{9GIGOIii%d_=eD@sy}@)C0bit@8k zlY#P32|Y)kU}aTm(PZs33tg!3eP5u)1DzuJ;X>QXDeDYc?)B|tya#j$4E&fpAx)a` m)#Np4TI>w}RT&f*1SUU7`?r}d;}cR zZlBD^B+R-*g@J)_vY@W{<^ZMxES4GE3=GP33=CI*^b#&0JGi7MGcUcE0SGF@7#I{l zVxhqdGZYvY1b|}7?xCJ8KzhYwPj+oa%gLqeFBwZG$8+d2T2JohaAb_1e38SRjgP^c zYX|3M0nQtYjA5H!a;;}(pTw2H(8)M&@_asb@h+~9K=u*#|3LC4D=T9s<7N&{#)Fgp z^0_mf-0aG)%`DEszznnn0!kPoIY2C+*yMI0lg)dD%(z&b5{pwef0pUw68K>CU%vR< z1gCA@a~y&$B(^Q?QD+eq<+yp3fzdaB38=3Eh@SvMeUDNgQQv>GE&ol5oOGZJ!)wUa$`+>D?KzQPoM49zbn3+BGHIEt^!w`(=f tC>S^jVk=Bk6a$9ybseqEOu9UblNEGzHuLHIVrIHwwOP>UJ>x_Jb^v{&e1iZ0 delta 486 zcmZq3Xvmn*!7|}W;m(OYGE7X~6IX>XuA9ursLtBq$-odYS&>O+awMZV6NmQXCdN9( zN0S+ugjwgPFfcGqeyC%u-vB0{?$tni2N()>w4r7JDMla`24Zy}ZubJ>$w#%7z1ln$>~UWa>)IGL zYtQ{(L2MvZ`WgATsrr@q#Tl9UF8Rr&xv6<2#rk?hsRjAP`c9cu9*O1I`mPlvsYQ8- zIRQoaS*giD`N=tu+O eW{r;4=BqlqjGOuNelat#SZ@|Ide1n~fE@r*{)znn diff --git a/References/BizHawk.SrcGen.VersionInfo.dll b/References/BizHawk.SrcGen.VersionInfo.dll index 9804e928d38c7b23f70697b4e020dd011292ca2e..9934224fffb271a7e4b903ede013ab5e6be01de5 100644 GIT binary patch delta 134 zcmZn&Xb70l!Lq`K=l{l@e|+LB49pBLaG!yl9mEETZC=RF%p-98)ys=hPvkf+>(ye- zl>XARd5g3OGs_~Ou9K7B$OQ<9l*CKA&z#`D{MU22$QL>ylYQiq6`+FqpF;(Ksy%gn U$N2lIC+e-;fAH+)^YVrq0H&caS^xk5 delta 134 zcmZn&Xb70l!SYP;-j$6#|M`(X8AHl`q|_+asdJbcV24x?$mT@p7VUMtXomzWFPrt1*jmCGgJ_$IxX|_ Ug5{?=z1xI+t{>feUfz%c04%LD`~Uy| diff --git a/References/FlatBuffers.GenOutput.dll b/References/FlatBuffers.GenOutput.dll index 9b9e3a781ceffad290827ac7230783351aa8371c..22bf5437d4d015cb1ab66ebbb32f85d39fe92138 100644 GIT binary patch delta 204 zcmZp;!PIbrX+j5!!RjAVC-%rNPMf$goY8SIBV#?|oXL$qvUD>elk+5j?1s}EDH~bb zyI*flTx#@i<>rtn0{pzDYyuA$7<~hn7#JARCKoQ2XO%j{z#uhw>SARvcfpy#9WTE* zO=P8MHcs|!`I=@L`{$gqj49hdD{Wf8)0djIK6piwZ; qJh^d+G-K)Hxl1%RA70|kIQhX6gUx))elau6Fxo7*>OJE`19kvUbx(x= delta 249 zcmZp;!PIbrX+j6fi-_q9C-%rN9-Fu_oUvpwBV#?|naPbna>ZswCg({4hn#Z`t}v~4 zS;8x=73%)-(dLjT0{pyAU%X~9F!}~CF)%R9oLsnAp4Imd1B376sf(38j~iby?UOO} zTX0F!r@(F{10zt4enx(7s(xjDaYm-TOMY@`ZfaghvA$kWYC(RnzEftEM`C%lzH3EE zYEfQdPC!w9R%&ud@#O!D#U?*lY^w`3@tgwGM4;_b2d*vu#Q11lV_SN{v^hY#VPM;2 kza`R)D<)?x(cC<3i3j6mzGc6dnNApO7F_k7aiRe`020Ap9RL6T diff --git a/References/ISOParser.dll b/References/ISOParser.dll index 75c27f3e9040d81be7da1d1e16bbca5228a7d131..46570e94afc65c14e14c928a0ef793d1b91825ff 100644 GIT binary patch delta 207 zcmZo@U~Fh$oY28yoKgQ|Vvh`?(8QJDjC&_DGS)LnOm1YXXZjernTbhFU*PuJy}R{7 zLVVgkm+!i=U%6|uh2a5K-i4ZC=NTA%1DF^X82l!)n#;3J3uR!KHd)hLS;0P~$X;rx zhRcd6s`jhbUkG6Ys!^%-4E7I5EGkYds-3*R+)xi)5zs*Yea>fucP3{U&zx+i{}gB( n4EztB{NG#(X!o9Rq5(SqcD6@5 delta 258 zcmZo@U~Fh$oY27{t5iEX-T^j@^t!tekq@7moyXBZfL1DF^X7@8)tn#;4E3T0q8HCfYKIYe0g!d$N_ zbG_zFJE&ximL5ucTOCuPC)3zgXWXv&ti}JX_zj zq9nB_FEJ;eC_gJT87QAwoUdDuSX7)^G&#rI&Eipd)-{Gh{ue@4l{ZL@{NP oWEjvUC@==G6(%Z*fjsiu{4?WbKC55MOde*N1?}E5PBdT#0Fg3UEdT%j diff --git a/References/NLua.dll b/References/NLua.dll index 697c105045b9967da0f8fa9091d6007f09d9f7b9..578d1b011b99f0b6d43cd1f16720c2c09b0e79d3 100644 GIT binary patch delta 602 zcmXw$Pe>F|9LIm(8ONQVLg5oC0TVm)|Jc@aTN zv_0Kf$V-l}Ni76pj9qGBC_9Km*u_1`9)d0%f>?~Le)G@=@5_(R=lgz_H&$sLt294- z)U>j2YB8VNgHQR{OSq?iPHQdzT~r;$esu+%SXAQ}MM=TfX3aE+;H?&LG)Nom1?&s% z7Q^c>RabqGbGUvWu~|Hzep*uHdTV!&sL%*~*gcNhoDz>IBWjRzLpX+{J3<;UiQ-g0 z>n}#L!cF|)rkgOq{e+~fkeWzMd?q>JYvOAXF_{*TCXpsJCi9}ENlg>ejyt9uZ#M0C zbJ9LfOCo9a(=w-|6;8Gp7O{4;cC>c1cJyOMTbIeaa5Zr?k-9H+U$RBF)K+TiGno!< zt^G1kR#zLtoZlK{ECljz$=YSmCIW4o%Uj|}v(Rb6v70Rq-+RRiRsYPZFDGXIWuCQ# zxglh`aKtkwa2OPxp5V{fQ5tzyAq=JsetnX!JqNPA)k(Bk13V6RjY%Y13T+=>zwB|& zJ=r@|9a>J!cnA3-53SR_v+I<1rS1pm==j$k)$hH1;d5TFao)yrd%j~QO5vLVu0f@+ RJ=|Kvnq_?M4Kan^_zymB#OeS5 delta 615 zcmYk3O-NKx7>3V#?~HSU6jQ-|CYqRqcr3F>L})d4qLn5lWQwL<2}}?wYZgI{onnG! zkzAeY!WJ@%D3F3%+{k_gX45QMv@l`{6o!as(IT+HnCQD72^}~u=RD7QzRgMIs*<^? zdv^j?(nfAB9Y%5P;aQ|?pegv)h3K;nYKQD|Xu^g)iy5ri(CUNFD?-3|pFxM)qeU_} z;a*zw&ZEI@E_YET%11)`-I{yu_Z2Z;<|XVcNUYB3U|e%EJ2B@($ti=A(iHn zyr1@u^72edTA|<6v_d+lA5tPE6%)lIOXR-HGRZQ@6LDppNuEiGNI{mEl$hv--_Z?! zvTpd3qeib-mr)}ozECRhos#ST316G6P1YuBlOLOGEg}VJF|n8^?knyqvUM$rtzw%c z;<^)CKQ+9zhbjrmwaN-Uy6Vq^;2wzoSAVsCW9FFwbY7@!A1e-2zc?Mcnb;iswDZ-P zm%fN=%{b-g^JuTz)!KcsFLGvjbZUI`@_6J}Yn#_OPrtRBrabyO@kF4jN27C`cK9ho z*m<{r#^4AYN1Sg9h}L?kq2ht*-gv6NrvB*dj(`)U&prH)Hf&Rx)z&@u^4HYxjt`cx h{OmCe*j@!EnZZ7+dP^A$!>d`uR#5wV+`|$!@fR`b#B%@u diff --git a/References/PcxFileTypePlugin.HawkQuantizer.dll b/References/PcxFileTypePlugin.HawkQuantizer.dll index 9be688f706042fbdcf215c3297a0c6b36283e899..5c7886ebbdf7710b0e9fd843a406cdfc25e0ad36 100644 GIT binary patch delta 226 zcmZq3Xvmn*!Sc>^&!mYxGK^dkSB5igoy^Es&uB2Yk+GiXrPpRACMQWofyu7Y`t0ls zV6eGbI*?o74e#{5-dm1)Oh{_~AZWVh_vSllFIafnn!@KYF!}~C0aaE_zNjtF+ULc< z&^P(3wz8Nm?%@}e zpFO)mH-y>i!CjzHFz_A3R+y+L26W?OAzh8h=DOD>7w8&n=F|Jd%*128SWG?KUq&lezKpAyAjmLr(94YLDpZ7Eeb8n zO*{Fh(fGcAH^{{hpao(pOjHyD`fBoh9gWFcx>q*y>HT76va#MQX!M?Oq5(Sq-;iK4 diff --git a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj index ffab7f9435..8f4652c72f 100644 --- a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj +++ b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj @@ -8,8 +8,8 @@ disable - - + + diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj index 33131ec100..12c5cc45b9 100644 --- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj index 84632409d0..ded33e3352 100644 --- a/src/BizHawk.Common/BizHawk.Common.csproj +++ b/src/BizHawk.Common/BizHawk.Common.csproj @@ -9,9 +9,9 @@ - + - + diff --git a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj index d7574925ad..3fcc3e2e4f 100644 --- a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj +++ b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj @@ -7,8 +7,8 @@ true - - + + diff --git a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj index 445ba22b97..50ab5f4729 100644 --- a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj +++ b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj @@ -7,7 +7,7 @@ $(ProjectDir)../../test_output - + diff --git a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj index 2fccf3b6b1..5ae245af09 100644 --- a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj +++ b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj @@ -17,11 +17,11 @@ - - - - - + + + + + diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj index e8cde53162..c21515c4d8 100644 --- a/src/BizHawk.Tests/BizHawk.Tests.csproj +++ b/src/BizHawk.Tests/BizHawk.Tests.csproj @@ -11,10 +11,10 @@ $(ProjectDir)../../test_output - - - - + + + + diff --git a/src/BizHawk.Tests/Client.Common/cheats/CheatDecoderTests.cs b/src/BizHawk.Tests/Client.Common/cheats/CheatDecoderTests.cs index 16ce11f286..a1829642a4 100644 --- a/src/BizHawk.Tests/Client.Common/cheats/CheatDecoderTests.cs +++ b/src/BizHawk.Tests/Client.Common/cheats/CheatDecoderTests.cs @@ -22,7 +22,7 @@ namespace BizHawk.Tests.Client.Common.cheats public IEnumerable GetData(MethodInfo methodInfo) => GenerateNonsense ? NonsenseData : RealData; - public string GetDisplayName(MethodInfo methodInfo, object?[] data) + public string? GetDisplayName(MethodInfo methodInfo, object?[]? data) { static string Format(object? o) => o switch { @@ -31,7 +31,7 @@ namespace BizHawk.Tests.Client.Common.cheats string s => $"\"{s}\"", _ => o.ToString()! }; - return $"{methodInfo.Name}({string.Join(", ", data.Select(Format))})"; + return data is null ? null : $"{methodInfo.Name}({string.Join(", ", data.Select(Format))})"; } }