From fd1912589e68c421d1c572e1c37bb660f6804200 Mon Sep 17 00:00:00 2001 From: Terje Sandstrom Date: Wed, 18 Sep 2024 04:51:45 +0200 Subject: [PATCH] updated --- DIagnosticsTests/DiagnosticsTests.csproj | 13 ++++++++----- GitIgnoreTests/GitIgnoreTests.csproj | 13 ++++++++----- IFix/DeleteMefCache.cs | 2 +- IFix/IFix.csproj | 16 +++++++++------- IFix/Options.cs | 10 +++++----- IFix/Program.cs | 4 ++-- IFix/Runsettings.cs | 17 ++++++++++++++++- IFix/gitignore.cs | 14 +++++++------- IFix/icon.png | Bin 0 -> 12370 bytes IFixTests/IFixTests.csproj | 15 +++++++++------ IntegrationTest/IntegrationTest.csproj | 13 ++++++++----- IntegrationTest/VerifyProcess.cs | 4 ++-- RestoreTests/RestoreTests.csproj | 13 ++++++++----- icon.png | Bin 0 -> 3201 bytes 14 files changed, 83 insertions(+), 51 deletions(-) create mode 100644 IFix/icon.png create mode 100644 icon.png diff --git a/DIagnosticsTests/DiagnosticsTests.csproj b/DIagnosticsTests/DiagnosticsTests.csproj index d4599ed..0f2c571 100644 --- a/DIagnosticsTests/DiagnosticsTests.csproj +++ b/DIagnosticsTests/DiagnosticsTests.csproj @@ -1,13 +1,16 @@  - net5.0 + net8.0 latest - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/GitIgnoreTests/GitIgnoreTests.csproj b/GitIgnoreTests/GitIgnoreTests.csproj index c7c757a..a056aa3 100644 --- a/GitIgnoreTests/GitIgnoreTests.csproj +++ b/GitIgnoreTests/GitIgnoreTests.csproj @@ -1,6 +1,6 @@  - net5.0 + net8.0 GitIgnoreTests GitIgnoreTests Copyright © 2014 Terje Sandstrom @@ -37,9 +37,12 @@ - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/IFix/DeleteMefCache.cs b/IFix/DeleteMefCache.cs index c80dee7..99ae2c6 100644 --- a/IFix/DeleteMefCache.cs +++ b/IFix/DeleteMefCache.cs @@ -7,7 +7,7 @@ namespace IFix { public class DeleteMefCache { - private readonly List caches=new List(); + private readonly List caches=new(); public MefCacheCommand MefCacheCommand { get; private set; } diff --git a/IFix/IFix.csproj b/IFix/IFix.csproj index 3d3cd44..56eecaf 100644 --- a/IFix/IFix.csproj +++ b/IFix/IFix.csproj @@ -1,25 +1,26 @@  Exe - net5.0 + net8.0 IFix IFix Hermit.IFix - Copyright Terje Sandstrom 2014-2021 - 3.0.0.0 - 3.0.0.0 - 3.0.0-beta.1 + Copyright Terje Sandstrom 2014-2023 + 4.0.0.0 + 4.0.0.0 + 4.0.0-beta.1 bin\$(Configuration)\ true IFix ./nupkg + icon.png MIT Terje Sandstrom IFix is a dotnet tool for fixing different issues with Visual Studio, git, testing, solutions and more Install it using: dotnet tool install --global Hermit.IFix and run it doing: IFix --help , which will show the relevant options. - (To install the beta, use --version 3.0.0-beta.1 or whatever beta number there is) + (To install the beta, use --version 4.0.0-beta.1 or whatever beta number there is) https://github.com/OsirisTerje/Ifix https://github.com/OsirisTerje/Ifix @@ -29,9 +30,10 @@ + - + diff --git a/IFix/Options.cs b/IFix/Options.cs index e4ac6f9..ab5e5a2 100644 --- a/IFix/Options.cs +++ b/IFix/Options.cs @@ -42,15 +42,15 @@ public class GoToBlog : Options { private const string UrlIFix = @"https://visualstudiogallery.msdn.microsoft.com/b8ba97b0-bb89-4c21-a1e2-53ef335fd9cb"; - private const string Urlgitignore = @"http://hermit.no/fixing-up-visual-studio-rsquo-s-gitignore-using-ifix/"; + private const string Urlgitignore = @"https://hermit.no/fixing-up-visual-studio-rsquo-s-gitignore-using-ifix/"; - private const string UrlNugetrestore = @"http://hermit.no/converting-projects-to-use-automatic-nuget-restore-using-ifix/"; + private const string UrlNugetrestore = @"https://hermit.no/converting-projects-to-use-automatic-nuget-restore-using-ifix/"; - private const string UrlCa0053 = @"http://hermit.no/how-to-fix-the-ca0053-error-in-code-analysis-in-visual-studio-2012/"; + private const string UrlCa0053 = @"https://hermit.no/how-to-fix-the-ca0053-error-in-code-analysis-in-visual-studio-2012/"; - private const string UrlMefcache = @"http://hermit.no/how-to-fix-visual-studio-loading-errors-using-ifix/"; + private const string UrlMefcache = @"https://hermit.no/how-to-fix-visual-studio-loading-errors-using-ifix/"; - private const string UrlCreateSln = @"http://hermit.no/ifix-create-solution-skeleton-file/"; + private const string UrlCreateSln = @"https://hermit.no/ifix-create-solution-skeleton-file/"; public override int Execute() { string url = UrlIFix; diff --git a/IFix/Program.cs b/IFix/Program.cs index 924a7ed..0da6efd 100644 --- a/IFix/Program.cs +++ b/IFix/Program.cs @@ -49,7 +49,7 @@ public static void HandleErrors(IEnumerable errors) { Console.WriteLine(error); } - System.Environment.Exit(1); + Environment.Exit(1); } public static string GetUsage() @@ -67,7 +67,7 @@ public static string GetUsage() usage.AppendLine(" ca0053"); usage.AppendLine(" info"); usage.AppendLine("For more instructions and information run 'IFix info', or for specific commands 'IFix -?' , or 'IFix info -? "); - usage.AppendLine("(c) Terje Sandstrom (http://hermit.no) , 2015-2021"); + usage.AppendLine("(c) Terje Sandstrom (https://hermit.no) , 2015-2024"); return usage.ToString(); } diff --git a/IFix/Runsettings.cs b/IFix/Runsettings.cs index 3209670..3f0f780 100644 --- a/IFix/Runsettings.cs +++ b/IFix/Runsettings.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.IO; using System.Net; +using System.Net.Http; +using System.Threading.Tasks; namespace IFix { @@ -28,7 +30,7 @@ private void RetrieveRunSettings() public void DownloadRunsettings(string path) { - using (var client = new WebClient()) + using (var client = new HttpClient()) { client.DownloadFile("https://raw.githubusercontent.com/OsirisTerje/RunSettings/master/AllTemplate/AllRunSettings.runsettings", path); @@ -36,4 +38,17 @@ public void DownloadRunsettings(string path) } } + + public static class HttpClientExtensions + { + public static async Task DownloadFile(this HttpClient client, string requestUri, string filename) + { + using var request = new HttpRequestMessage(HttpMethod.Get, requestUri); + await using Stream contentStream = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead) + .Result.Content.ReadAsStreamAsync().Result, + stream = new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None, + 8192, true); + await contentStream.CopyToAsync(stream); + } + } } diff --git a/IFix/gitignore.cs b/IFix/gitignore.cs index 2890686..1e0aa0c 100644 --- a/IFix/gitignore.cs +++ b/IFix/gitignore.cs @@ -272,12 +272,12 @@ public IReadOnlyCollection AddOnlyMissingInfo(IReadOnlyCollection> { - new Tuple(nuGetStart,true), - new Tuple(nuGetPkg,false), - new Tuple(nuGetPackageFull,false), - new Tuple(nuGetPackage194,false), - new Tuple(nuGetReincludeBuild,false), - new Tuple(nuGetReincludeBuild2,false) + new(nuGetStart,true), + new(nuGetPkg,false), + new(nuGetPackageFull,false), + new(nuGetPackage194,false), + new(nuGetReincludeBuild,false), + new(nuGetReincludeBuild2,false) }; string lastpattern = ""; foreach (var pattern in patterns) @@ -340,7 +340,7 @@ public void DownloadGitIgnore(string path) { using (var client = new WebClient()) { - client.DownloadFile("https://github.com/github/gitignore/raw/master/VisualStudio.gitignore", + client.DownloadFile("https://raw.githubusercontent.com/github/gitignore/main/VisualStudio.gitignore", path); } } diff --git a/IFix/icon.png b/IFix/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..50408e4d3f908d1549c0ae5c5447c05cbee00b65 GIT binary patch literal 12370 zcmX|HWmHscv_42T0@5ihH6TcLH=@!hIZAi8AR!>#9inu1hlGrDNC-#_9YfbWe0SaZ zW7e6q-+kUbJD&YSXsRpVVo_iL0D!BcD60hkNZ?;200Rwt7&?Em0w0);ih3>pK*IF+ zLsHUWJOYL2u1ach=o?tHPpPO_P#eqs6UphiO1Zh(I5-2P6{Cuv2*(u^$y&OYJ3}2^ zp$_%{5hgtYD93t~%Q!fCIYX^&T!AwDQDIPu_n*|+((F-{&J}8B3GiRwV}dQ1k1cN; ztXw_JoGk$($A?FC?EgB4x|rLVfvV0xV^>`)D8_gc>zFy)L+!1BF3QbtP=@}$@4Gph zTLNbfA-n&lCgWgdXKC*WoR21Vf-&K$_82y^4AVLW;(8tHm!!!QvwZlPs^LXlyahoX{K5x6H z{b9j$6Rm-+$)7l@{4~5)JT~v0+@C)GnOy5LJhtT(9kz6uZ3Y`V%u4f!oNM!{eL}`( zLr@IOXW}j*Rvs=6AXZjN)I$0Av6O2`<*qx#vm#`x#WN<#)u?cnPK*@jJu%ZKDYi4$ zWe$U`X~5`yeEYn3AXatf4?&S8!zh5$(i2GcT{%?LCvCJ;+ye=rT39fr^cNK>jB|>1 za;WtimQ%?(ng+(|c31u%lvPTXbd-C8oP*D%o7Bk?rP&~%K~E$dF9$0$F=Quiej}&} zOBtmxaC-Z&3KPC&X;{6+clJJi-s;1nw-oi0i-WQC+vmOf1B(q((`#QcHL3Ud+SU)L zb=p;hiNXM3;#LzleOK!57l+oc7PrJQJ++~oXK(lBq#36I<7t#JQP8xMMOi{ABXUJa z;Yx||!1(v2TOox9{K4y~>AVL`wFj+n31UslJxN<$9uC^%{a9^BdPzkb89JOO#G*Zd z>{VpPI`eNI1erG;t-7~5UKrGTfh5cx%8XNO^@{=(;`~o>3H37r+-tnGb?dc`p8C)= zZep2HZ}v1h+l?!7cgu@J6z(+wXj!kzl1$Qx=F7IyV1b8=r%B@SiCU6;1XE9u=%M%V z5R_sG+yH&FVoN&JguR~k-Z4}vhfeG8msWiJEI9o+U&-y*bV+(3@AcKoE&I~>KPGBL zeq~U258u=;IiW&lA2C8YB=-#|y-p5p|r^HR_*XqOCqS3#c}q ze;(}iPVkFa&)GC<7vxv*FxTJI_R}fCePPzZL{^RWy39dkhI@fIi`jnUyz3kTqvAQn z3}NQz6Ru>g05w1@6|^h+jg5Uh;bN=yxV#y>3hGVOL5ecSt6{(?vF1)Bn)@xgVVEY{#o3U-0zvZ3Vm6Ie#_cDP-M&Tv= zhmOly*?i&FzwI0+%5A^~U4YQ+rlyF)f34Ei-~_3A=LN;b9|TWuMrKagg+Ip=!kl>Q zXraws|AVkky)@w5zH4{YLZj+_5fWHxqxw%*~2 z1aEFW=K9bx!5K(0*XZ@~Pz<5)s$C-XZ#TFMJb83Py25dN==h=-gd+;k_QW|dGR=3I zU$ym`Vxrb%&8RK30QoQW+rvMDx8bz!&s1Qq4XSfAjk4@FSt4vMx}?10zUF9LboUBv zv>fuR#;cqqg!FC$f{~_noKe}n!Au$w>eI_ceA+r@R|wy;e}zX>q^K4o#1j{N34(V% z5~h8lFA-Z2G{}O%M0m9)MWlL{a}Qb#XGA;f>^ycd7l#S@lY&87Q##4DS0Rn_txnHa zGDQ>8R$3$O*9Qk%1D%Qt0NISFoVE+D!-uQbJ;V0I>tSaUK3oX2RF>@%rPEPSNrKT_ z$m?1zi_J3uEkRSswkQ%(BXPjJT)+P|{63sBYPq1Ij0%QpzHm+M|NV{DTA0yY;&R{{QUmM}4;UmaS{yX84LD=v+`AVk|fE67U; zM55trj?ymm%wco&Z9nfsH{u1vjoLmpUo7_@OshZzJqi9)qF=TM!&^Kn7)zQ`k4a62 zgaqyqGuLR2xwOM~wU7wDJNymlyiJpfec(n{aW6aut0-P@yUKabk$q%F`RhErF8!z{>Q1abdTsM@5U26 z2HXfZY!>}-usrSYh?tsPRcRcLa<9|nv7;;^2AkG4{sbs*jAdnB-DMnE7Y?@C*d;F> zyQP-Xa;}x`b`A|RZmoq;RNsobZp^+{14mj?aD$6)K3sKr-fw1nTke!t?*C9*h!3Ea zd0stuZlbS%R-oUMwVf$(W))n%>6uh==Mj!Zz@hND{UX8P^LiyM^gyD>qcPft4AKB6 zq9RIx_vpUY^Bpr#)j#qrX0O^Wm^DluIA3vkN-WELs4v6~Y#CNIZritRy9>Yhw$P4l z(n7O6DVzhr!5J|fjEub+jIG#O-^vzqwR+F1I4spwQ*Ph|Pid?HKZVbHGiD|5;mZE6 z1ar_=H?Qp0l0@u_oVV1+uDjJPCnna6YSxuoNV*z|R6IY73Ft{2zRPrEDE99wVFH4> zat;bU!0aE_dbI`fmsQi#Ym0I-RC)&F_}6_7xOK!ckkJ1O84vN(?}@;})2=~Wl@!p& z{nfyTX9gO$^hRAII)cPL&X|_KKZ)wE@!C?Z!%qyhdf&(QI}?dORTL*p0pMCSQSHNDD>~1eXFY@pvF$ai~OvWUz?X2^T0L zW;gLl!@oZPvWaB-#A5i$Pci5rwiz{?8D1N+jhY>P1|=!<74PhCCW_je92f}*y+xrXPS}s8!fWH)V6GF&kSzX1XSXMmK-WK`-o<3~ z%;%7q5X)`BXOIb?`0>LN)S9o^M)pNg(Ljv1h?)Ut99K8%zL$L_ueIEVZ`{2B!90k= zVgUC?V;{^v4h16j>1cEi6j_RoUKc?twf9+#A{#~`_2*s{gZU*718Xd_s50=DN@zII zI14iR#ok{NkGuHzvt5x}PLX=71HGZCIEA~JgQch zzwH)DZ75;~)xyolFo;M*ujxdzE4G_1;8pCjR)dk29G-jhp-@xCE3?S-89n02?-NUH zUJpjp4bD})AI!&`U)V)1anv2>5- z7#^izMH%<$Gx}j>!FjqzKSOLyszuLdW3Qg!*ZN&)k%*pK(LHF!AZnrXx<}hNa~-~Vdli(m?9^6&CSvuDwq?kYgB0`E zTN4vygP&4-f6hl0{Wr`|RAEB*8U0(*?kL$cBiZt2gM_)Q`(v#8I8GcPxP7!?t@A@+RZuI6(Z0cPyGi=^Z`6;F_1`(Qi+E~|6 z!q5xWzMN#tFsZW+!r=ycv)SQ|x3+)e=z3MZo9=!{j1S#0z*KktM-LA!0QV~M zJH>7AJ;IazTxfHx0+aEk@f%b#U9;42>_L#@qzWFptazAeV7BU1n$Eju)cP-XI`-0Y zbc&}5jw{Z}nL+N?qR3p9KjEZ_hx7y?$6V6D&OpbOq(M4rJyfev^RZt6pzckot!)h`py<2XE|d(U_7u&mgW$K|CjWE6-n46RCaKWl70 z67YD5NF=xTx8ZkigVRg*!$9C#BUQ2TH47nT80$(4IX9tF4D5|ka6SLrJx*9QZ-G&H zN@~4N;cm^zM#@~P|1)K8Op~jm_*@hgRf#MWe;e~7U#bjorW7b@Oxs6 z6{1?V|7H&j&5o`H|2Zto)yN@fx9{qUFmxSk#}V7NC6GsW2y|oiqM)ec_(V>q<<#x! z^I!*t_^4d|9Y^n`W7C?#Z25P-(_3cXFW2d`u79RKV(oJ6(K%Q+QqhAs;P0M1P>F8b*riCR_|0I$b87rIK*)TTf6u$qOjZgv-?fwj}mC!_u8L0=ic2b_R zZqKHGq1tlAE-^0EXjPi^svO}1DRYw2p!x49I3h=|*=SbiI5=wP@DIK~=A{4+AcN6! z#y=Xc9V^(~u+K1e031=Jd*VLiP2AKw=6*gT?)hi%=K*%7Z(QkBe>+-a`oT*X`^X z`&#ku1@f+2W;#2>91g;IeUFYp_-3dSBdzZVvi7a7aClFn-aCt#>7&%t(5owmxOu60 zv}fj@FWqHa)z*Uf4lkxY2+0JwGT7cZisy{xtn6q@W*|$l^~XFL(K}sGVTCjGtA4lY zfmGk_cN)l6GC?@l$G2h&IZ(;aQj@6@cI8saSzw2}vIa<6E#OAsmy7Eb{t9@*LS}KF zL)(QZAUn&!l9tMarIg$%hZQxyl@^^-MBrJ`d+<(W{&KnXr?zOsM;Bo4!4*4W3ntU@ zH8clN04*KkQ!7mLy_^ll6qstfbhE<(z~l{n`q1Up6Bp_cpr#@uO}7N`nXNEA3_Ihr ze_GE5d>9$gJ>9|fRA(%`zE4jc20;)PY7&XFMiOo#2e_L`8SV=`b-}QFobpI4z zIRi#-R|Lw{zx`&aMT3d_**am+dAo6V?Nlmi!1<5UlTAY*7&AK6oAo*dd_~Rgka83A zE$)QRD-1qu$;WTbcNV)n>*327*v_^e*LzY9PLay$I3af3i>tWw2AqKnN^YUbMhvH| zNduzEN5A1a3GG~ahQ@MQ6eZq{LO^WElt6G*ex~jEdHu#s?3EuUI8(Cs^Ab67N=d|& z{x`?!pb%yVx`=WJ$2ksw;Mbs+FG& zEQBQ5E;>%3N)MKguU>nL-~FY|)C}=IuY@Yer!r@=fG!XV$y3Wzpix<*bs5|J=irN1HPKZ z{W@&_L}dH>@t$b)M2q9j9i1EGWDp}hA!)v=2_Mcf&{W<5e%CQFg-S6_brpN8^xZYq zBMssJFt;mRPMTJOavPZwBEj1@ypTCVqO9 z?DZOGH@bo?vGZuUk-_V+WjFS8l85ch&SIvQ<8^{Iy?-3mLVLsSZ@+<;=l$&WVxs^Y zqbq*Sc})7F=TgeroJ`Jh4XX;cV4B6M*NDgHeV$WXgd@ec_%mp!75{GN^~c6&*|}OP z)UQWdEO<8Q$(f-9bf`Wvl`^l&@kG6`>8OfrN6-ql;9P;lMHpseo-w`4^&gL^&;{jz zsl=qG-z%ZQENb9ni$aUlq|YmiB1E+T)>78_CM05Sgvq4VXM!h8Vt5D3>Vjk_F@!(` zQJ%#TMPi1bg8#?#8D4cp#f`E3uGdexT&R?_E9nS7OqGLs$|H?Y7zze&K?U_d5B;#j zQfOkfKgu^Kn>?9(T~enzZuYJ}3GnOgZs+a>gP#u{_>i8g721W(uT^7(syrNk4HU7? zSJ4o71DcasaRg65XlH*(sj&LE3b65)Z?dP(E?!6Xp>~PHM#y(22!{w7OHzKhd0EcxytmB(58a zWTPJ$>5lZ_Jc))J$QzJfRMeC}`d#;yIbY!Bd;F5_Z$4g(sdtGAFoH>s2gZUHTPyZw z>z%DyYO`+@#1t8rzS)rGTCFVGfH%fk*T}2c_#uI@aEsmupGk^L?X+#(=$oLX@~RNk z>CwncyfVEJDID0D8~nf`vZ}N*d?8Q|e7={S)=p#yEwu)it2QGYN{YUM!_l!*26(^f zkkn7HMP)5=WOzDpdSdR}9^7$927wBH4fDnsi5%i5O1UmWr4v)K(?eD6XI848JEcOO ztYIbN`y7;@VYz0R^3vwS!Z)anYsD^Vx-F?x$GAU{y&`(3o^ZtsDYsAoO!l+axAg)s z6POZM!a_Xjl4L1A4D^pTSmE{YYU1-PIA1Ono064!EtEnvi9=ajmy}0I?!W z&TVM^UxW%7LB)@P>hHq;HN3%=Ty5rRxo08i4ZV)U`mTK5_t?t^3S>aT1BoyOUdy)9 z5V9XdT6i$=ma`&SCd8jdU%j+n9WkC`v8#YRU+wGl-y#^iG3YQRqdoNM3XY2O_VjAw zA7Qhm*R-=0{o1ZCAg0B)3tRsfagfbelSNNaTn^hQ1=jjn74@;8-_M@(@|``;MX}T+ z$tJSsF2E;*+Ww2C3{dnx6d#AFPA=p@B>)Jgfd-PYY4Lt9CV$no1Ag^Yh)3$t278(( z+!73k%u}sq#eT}kJq*_Er{3ZeZpm%+xqi*6&S*d(N)10?_O26pOT1Pb z90`w=P^4qXSX}EU+}QN^5o;8!8>g z4;4n^nwP5BIC6z~*_w8o{E1rC<{wioEyXB`h}9uI(YqZ)3A_6%brHA@4^f(a{Kb}o z|I#BywUo^;f+QFU;DNtANtHyn=ph`~1yB?PHu9yPMc7)(d5kWl|+yaABs}Ea(ZT#nxlqF5+>!X?vLPJdUg|^ zK2wCDI(cs^RArWG@yuO;EXOjg@qftZMtp|GH6}0%;p|mp=rLw z7@p(=)Ks8Y^f22JM-SYg!0hZSHmz7ZCSOGZ3P-gbdo6;`~#8 zXYaGk&!y_cuyAh9H?-1uP`0ru+Y|2#AzmQVEIv6a77|K>F;z!gl-N^e>+FrV~i|Hy9(v3*e08 zUwnH_N30At3g+iLlZ}1Aw%ClDt(`S92h==n*UWnJGt{@yK$k$pR3LDjPb6=;aQ>AO z2t;HW)?i0wyh0ym12;*I%{K_gJC-`uEZx_B5P7nJjmGbJ7_4#-iI1~iu?WJEuv{Qd z%K-R_d*=w^<(S~3e9#~MN@yl|___cI^d!HKgSLYt)l@jg%f}{bPKLNRo`6zmjL2}D zY2={vwJB7}}*Iqn$2^9hg4Mp^#Y_frP@K86A)wj2*w z6eJ*IIs>#eZ?@O*K9*A*5^ zg10-ve|>IM~(6&0{NC;08YABy(Q3LBj)?k5h?_t=g6r%;;_wBL>0fCJf5^@8269 zPL;<9BySsGLfg+U7;p3z(OgM;0U#FFvR!F~345m$!l3#!ueIKzPmnpCb8rOwbup2! z2j+r+URe5coks5CqItpgRAvUNY%iPZ!_^o{AQ?9J^W~T{*^>=8=z+j5qVXMp^tL@XI%W~EJ6(v`OISBvA@!M$J~40~jU%5agspN&SO`^; z@uHC?ix&2n$vb;^sE|VfD~_s7|Fl#`!cW>#Nwg;G@N$WZ_e(tcz+xaZ+MwWmr5qB$ z5|a(t9g9Y64C9VAI0PS?nCghd@VnW#Cpg3r&nTM^g7+PKO zdAZ;vcFW6?(OPkVt1U-PJiv?$CtElvSUd!*kTqgY)u9v>_MM{(9;>9pznQwj?riKw z0^+`|e8EgHim?3SZ3SKs)(tP+4nFmkHRVxroO}L{?|{_gp(bvlP;RmR_WF5I)h!a5 zy4WY0kZ`JtKL*bLVCnkI{BqQ#+862fOJsh|JVjW46-Tk(x`D#ptqVsv9x!rfy&%vL zVV3H7{S_Pn2i0_e7(qLln^5e#`q!jZ8$FO9SiE5H_s1z+)saeC%n$m(n%Ut{J=M0o z7rZAYF%M4`2mm0cjHB3hUmpj#@bS>3HI?I&(|YGlxxl&}Nqeyxl4&Y)uZBcOnSDP- zfu%zsRDTdWSAGAm94{JFzw5gHvZuhswfD>>Zk)LWNa-XF6Q@TdmX0R^l_KwFSJt5} zKx)IUf9xId{wqNkd5;?0%E~w+?-5s|lMZ`x4DNSg*{{$6NvV~N%#-rnpzZZ=t{=}N z9677&i%%G_N{Qh@pE6%<-RO2CuiWKjJx+*-t38^gSHYa@m6A(#lNQgPB}KLf*UVHy zm5*XllOf;8rVU_j@gKI>nZ!Z~R9kM9y<@4ScV-*e0l+!3#pODaHjqGxhlCDtWEiVx z?x$Ko3boCxE+#2Jg&Ef4(dD0xXF9Snr~F`Fi6yd?qCCt60Q{$qTmaR4*d$$L6K#p_ zsR$>{mBh*PzMs#e#c0{-_Dg%hFf*q6Hb92XNY2laTwQSSU<3@z)IYJ$#OOnOh4?w6h?r6mu| z$YGbxb(9;;>Rm6^f@S%z4UJpaOYaNP(aUq(e`kBso4b8`4irC!*TBFb)UJeq$hRoh zOkWW9i*33@?9vY%5HV4Q^hKta+Op6Krm;ftNzWifK{z3wb^ekI4w88 z>Y$E4FsXhtxS(uC#w@1r#qw4zrS9qgp9cq^M+qrWwY;3K&9_uNBB*-8T$C|$dfo1! zRp02QrT|wG_dbUvi#_mlM58=d!k_y>N!X1&!>;fpLMdbFcIwaGfdJy+4ck%^$%sSz z_OAfA7lxVh^_jp|z2D%{c(+E=PALQP^Yh(febXD%>?@bc{5O~u6$SHhO0mqqge=6z zUDLoRFuz;o=Z^a=ZSj^j$Mqi*uhY(hJSzvxQMn zld7S(EYs`3jW+7x97Ek4Ia#7w0=8+?jIJ(}G%s-@)PX>_8*vwdcELzjQRW^0pA-)1 zTtaWY=_=JW#ng7nS*-?3>@aA;yD8*=fvtdV6A8BZN8+^N_ZWu~w+dj;_*dnWdgHr( z8(FbZQ%8&ud-Cgg5AOR>TVCu|TK>Y_7x-0X%Ne5&D-tz`c^1cDsl7n%N{Nq|^8`nu*_QPJ(j&d7ZG8bc_Q(NzV=Phji$LNhP7MCLVS>y1OM z>|g1BSz7~^&7RtSD|tVtJ@d;aWa4bM`qp%z<%H!0yd{*9$xof?*WUz?OxCqMc)I)Ta|**(@8eM7-XeQF@7Gr4uz(L ze)xzn!~evzBnZl+5XW8=r^Rc!=33!%Li_KWHD<_7q!28$Fj!}IC;q7Db}@QOIEo8E zI5O&NY2nS{hAfIkS2UT9V(#g3`Z4$;hm%PX5xV}ga3S$0dav>puy*hd1{2I~(_RH} zm`uF&2Z#%;NgWR~9HR6#!tt_B8m_9R&C$W56kiQR;^sh>zw!MZx_5MY5baP6nAvTuBIZZ%vPv{ zlPa2(CUAe$^vAbRdvJLH1t&)+VMxa~#I-#%2MiN16{O^i>1*xpp9%5UUJL9VHI#3h zx`4ANd?10d$rD2Z0N>m+&686q;?~X#r6#DC70!2JRm46?itdtoy0;1ew zavt|Fh|Em90GK*HfE1nPNAt4s;i)!V0n|GX52^g)8)bUxl3$^Fp|0Vzr*SHctTTAt>*Ibks|>B+UH`t4HVq(Vw3mxb(I4DZOvec>scR()x; zj?&(ulDjR5C?hFj(TDee)ms6jZ&EV)+~R%Q&7P93xJZBy@C1FXn-X|DKT>_a@|B=q3vOr_$GNw{cZFe$uzHzyGs?s=3(}$4R7VL|} zbv?e-f3OLgs~2*oRNGor%XTy~&i&8=n@6ro?zTo&b;d5ZUm(mdp z@l&JEZAI2!bLn~N>~m%XG90XS-kA(Sh$>r{j3Z*6|Mu%}rX^+KHn-0eGJC8YWFhkQ;X3NZ#=??VI zyjwSMKAE0HO@ThOj8<16*Tm==OVq^Y|QjI-6zH&lPnw`kHV;LO2|gnf@~K;4X-3(A>x=X zBpA&AK)2x+d?mYA=fEe>xIlhgjw*4AEw?{>OSbBcJX&;Dw8H-q6HOzF1Y{2AYN1Ki z^3=lCKL&V5cfV1W!@!2O9CO9b^b2-lkYCBEcC1lUTu(B%O00%@l9s-U2YHfcs+oP$ z_!48=F5G=7*dk=1 zPgd3*O!?m~sC6;!nL`U!(w#EW*t86d=eF_8oWdAKA+YknztE zAMchD^V5yufkosdN_9FVH17m;LRQyQh^&kQ3<_1j1&h;`z?!owZ||k9W55jX%Bi=7 zKeyflaphmvDRG^NeL27oupSC$8EnEKQn`qLU+(3)-HSH|R(}SuZ3I0f8`0`y z3b*nL=}HuM5-Qu0(*$ng%7TMENq@+=HG@Tz>Dk)9)e5?o+d1F3IQw0sQ^l!KjNTy> z?NcPx@x;PotY*qPEvEFg`dW3f@>Rf#vacdxwH&ZKIF=Mu%3TT2XSARSW3&WsZgxm8 zBdlyN4zwu2?2xMbK2 z2fOQ#E!=ho;wHy7qbcq4VcX-!TzVzDCrH0Jbae&?VdDL3EHvw;L+TVi@ZK*lKbP`w z9$%1N72=X6D;)Qk4|j(sp0#a~Nnm zS9YIp`8?FvxI%s1GzUHqoidl+EnqY{*4)QyGL z5=f&<@qWz?cNLp(J^^W2vCvuHj8YwcPNp1q<0rg8?%YC)+3)Y#Zb~GM;5{DDveE%u zR2~i@84p~-WUUw1im*2*H7-A2Y>$PGRIE*bZe;P`Sm=|$YdBzoH0v~XvMNn-zY#Fs z?#gElrJ4NvTx;#J)7YUho-1|jB8&x6`{;~P zCVpk;AsRbt;91R6v}J|Wn{>*`sscf>PK|vzY%bcXDrb# z^`+4zDHUNLYbE~K!^LxUW8dUqY6I{dtfNr6UF0TE&5y#EIN3A&6N-8FcUS&}LMM-l zN_Iv3u^-upMZ{kRa+O{N|1rk8HSaq;udBo15`vr=-T>2L@_@XS10LT#~lxaMDlA zDKe5VE^3B@FjC|z4L72*Z}~~fGTwx}kYj5(c0a2|Fd!RN9q@-sUw@$tmk^T){~!Vf zw&|4F+7v?v7APA0Zh3Y$I|gE6NhWlC2w14-4NbmiQGFnHJ-h#|MYu6!Q`ES>owdBh z&Mu-xef6R3bfxGj01_WYhk^il$3L|?wlXDI>t({m-CAAiMjU(Dk`PC z3C%vsn8i(ayei7~xGENDk2ghqayjv`%8ph}MxOU%Zyq$qwpcg#U3Gq`4fjiX7{b6> z*B4pG9{O{K`JNVmts3}J?T(6bsaghJy z#AGFhnFU(jz=f=y7r?}F%u2H4?PK3_fDFl9ks!Q4K@fx&pek<24+arj%^G`LAMJ`l zunLg{kx5*mH-We{5CXXFbKlvTB}&v6=F*+=9~~TFVhb~ z!sC+DK5gKerYey+E2*MO20zAz_-saC>Nwxw%+#vGVLdw$JJ;zYwyG(XypK+tz1!E? zl*59fIw`M23OoHdd?-~}O|&iHg>^TmmJ9nfUTA4;uA7`Kmj>L^z6eeo;3`o21XAY# NB{_B33Te~e{{g9T+uQ&E literal 0 HcmV?d00001 diff --git a/IFixTests/IFixTests.csproj b/IFixTests/IFixTests.csproj index 81653f8..598d0ed 100644 --- a/IFixTests/IFixTests.csproj +++ b/IFixTests/IFixTests.csproj @@ -1,6 +1,6 @@  - net5.0 + net8.0 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages @@ -23,10 +23,13 @@ - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/IntegrationTest/IntegrationTest.csproj b/IntegrationTest/IntegrationTest.csproj index 8bd27ef..24d1c35 100644 --- a/IntegrationTest/IntegrationTest.csproj +++ b/IntegrationTest/IntegrationTest.csproj @@ -1,6 +1,6 @@  - net5.0 + net8.0 IntegrationTest IntegrationTest Copyright © 2014 Terje Sandstrom @@ -20,9 +20,12 @@ - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/IntegrationTest/VerifyProcess.cs b/IntegrationTest/VerifyProcess.cs index 2c8f938..f6842f2 100644 --- a/IntegrationTest/VerifyProcess.cs +++ b/IntegrationTest/VerifyProcess.cs @@ -100,7 +100,7 @@ public void VerifyCopyingTargetPathsToConfig() var sut = new RemoveOldNugetRestore(Command); var configlinesBefore = File.ReadAllLines(path + "/.nuget/nuget.config"); var outlines = sut.CheckAndCopyNugetPaths(file); - Assert.IsNotNull(outlines,"Didnt find anything"); + Assert.That(outlines,Is.Not.Null,"Didnt find anything"); Assert.That(outlines.Lines.Count(),Is.EqualTo(configlinesBefore.Count()+4), "Number of new lines incorrect"); } @@ -116,7 +116,7 @@ public void VerifyNotCopyingTargetPathsToConfigWhenOnlyComments() var sut = new RemoveOldNugetRestore(Command); var configlinesBefore = File.ReadAllLines(path + "/.nuget/nuget.config"); var outlines = sut.CheckAndCopyNugetPaths(file); - Assert.IsNull(outlines); + Assert.That(outlines,Is.Null); } diff --git a/RestoreTests/RestoreTests.csproj b/RestoreTests/RestoreTests.csproj index 2100a85..0b4149d 100644 --- a/RestoreTests/RestoreTests.csproj +++ b/RestoreTests/RestoreTests.csproj @@ -1,6 +1,6 @@  - net5.0 + net8.0 RestoreTests RestoreTests Copyright © 2014 @@ -20,9 +20,12 @@ - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..33872673a9113e1fbea48fcc3b43c030ad520958 GIT binary patch literal 3201 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 H@=5zAI(NZl literal 0 HcmV?d00001