From 7efafc18da4d8915275e25c786df9367aa8ef40c Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 24 Sep 2022 09:26:52 +1000 Subject: [PATCH] Extract helper code for Analyzers and Source Generators --- ExternalProjects/AnalyzersCommon.props | 16 ++++++++++++++++ .../RoslynUtils.cs | 2 +- .../BizHawk.Analyzer/BizHawk.Analyzer.csproj | 9 +-------- .../BizHawk.SrcGen.ReflectionCache.csproj | 6 +----- ExternalProjects/LibCommon.props | 1 + References/BizHawk.Analyzer.dll | Bin 28160 -> 28160 bytes References/BizHawk.SrcGen.ReflectionCache.dll | Bin 12288 -> 13312 bytes 7 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 ExternalProjects/AnalyzersCommon.props rename ExternalProjects/{BizHawk.Analyzer => AnalyzersCommon}/RoslynUtils.cs (96%) diff --git a/ExternalProjects/AnalyzersCommon.props b/ExternalProjects/AnalyzersCommon.props new file mode 100644 index 0000000000..f70464bbc1 --- /dev/null +++ b/ExternalProjects/AnalyzersCommon.props @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/ExternalProjects/BizHawk.Analyzer/RoslynUtils.cs b/ExternalProjects/AnalyzersCommon/RoslynUtils.cs similarity index 96% rename from ExternalProjects/BizHawk.Analyzer/RoslynUtils.cs rename to ExternalProjects/AnalyzersCommon/RoslynUtils.cs index 5ee6e2f865..7c7dea0b7b 100644 --- a/ExternalProjects/BizHawk.Analyzer/RoslynUtils.cs +++ b/ExternalProjects/AnalyzersCommon/RoslynUtils.cs @@ -4,7 +4,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -internal static class RoslynUtils +public static class RoslynUtils { public static SyntaxNode? EnclosingTypeDeclarationSyntax(this CSharpSyntaxNode node) { diff --git a/ExternalProjects/BizHawk.Analyzer/BizHawk.Analyzer.csproj b/ExternalProjects/BizHawk.Analyzer/BizHawk.Analyzer.csproj index 098e1eb0f3..46dbd2596a 100644 --- a/ExternalProjects/BizHawk.Analyzer/BizHawk.Analyzer.csproj +++ b/ExternalProjects/BizHawk.Analyzer/BizHawk.Analyzer.csproj @@ -2,12 +2,5 @@ netstandard2.0 - - - $(NoWarn);SA1200 - - - - - + diff --git a/ExternalProjects/BizHawk.SrcGen.ReflectionCache/BizHawk.SrcGen.ReflectionCache.csproj b/ExternalProjects/BizHawk.SrcGen.ReflectionCache/BizHawk.SrcGen.ReflectionCache.csproj index 1fc7f7ba0c..46dbd2596a 100644 --- a/ExternalProjects/BizHawk.SrcGen.ReflectionCache/BizHawk.SrcGen.ReflectionCache.csproj +++ b/ExternalProjects/BizHawk.SrcGen.ReflectionCache/BizHawk.SrcGen.ReflectionCache.csproj @@ -2,9 +2,5 @@ netstandard2.0 - - - - - + diff --git a/ExternalProjects/LibCommon.props b/ExternalProjects/LibCommon.props index 8c050f9604..3ec6b6cfb4 100644 --- a/ExternalProjects/LibCommon.props +++ b/ExternalProjects/LibCommon.props @@ -1,6 +1,7 @@ + $(NoWarn);SA1200 true diff --git a/References/BizHawk.Analyzer.dll b/References/BizHawk.Analyzer.dll index 433a4397307ded1a2f770a42049977a3b6d3db17..e59efe202e1c7ccac581dfa8d7abd5eb3a97e7da 100644 GIT binary patch delta 1870 zcmY*ae{2(F7=FL+uGjXqYkRldx?kPewcXmTlWoMo7)%E8Ly5@52;2BE91xZThRSAe z=vp=x7($$%5RmAm(TE|Sa1b?00Ewsx0sj(a5Lv>n1to|Cf=1$dUrPr`^W5`%@AJIx zcVF(VvGXK$p1i$D+}Qu@g#&LLm9zrd9) z%qqOwwS1WpjjwURW z(aZ=HG`O#qpprt>m`~G4XcAr{Ra9uNK@##}d#)yrsW+w|r-IO4%i8T(>~;IU1dLZ@ zjY>E{DhsfBMQ0zUFC

UwTwB8;1OBobnDSV&5sv#Ao;&VPZ|*6`SvT!O4S8+VvRT zxE0M`Ielc7@vHMFAwKq=Ix&kIrqHf(Gz81UVt1)s3i*v|Dj92ZQ+qSj2%Gapy&3a~ zpPkDX3gMv=IdM7}7S+-*9kpUF^B{d0>7+h99pq24q0Ate!A@o#$KWP?GUE687l@r% zi=6yZvi4K9Gbf;FaM}V68JOJf(qOB;DuaES)0i(qr^Q@2iwhcD%QW$-%QQ}P z7?rsW5+=k2ryc9mr$7fcnCco=*^mcuR6n@ZsSU^rjn=#op?gjccLyhJyPcVG8a$s+ zkSlxSbohv?zU&$&0R@h6HIQBB^veq56_4c<2qYBGIbao6iJTKQah1q9;SyIn;Iv*X zJHgeBj|jj3?3Jd;Dm=l}4pejHOn4@x8f7;$CDl#mN;wx=xk`-4hnF5v>mO0^gtA?? z+etobPSw`R`LMI3+Z>;00pVW~y=?G~hN75@v1IJNXt(_pF^qA{MwlC;+4w8HHoT^hI2<}2!&3+FykP%j0 zTu=Jhmg2B7Na}?v%2uI{tdowgkH2g#HksH(-y4taCZ-P_i%S_!gwoOOIlb( zB(F*kOrxJ;onS`mIG@h3nd35!EgYBQ#}6kBMFPS_A&ni6xGT&Z6VYrVaP*4iijQ+Y z$Ekc}I_J%}<-3vVmJMVV`Gj394O{GB0h#I19;+MDfI=P{j8>D4Y&dFQtq5xaWjbjy zJ}nEEy1EW5xS?OJoq6#3_~BoE8y1a=3nvf~WZ8|6v%bbsvVzTS^yK@rcuZ*OsJ lKh?@IS8gm!E^fP>Ttv5i^XI;D|@jQ;=t delta 1882 zcmY*Ze{54#6h7y^*VpxRZ|!?q*RE?>x3*i`wKA447z1L5;1EJsFv<#p;pPIFZYbLV zPFZVlqKt&?8i)`T)C3h#*>j1a25|w!=!k!qFeT9igEK_4%pbrX8gFk)H;WLBhq<+Y+LU03s2%wU#g#fZ#X_V516wZ-)ngB5ThZJI- z{3-#w>}g<63K3V&fq;j3NCXyN`GK^08h0=mWx;HO~#>_Cf!SaxW2Q8%U9=6=b z%pX}wF{=MyIfqz8kE)9cxnUXUt6~O!L@c*gnxsInKBeO9plR*7>>&06_@I6H8?cyO z$v+-g$xbb&UueETHT0}vTrox5tbCG{O9t3oS$#h}Uf{X<3+}fqWq85%0mI(H z%~F&(19tsN;d?~WVB7$CGEn(Ns|E*c+w<7kC1t=(!9 z*uW0R*mz#Ix|%T;XH%Rxz@zUdo)r4m`q??)FpS%3Wi#yNYzR(C^|AsdGukO>oot2C zEQ`tcFqUD{mUg)izT@m-&M`}Y?0~Cj22R;67eS~zwPCm zZg@Roz09m`cxR5)4IgK;MQV>c56)*bE6jt5EPF~WfvJo$HN^wdb8;TIm378t57-0H z!uF?bF(8*gBrtmzA1q9>oHf!G^ue;MW(6Ot&1k6=et0me?Uen{%31n7l|z?aQF;?; zjdvBDDRb(3y?8H{3wG>AL!v)pQI;y6iawPBnjpIeXM9`d_%5|=`q zr3&7LZORxu?e|(b@iw`l+6W4Qy@Z(PPyQyHpta?VI7SbY2bE526s{`=g(!AQgYy2h#Mw{v4DK_OVUTo4TSOIaYi(jJ2}?W02{NPfimU0?3b(P8oDxk~ zswXQ}qG$%uOuq?)JEkt~5YRy0N!$;R!kA3xY&q(9p2ZmQ(xb%GcltK&IpDoEW&uW<_ YbN4EB2fnQwA3L=DrN8yj_BF=;0b@yvl>h($ diff --git a/References/BizHawk.SrcGen.ReflectionCache.dll b/References/BizHawk.SrcGen.ReflectionCache.dll index c53a868b7bc14a298a5c41118b19a1548d2af81f..e9bfec5bcb7f455f6381413fe6af13e7c8b8761a 100644 GIT binary patch delta 5281 zcmZ8l3vg7`8UD|?ch9|h37hQZK@ucv5)ziY0I>)@T4Rh56a+)C(GgviMN-0U$ZiHA z4ZAT)#aD^f+DgR&vDIqph(TK&tTO0Ktun2STJ8AY;b^s0#A&Th?05d%tihex@BaVy zKhA&t^T^$#uTHPseq+`4mp434+0S9B3QiESh#Eks3@I-feqe>~p+!WOXyR(3&y3;9 z!n`z59`qaAh?cvRvcc^X(;d4WR1n_=_a;#sOf8y|rze7d0X?z0MKW&{CDoA8)HLxW75y6^7ibXAy67FH^J6U5)8iZz1{{p1T~#?aAJ* z*fj~%Pdzw`LCtlv)Ak?{7L}?ObhKT7=Pu}9xzDQUHK>$udI>!tw1RM2aP1JGUVTZ> z8hkC+Z`Gs7GVW(A zHZ;FQ>e!i{rI6pVHU3>{{06c^FN;pwNBhP5kk3|~DchmXJesO?{^(WIqwerHbXaMo z5{!>F03DhG#-VMd#vPW%jb4p+GM)!UkxNI(M`v=>|GYZ(1ml}Phps~gMGuiK;(GRf zOwPAcitfTJ6@6st8koE4}9fFH`5EXrHu@;RXz^ z=ur%yXjCo57A1O413Hc#ivsGFo%Z~kW}x5mQ&6!mFusDu&xdT%AheD4i*_rnM-K^T z4_e2C*0Ao-_89Y##vp7rXpd$!A8Wm4#)j<%TSL}{O#*EtYo^{5(4J>4WfJ~eK)sn& zkKQ%VjtVMpR9SY!whH$3Dqv|R|gkC}HYSInhn z>6fAe9sL!{_d=dR_X})f&vxLKv{x(*VqDr<`i!L)<%hx4nEC`#_2i6CK}+Q{ZPRCs z=uW!Sc^2A!)`qD=z90fD}4`wv3w2Yq5*}f5F^hVZpv$$N8lZij{M1yn}YqzlW zt~ex4ljZawYnhJX)dLr@_KZ`NoJ{jrOS!a+LUIb-$?9sd>4kmb-g+f;fbYuiDSg}#sZqtE{bVoVc+y90N?D|~rqc8r;h zOE~ixV~&Br9!9LB6Zj)6=wZAgjA0)$D;NuLCKUt;j%d*y~sEy%Dm0EIeY92sTomA z=mgziFQ?CGskMr>iQAmDz#UEu_?f+dhQ)r`h&_{9rv~8kh`5Qi@i2L`K<%U=$V=$A z;x_dl0{-ebh`TStl*yOCZ*@+9$GHK%?(yI{8nwN`FREoR_G)o}=WSDn2E;V9S{O|IPct51>p@B&>KV>m3-e*- zBjA5-M3|2-Kg6Cx%%p~x8WB7X1nd(dF#p~dVe<%E@8v`X+2~oNPjxc|W z2Rp|6G3E*V#l&!~p>&&yvkKW~XSD643^772|k(N89s?uOf8+t zz0Y@Q0MjVMw+Is{#@D}?p28vd5I*51E0$FUSazFoQza z9)Q1Ci#`_5H7yZnGlLXpQT(;9}jr-4K@An%wCwshKoa5gH#@Y?BNu)9oG; zqGLiAu8(ZLv1a|eTm$Zgn%Ws{=!L{A(BnY*R{T3dudVGfLL|))P0@nS)YpakM9tpO zo?27Pq4Lhok4Y?EiVKS##P^LheDRBY?4#ZB3kknrh<>sN-v;+L)2j-$F5I<$!TndZ z4zAd-|Lrd>Rqkuk?>Rk77K<#2+�`7oL_{WgdB8${(y(5kL0%Sj)lT$`W~W(dg5m Vxnk5;_k|(Nvq$|+$Hnk0>;Embk{JL1 delta 4339 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