From 6bb6c92416c7b4f39b39eafcf1ca439ed6ca30f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Pluci=C5=84ski?= Date: Sat, 6 Aug 2022 18:51:18 +0200 Subject: [PATCH] Upgrade to cake 2 --- ReleaseNotes.md | 3 +++ nuspec/Cake.IIS.nuspec | 18 +++++++++--------- src/Cake.IIS.Tests/Cake.IIS.Tests.csproj | 18 +++++++++--------- src/Cake.IIS.Tests/Test/Iron/web.config | 3 +++ src/Cake.IIS.Tests/Test/Man/web.config | 3 +++ src/Cake.IIS.Tests/Test/Stark/web.config | 3 +++ src/Cake.IIS.Tests/Test/Tony/web.config | 3 +++ src/Cake.IIS.Tests/Utils/CakeHelper.cs | 6 +++--- src/Cake.IIS/Cake.IIS.csproj | 10 +++++++--- src/Cake.IIS/cake-contrib-addin-small.png | Bin 0 -> 3904 bytes 10 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 src/Cake.IIS/cake-contrib-addin-small.png diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 593dd95..f80eebf 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,3 +1,6 @@ +### New in 2.0.0 +* [Improvement] Update to Cake.Core v2.0.0 + ### New in 1.0.0 (Released 2021/04/25) * [Improvement] Update to Cake.Core v1.0.0 diff --git a/nuspec/Cake.IIS.nuspec b/nuspec/Cake.IIS.nuspec index 3703196..c57908f 100644 --- a/nuspec/Cake.IIS.nuspec +++ b/nuspec/Cake.IIS.nuspec @@ -22,20 +22,20 @@ - - - - - - - - - + + + + + + + + + diff --git a/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj b/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj index fd4dee2..057f64e 100644 --- a/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj +++ b/src/Cake.IIS.Tests/Cake.IIS.Tests.csproj @@ -5,7 +5,7 @@ Cake.IIS.Tests Library - net461;netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 false false @@ -19,21 +19,21 @@ - + - - + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/src/Cake.IIS.Tests/Test/Iron/web.config b/src/Cake.IIS.Tests/Test/Iron/web.config index bbb529c..16ed325 100644 --- a/src/Cake.IIS.Tests/Test/Iron/web.config +++ b/src/Cake.IIS.Tests/Test/Iron/web.config @@ -1,3 +1,6 @@ + + + \ No newline at end of file diff --git a/src/Cake.IIS.Tests/Test/Man/web.config b/src/Cake.IIS.Tests/Test/Man/web.config index bbb529c..6c93c7e 100644 --- a/src/Cake.IIS.Tests/Test/Man/web.config +++ b/src/Cake.IIS.Tests/Test/Man/web.config @@ -1,3 +1,6 @@ + + + \ No newline at end of file diff --git a/src/Cake.IIS.Tests/Test/Stark/web.config b/src/Cake.IIS.Tests/Test/Stark/web.config index bbb529c..6c93c7e 100644 --- a/src/Cake.IIS.Tests/Test/Stark/web.config +++ b/src/Cake.IIS.Tests/Test/Stark/web.config @@ -1,3 +1,6 @@ + + + \ No newline at end of file diff --git a/src/Cake.IIS.Tests/Test/Tony/web.config b/src/Cake.IIS.Tests/Test/Tony/web.config index bbb529c..16ed325 100644 --- a/src/Cake.IIS.Tests/Test/Tony/web.config +++ b/src/Cake.IIS.Tests/Test/Tony/web.config @@ -1,3 +1,6 @@ + + + \ No newline at end of file diff --git a/src/Cake.IIS.Tests/Utils/CakeHelper.cs b/src/Cake.IIS.Tests/Utils/CakeHelper.cs index 1375e0f..ec40f4b 100644 --- a/src/Cake.IIS.Tests/Utils/CakeHelper.cs +++ b/src/Cake.IIS.Tests/Utils/CakeHelper.cs @@ -426,12 +426,12 @@ public static ConfigurationElement GetWebFarm(string name) public static void CreateWebConfig(IDirectorySettings settings) { -#if NET461 - var framework = "net461"; -#elif NETCOREAPP3_1 +#if NETCOREAPP3_1 var framework = "netcoreapp3.1"; #elif NET5_0 var framework = "net5.0"; +#elif NET6_0 + var framework = "net6.0"; #endif var folder = Directory.GetCurrentDirectory().Replace("\\", "/").Replace($"/bin/Debug/{framework}", "/") + settings.PhysicalDirectory.FullPath; diff --git a/src/Cake.IIS/Cake.IIS.csproj b/src/Cake.IIS/Cake.IIS.csproj index 5a8ea4b..291a1c7 100644 --- a/src/Cake.IIS/Cake.IIS.csproj +++ b/src/Cake.IIS/Cake.IIS.csproj @@ -4,8 +4,8 @@ Cake.IIS Cake.IIS Library - - net461;netstandard2.0;net5.0 + cake-contrib-addin-small.png + netcoreapp3.1;net5.0;net6.0 true @@ -19,7 +19,11 @@ - + + + + + diff --git a/src/Cake.IIS/cake-contrib-addin-small.png b/src/Cake.IIS/cake-contrib-addin-small.png new file mode 100644 index 0000000000000000000000000000000000000000..fb97eedd14dd71aaccd88593bb33d9ffe986f9b3 GIT binary patch literal 3904 zcmV-G55Mq%(u^i^t0abZe3Hq?i2%3Dc{zaB>HM4b zKfuyn-SI4Xj~|QY`J|GOl>m}GZ!mOH%ir_xWBAPVUx{Bkd#WFYcE9q8CL3`*ASV6hwd=8UM@!1}SAP2>4!_z8RaUX(xfkQ< zw`^FA(|x@#+wD*yGUSK^B@+3&R7SQ@;AZ;s)qB35a-sLVPCWkO&Foy2W!Cbs?orp& zjB`VSD6XzS<&p*rb{>Ui=rklTd^G?%e)IYIioZyrNa{KWz?Y>Q9dkt(pXmbieZgqD zu5zIZE7z@0x$g6N02QcOx(vKv#FJZo7{Augyb6(U7^8h3vi}z}uf+WGSFm%tvjmG8 zmO>K6H2}T~;AMkgd|flLnT~O{%jtEyoKI;(@!S&Nb~&l#k3}TWR^PNT3RhGKAbryu`Wei1H##_z^Ckcvx?Rp~b4CEMOcE6;*4pU*<*S-9-mF5! zo#evpcIC|({JUvdv z{uVs*+BR%{;3}4`1kc3tP~+&7Fe96w9|frO9U8lFR95)Y-uV0@TM-TfX`sjO2i+J( zH&j)@q-O#<9@~Z@rxVuFQdrB%VGsn!lEhkHkMhN}813uBFE`(f|9Q0)2)z$A_zwGp z5s)S^`RlW)Jx#(wG= z;{*LLS*;lCe3z*p?ekR?o$Vue7hWh`5j(vr@0&Gb^aB#$I{=6$6OuOFdOMT+(DCjqnE+=r zV(|EJ7>!2MG&Z4nd1kvrl_%wJ90!v{z<)h& z7p2;d*+ABa(4Shnag|#$fJ6c*!L*3|TkGh@Gk;u%XSa9ZkI(la91x*eZTRpnhf!Qz zjq2r%DVCo=Eg!4=gO6N>;SmnIc68v)Kc9i$C&6hGFt5afD=sX@&`1b>?e~MXR8Ct? z&4;1M+bS)ogCbXL1D>7J-ItYsqwS;U?TMhSUYAwuPssC?e_w`8|5As?A9)Y2?HQyg z0(=t_=zHrh>Mz@n^2~}Q4a_)}l^byPH}SY6R_86CVEQ8`-kKW;f!Vdskum@2|kcYvw@?1tEpP z30`0f<>xJCw!t?R#+s%QY}!!8eiv00B~(5eXxJu@^G0)q(l2zN_{x{q!OlPZGF@9h zY{03$03Lm~E2lzL)mZW4ht|MmGiLMxsaurS)*%ovFu4~D-VDpqTUdpS zm6xSFh0^F6x%M=_(Yi@~1XxTwR@7S2^1_K}Nr=b-y1G>S;%6PW{wvV%RQzC~H1)?MWp7wx>KJmlu&V2}Hu!uovI^$yyi%8KYxHbheLT z_s(O?RuHU30&2=ksHwB#t-nr!20`)@$V1d4rUG(>10gvt=@$ZW@yB;vQ0jI$DKz)J zya>>f@Xp~8-1xZ`*d0ck9SX2CGGNVh4)&|B$cn{QwDX3K`UTdMR;2t!1II>%Sae8_ zmaNGixUA}p@`NK~MTp4e&3St@`4P3HL+Et>3*3c`Nh$EE_s zKS2FIB|UEfV#wQSQ@`Q(j4Gh{1F68{j}%&@Y2klov;J~Cc2F<@Mj^jjNd-zoLdfe$ zs{$G!Xnt^{%aiv0bf8uh`(MhMFWmb)1y1xy`(h^r6Ht%`r>ZPmo=yc|(V?Z745=9L zh&eq@@%Ll$;LR*>N@S$GPV&Nk>%=*1r%;sldxrU@J=ufsqO* zjNZ{biAx%t=sz38&`3Drn`B>fQbw^sI>_5IX!8Skyc5#dgXwO&Pru3(UmK)FP-E5l zjkZgE&K?#Sdl%A~{V28x?9jvOkEEn!0_FAU`!&b07$VK{ZRPV)?vjE51U(+a%Ebv5 z@KzTLB~9S?si`$*bU+m+Shze7Jl!_nNthHR)IyB}FuDK6=(!waJ{XoED~SuJlB7ab zqVc_Z?puv@pQ^#*+m2yxOFwqJdUZVC(IX?+djAo$?s2pKeUlP?x%DUxynY%l?Y|a# zT2A4guUQD6FM_XraX)tc-<5dir=8fh$HNRJZ>fkzrc{}=Xfl-Wc&=5a(Do1720SV2 z2nhrzfz#jwYm{MwnH3@;D=;O+Gz6UwP}dNhlh-#CW3QIh+wEbM-}JBbxa!*I{QLvW zxPAThMn(W5StHhN7f|2eVCOWgrcoin0;qYJs9G(wPlrWI3u*oRsZ5Kji8@vj9TCo8 zVXB~*C9f+Br#q+VFGX=GYpn6K-V+`?`(zg*pju1s?ux$O{rU5zUZ-1{zu>~D_&+ZQ z;3NrZcm$k~7^cqzEiArGJ95Uf6m!OC>xxoR)K)8Zto3_Ncu>DILr8tP=WD;z1uj^f zxBx;bP}K<3NHCxJ-z$Oc3rQ&o}V=y{dax}8TxnRMxhLDupp(`>*{HF|nZ zcoP(Wm`)o))7GRr#?@ptd0^AkyV7mm};`m8QR|-PMc2a zj!_k)U!I!{WGBF225&BBo@_{zS> zR^aR3imp`*4MmsN8fMS?1&pOG;V zimIS;yru>P)$^_B>GEOE9v{vOiKup!vb;+gig4Za^U%@m$L?36%i2qpIa&VS{ObLb zXZySo+TS|I&Z$c!yq8qK^H9XG#LCmuR*5Sh^`SW;VV9WO8{E@6xysdENHw8fJ^F0>R1fj7?sXDVh+ni3ph`wujvczC%Y z*`K`$s{Cg)JO$PFk7HuKl%ML-9VXbt1KCo|HwrRY<=#^?9mxLC`RW$dlYc4QrUyiz6PFjUv8+FJdv@E+V?fii%9`gistF?sp+Xg%ZZ+b2i zvq?aS=9@3jr)zt27^tHFea zlhu#}viLuzIR3}^3EiB2J+6Isc)2!@pkqSY!rGB-3+qRPf9%ia0sIZc!=c?RUq>AP O0000