From 2a1d365ee0d719899f7b94a113688ca00416252d Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Tue, 25 Apr 2017 13:40:43 -0400 Subject: [PATCH] Updating nuget package versions to v2 (RTM) --- Jabberwocky.Library.nuspec | 32 ++++---- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Jabberwocky.Extras.Polly.Sc.csproj | 1 + .../Packages/Jabberwocky Extras Polly Sc.zip | Bin 18753 -> 17977 bytes .../Mvc/GetRenderer/AddPageEditorWrapper.cs | 26 +++--- .../Properties/AssemblyInfo.cs | 2 +- .../Renderer/BaseRendererDecorator.cs | 16 ++++ .../CircuitBreakerRendererDecorator.cs | 74 +++++++++--------- .../ErrorHandlingRendererDecorator.cs | 45 ++++++----- .../Renderer/PageEditorRendererDecorator.cs | 61 ++++++--------- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- tools/Nuget/nuget.bat | 6 +- 25 files changed, 149 insertions(+), 144 deletions(-) create mode 100644 src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs diff --git a/Jabberwocky.Library.nuspec b/Jabberwocky.Library.nuspec index a196310..b53ced8 100644 --- a/Jabberwocky.Library.nuspec +++ b/Jabberwocky.Library.nuspec @@ -14,22 +14,22 @@ Jabberwocky.Library, metapackage, Velir, Jabberwocky, Library - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs index 01097a7..02ce6f3 100644 --- a/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwock.Extras.NewRelic.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs index 2f463cd..53841c3 100644 --- a/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Autofac.Extras.Log4Net.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs index 16b0fa1..9cfd0d2 100644 --- a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs index 184ef3c..d97978d 100644 --- a/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Autofac.Extras.MiniProfiler/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Autofac.Extras.MiniProfiler.Sc")] \ No newline at end of file diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj b/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj index 4e85204..4c7fc7d 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Jabberwocky.Extras.Polly.Sc.csproj @@ -74,6 +74,7 @@ + diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Packages/Jabberwocky Extras Polly Sc.zip b/src/Extras/Jabberwocky.Extras.Polly.Sc/Packages/Jabberwocky Extras Polly Sc.zip index 16176652181e8571bdff9c9048fea9741a7672f7..aa514d670825d27ee577c95afceb5782227bb945 100644 GIT binary patch literal 17977 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⁡o8j) z^{kR;P=*09roN`48g1pZ*k)N@fl8oi*;fE|qmy)hlWFb+gQt@?9g!il0JTt^Z$j{- zv;&Od1-l9JBzIYmIO=RtP<1EoQx_SytZX$+Mtln87~Gn=V?$4(r@=hlA<7Nm-OrO4 zvteVPF+{3moy0G7LN2M`I3B*BXWXLoZ|Lc0+*E9D`Wff`3uTJ{9WnNvFFwOX?ADOa zb`P7OMnUWgdgAUd8RWtQLfZ8n(aiae*2Qw9Xud7&MJ58B>Z(CzMJDCv4N*AW6HN}u znVDxbc+dZlZ@x9_n;{$>c6`YylgDm#VUVIzq#WcuY;QabxipaylMTU!i`kU>4f6f0u%=|wHM!5}b?xl|?GD~2fd?8oE6bfN^Gp*B zgV(QJ`T1ZpKOve4zqSkWI;9z>OIkHR`|=7J%0pgTyXFS%p_(1umAYM-qSU;sI5Qq^ z73lAZat1w=x3xn#y#Ue;vHM*bVJIok$@~XxK=kFfxd|Id*4?#cTt;>OEct8g2rJK@V(z7Ko80}V1h7Tg6-gOG>P zNt3Es*1h#~r{CFoNBcDy6U*vuq}GPlC@G_!#t!tRA*1iQ30R5)Z6N2yNtIrywR<_& z%4k#woPW)Thf8YfW0Bnf`MscghO)-ya9k~Z%2yM5v%WY65*?9pqI~k~mcWx|H4nF& zKe6Y`t8R^y7xv74Vb9|K6ZVwUu`sgNF?#8N46Fj|02V$L8bN?CGYx=6Sb&C)9Ux4@ z#460j!otqZz#`1|FCEo7I(KS!a=-7h`+_~J`t0vwpIk-4H+=y`SuT+foSfT3Nldm= zR|Xp9hWm_VdJDry=30K`Lj>YV?iu#xb4sg?cN`0g_=b*osKiNFVQeT0A2 zIy?9E=sCGgI!)cko!SrY%F;}i)41dT1x_@Q)D9QIaTC zeh1YPyc;)1;yiQOt84z)>=}Y{JovEcaBo*NElhb7=8Ff;2S?lQpX5T5Bs%?S-p&Z_ z@EGWr>PLXG>~)4TO1d7L2;Y2r_oosgF!8(kP2{Zozh=&Vx7sumhb=UJYMnXIk>tUz z!JYWz*5J_6T8$p^^fF^Gq?4tR$@a4&02TBiX`MIoxa$&`R8axjFT}Y%QqV^i;pzF{ z=6W-;zD-x3aNoRL5MY_tT%DNvW$d+t6XT|6Z6C56&Fibjr=#sY8J@?hn~C3PopgWG zI`HuHzHIChp!(?MX|+#AOY3j6iLN84 zw~jQntfQAz_;}~l12+0M+9buz#RdObcX|2Ow7L72v^o4r$|a$dUW(#oAfGHuLDPZa zrbe!HQh{}*+CeM~gxIkJ2rDYL_zP_|dQ9#&yJE(OaKKPI2f32;L8Wh!+9Qx>CqM$b#RFQbFk69kNAtm#zZW|FrJPRl zVXzz$w`e9an>K^42;~cWZWrman_NGBYr%P;Hf_ zIpbvhCvO(ziXX9o<@lF*mm#)r0yL(YYE{A>b4K(Jxk}U#*U;pB%b$TRfmZw{yor`oOmw&`YxLPq+<()=sh3UzgPCs! z%%B*={aR0zXyYBbl=dX|GNfe5x42XVI^SfLGT+J$7W$}lyno7@u9?N_aQ{Kx{6t5( zN&FO#*}!Ud&MjM8&Il94l|@v_Np3bD`fdjYbX_f1i?O?Eh@5~3 z>qgAmdu)y3#=sWqO8IY6C;Q)|&f&jHoj8e1D5vunW_mLw(hA5bO5p3f;%dc*R;$XC zfgxI?wlQLs=Uw6{+ADKm@eyv-tlv)_kzw#_raHSN{$1Q;tV{ZLaI^R9FQm@R+G@C| zdfbTgRLnp`Qfo#%RPlg^H?MqIqOkY*MaWrWi1CzAXKQTv7KsBQ@b$v>Z4Yn5!`0R4 zbKS2d)(;Np^7KUJ$fECh_9&0JRTip(N};+P+!*uU9ehRaK@*C_M0xTYymoy4Q-YL* z4*Gli3vVXB@Mix132!RA+{jD!V*~Ip3kxvQFbfIr(*XEc1ZenKnV4vV80q<#_yG)p z0z!Xa%{h}rUgU=t)->GSY3wjfWFm}=3_zxL4K>#}_EuzJA%0Gub}>ll>F2*7g2~S> zZfY{3ZOXDpKGap%Hb1zV5?}>nRfIIpvua_wD{8Zay^FZ zWDD_m0-UfVKcFK(gXiGR{&2g@u+;nrb0H<*3j(@Iz4^KFy+HlKH#KR3JwwlSEMtQ^ z)ADAQc8iq9?1}}<5Wa+sFg`0%E8Y=CWwh52swy?C)M(PhR0H~jHGK5t?5H<>xWL4l zX-!Q$F{A=ZCUrvRpN=|l>>nLaJTj`sEp{4FW%8f zprpd5eP4Os=`p}keLWX+wZE*?iYPDgi|LWg@MldLtg0%}&}y%+xIe1g^xxuGzEmO`o5ka1k z?mH}(8b$3R!;RIww6?iX)aj-i96!Q(@^R_7l8Ld%o`AcRJO99D-D<-1rcQB^A#X^g#E{WmIvm4!1X9E;;i zr#Kh6C(^N=nJg*gfpbn|T2EkqtgKY84m!49F|+Fb8Z-Z$BKs$Z$>dt_G|w<921gbn zMJhA><^6a|7hdhByB~;2v>W{cF&`g!{_dxr|J_foXPi}ak}$uQeE((Qpf+D>Zf~R7 zZQ=U9`Q?8fA1eAXERpJEt{q=+F(bqC@j~|KSkpo)4%$szfe;Tw&$Bo>;cwlw9{IaK9pEgTX{hFU7Bd z=H=w@4=?>K@7E=hWH5QO>&Di3D}2jztyVKY@akAS2z@?wQ1ccpR~3Nlv-7>YjTZ zqZaNAck&ePF#e8Zuk8=TPU%itbtH66$bHN+QpvdnLsLFhIMf#JN}P4594MBmM~c56 zVHrs-BeaWiYL8pADMbw~q_f&5fq)|j5c^N$h5x2#whU+G&`5ER^7>M~yklh!z*9OL z(N+|I!{+<?a8du0?jG%sHuufBT|`25*j8lQzVIb_$|u(=Uy=~ zD>6HPB1LWdsmooWypA%jGRhAx9h?Y}3jeH2?IM4y(UfZ16qct>#7o4~OOts5hlPFq zkBEt9)j9XdSu}KT*M3%AP1?SDn!UT@z{)1f3ZZCl=F%MMhnfDdBi_qd<{NfPK~{3@ zh(i*Oo53s!)0b5Yy+m7-PeCEoq2s{2&BND^qhJWMsifd)P6X0Ni3APobe1DN)bhVb znzCZ1pggYw$PL5Y4_^aP;o*X@f}7Bnt2rAoIVIN1xoG1)^y7+{ zvy@b6m3DDnypGP2o<$Lm0e+(&TbDOEcY&kB z><`Et;7yMLrkd)aBr>j!*E$_eB#crFJAQ;<&!SeSuUzgwa+5chO{%)eCybtX z>>&x~oBFN*CUm~9*$X(;7;U@fC;QV(_uEGvo4L81{SAs;jz7~QwH<`yttjzF{)(U6C#bnw|km%}_)^CDl zC#Bl&1Wot<20`=wzba_vT?A=BPs>o;2=4k8h4ZFE`Bn{A+3YsadvuDGmDV7ygP@?{ zGOo5&PW#1r3r&{5!Sioi)f^sRV=oN#kF0}5pL!Y$OBib3Q_cETt^vA|`ibs)dqp~? zp~K(Y>b4-akNLnMaNeU#qhf(fa{=FmnAjgc&sfv)1cONofO3VGM-ZaN&J56gSh0BT zVxvjKk=WB8Dn`o93C!wX=>{SN}BC{W*kNXCNb z=i!%DN6*Y4%py!r!^X_YP6H795r$_JW~5;h65?kOVrOPyW&Xo7$e_srFWMt|*5jAt zYxr4z=elN#CQ3i;xftc1_|Q^c-*M05IMg{}DU(8s=)^v*2v@_c;mB*D=J{=*+uFH} zH8r)Kw&T0%hLMpF8_sZh^C+#}HXljnjNbX&W=+)u3SU3w#FPJ9Z9(BQFqB)txi|6ow1R_lmV z!ucU`q1tKav1)f-NGy_nnb4sG)F{7wt**aWN(E2R-9ihCBgyAu@F%%&kop`vX>8eY zm1xC}v|%>W?!Au<-im_J!Dq*U476V(Y}k3wx!OEJR+IZeWZCO`yc z@?+67#Of`@42xdgdI74Yn@nHjDh|b;&lN2o8T*?rp>9ewFElG<5C(DQ)I{R=2$0YOwS_bYmHIm*l#`%PW8*bN2bOuK+8RVtX@eYQTE%JNUPL+4Fn4>@ z9XIQYewYR+-rFSVC?}gz2!UGRxOj2`C*;_tsU6StlHiD&RN1bIHO|54cntR%2q|8w z4l#@lWSKZd0*ye-hx4R|+_CH?eFzI$R$|sj**jJL-~`KF_##RPM^N}2E$=-y2p0^p11{+ zgfMeBA6J)Uxqgu6kA)-VN{z|&D?eub@9^V)sfK>yVk5%eaZ&##E*>t2wx}r@RtGBD3PnX990ToCQNLm(z&rc_t`-huPN4LA{*U@S) zL8-#~$xfSTP>>|^t^?Dgt#O3cj_urTPq&0fJS*JG+$$^Y&8=?EPlxAyFAc-y{_3Ic zxKGCBe)sg0g4ty#h%kd-LI9sx4ELp$!ek<(j(-L)?=J2KE!$T#+qhTS+#Zhd6>{X( z5*sjb$o6r9oXkRzU5riaw-ri%l_g>PLLP5U>Ujn^F^dt8 z-bC+>#^Z$-aBHKiMquD4%9wdS=4B?3)yn)kaccYwn!5)Lb?s`0c=Hz8V#t0hq0@ zWrwjVj)wOW{TALwmn&9G-gH`5on(2d!Cz&`hWSFxy`Lty7vHZYIQfySYwaq>^80_w z1c&gZ?ppYqAOwDyQBU{frwI4;Q>!Z?2PymYHnuHy8Yv=C57w?fVa!k*~jh z@-~JqL|T$Z(O_rt=ED5itm@RUJoL|*al185E_PNOkVb?XmB-fXt%xb6gGCmW ziRAD@h-5R+Gm%Yh8Y_mCe&3&)VP{|07WA`!x(0msd^JaV9#8?#shiKXs0(jPt4nV! z7ca*l)!w3!O{kjL={KRT4L8!=k3RvJ}Sh&}~hl~I9REQ6cxS1%7yY4QN@pt*lO|SyK@&dzQ5eQw+lP|fh5pS?O zwQx(T{k}1<^{kwMUHe-szbc;oNJ?Bq_A`IkVfc>kNB;87V>Gs=u$-Hh_IEN!DB%#9 zPP&xt%D%IZxUTu>Vpx-Ylyt)eOyYZz?nL2+-61FWS_51 zI9RXb=jF`<;QHkG)E^j=Qs6`8TPnv%XB{1KHs59(Ah5ad2=c!&w?8?Nzw4oe*e^hH z%eL$KAVMSq-Zi`RGk@9sJy%gtHPG4%Iv648clk>wVjI_ahri`7`)|}#&ZDtspI}*t zOWDG#3>m++Rh^<#GW+C+{>Wci)_mvh{^sF(2?6D0kECYwS0*@lMVv-q+mh48MhmYU zeNYT`iY&(lCOc70(2z1F2Y+J{{AxpTM}8XIulY;$4AT)uyNxv;;=|7w1V)ygF^Sm4OA(Z=#8yy^YS#*#j{PqL))xTIk!-x$?2Gu?zAu@zF3burtsASXcox{QNH+ zk%ftkfl)wMn2A}K@vkxR+`|h$F(6-mN~oFA@6E!x;Jf(HcL6^+(v;*UN5=ChZQDl} z&V@Q_)m(B{42%RUVr1>I_8C&IRaNxmn}+Py-9)o$G~*Af(ejiHSl}$A_SKy$PhfPv zpEgt4lrahoOXvJPDUU1;cfyS#yC{nxzs6XlWx$Z`?-v`cH0`Az`RT;Ri&&jM58lz& zcF(7G^%0nuO6Rm~)Mn+hb62%r->4Or8d=>?v5=zY{z=$Y4Fjo>Q1-eww~+W4>H0EI zX3O(SdH?l7HQS`S#k1%IrBK0`-xR?ko4hwlC^)J=*(TsL=*@oq$PIT}2lU5S`qMZQ z+INqNnlv(*-M5;d&8Qai{Wb}dCls*Aabnt^vUy2j#&IZOldWXNawZGF2L!1@T?Bz& z)=V1NR$IL1S!lz)8g^<{9~xQ4)aHjz-G{}?gNKkHxIP{uMpu_mmFt}d@#5wIOmK5&ZtpWk zb&1cGu|iiV%p%F72&uoa7hRwpOM`XHe75|abVgJ00Ws5hFI zqbi6(qUT9-xAKr27^EdDJSF6D?8G>r6CSP$jRooS<*hPK;xvmk>=fMdxybEUHcX@7 z&ijvM#WwIzDTi)gdVn%$I)21y;8&BC&!4i9b z0JQgvOaq-~z9n0}LhCJ}XN`Q_Gz9n~>;VfcjcSe&6>PhlW+At}%94F&Q&;L7g`QKe_{{Wmn^-1{oRt3-BfKxKPG=y7TD@$bJ1vqM@y#QzX^KC^z zUqu8VVf!M%)6>mwz`5ESmSw6aQEMzloi>pg6*DRK^{olqoweun{`z*t^XbodpWCOS zg~QFkbIT0EpC0(ac}DwwUqoY7-No+u3fn1JKky_cU-<4qS&*Bn?q%)n?bZIoFASUBsjmrQ_ou4`S_E1aGM;WfXfxB~k0$sFZO%M% zAFKajg6}Z?MdH$z`;UoBsb3S9(q1Al(Zh8LcG(;ajcV>R6=8$%ZPCZ)2-)$%KgNBy zevJDN5XF6_VZnZ}zCpI;ma0aIdmLO#T2!62yB;vuRMTsSHU$W&uZO)u?-+O?Rk zHh1S*n%-N~2N6jRnv+N_n~bGVrH`z@vuvvEk|U)zx_}C;D;PuHLDKssmuKW@nxnQVI9Rw9l66G;Jn4(S`-H6evaT{i3FMLpbZE63qu2$XCTT&-3WL z4Z?7>jisA#cR4c$@YOxvVJ{XS_{N;PV6d#du+e@n2H3pPr|1jpiQ(NAD*Pc(o;)es zpCwjrS87lkf{7+dMGq(g>4pz9oJX8!{vc42%e=Q;i2iNbXPj}%gpUp3H`sjtR|2KP zU&E%!KlQ+~lpRijCH}uX@I1GS0XTUuH+tkS(90|}%4{kl(#mZxXC=6Zuz8E1058o! zmjQQUu7TVJuS9QZpzTn^Xgaerhc{F@nljDu(?4iH zngz{IY@~L&;uNdgnIAi0YF;bK3k}sG2>&Rsw&sE4rrvObbn0zo! z-5r>uM97hU7dD-Ii+yTb1=5BwG#ROtx{V&j4dhVEPKa_~M;&?cA^D}FCm@6m*EKq7 z_SE~?FMpl(`QH>Ml^stiflSevrVyc)Q6By9bUD9H`+(;KKGktJIXVBAX|uh0i-f825#5Ym*&1hcNI%kD zZ~d*dDTGLr8-r%xigBl(f7-9pKIt`4LbV(YzWZzmghJjVn_dJWGkp=T>HnZmI{oKp zlk#8FW?%8}v*pYC_n(9o`f5{wpcmTod7;ge|3TXPXlp?9Cx?#Cm5~)7D9k1RpkWeb zXQTn}vCz}-u`n~y2(bzC(K7+qS@;B5|M>_x%R$y5p|O@Y@r^Rsn^SM<7ruO6jxuHc z!IuQo-Jx5YTMMng`|6^)bE%~16~w$?^ZNI7?&wX7p5z)DT(Jp2_uPRqb(PRK2j((Q z*iRG-fkdBCy)>ClRK<+Vt|YT3xRbQ(r!tb|DClsFiiEH_yx^&0U~$Yz>?MxYM_bsL zKc9mWK7=AM6FO+L?amI6XbzQ80nx0xS@ZA}-eTHS?l*Ni~E`Ly7c0AOXxVmPI zsk&nL>2w3Wvlm>3;Qcl^-t9M30nv0eiFkhl(MEmgVsHtIrY8G-qsdDH8(bAGY#&mf zj(i4MC$l3(k%O#~7Mb}%YM@Z+^|M}$Y!36q?IKoxe8DN#b8cnvY*2&u@G;*LMkbp zeoB}#;YqcUCXGZ#u95ui^vgHXRNN#m-S%gPHTiFY&*+NU1jqXv3P7165K3C&#KE67 z?%)#%XVNVlH53FESk!x(AzAXRyQ^?hJB%phvHbA5H?W|8c-@AoKfP}H5(yu~Ydd>& zx4$JS5g4$KmgoKili5a~y1&6>{{Ie4{x=lU&vEge{3r(@iY62U+LB3r3MSO-xTlp5 zm7nAt(@z=`V?Xxx64pJLV(-Vec$UnYALHWNTF)LX4|g}Gr-O&984+4-%bG{W=@|rV z3ft)2>{GJhX3;TXCBTSEb(JrQ&o2mg{(_Glt`ECcR`+h6*FTNwgb}0{=G?qGyp33~ z^h}VE5lELGBy?T7+l}v4I2QBu<#8WMFOMiI9>R3`SW4d0QSFv&5@)v5QJCX4)Ls{@ zmywQ(3iqA2=SHo4EvM8D}yrWRZRJ#QH7*R^8*1}v-uU*;Cafc+*m$LG$fBJZ; zimY^~-n6}VW3lc3+txi`K9ThES`cIoDa zp7>olS&KyFQbHJiy*s|e;Y26Lx#LlHAT!)TkM@f@`OXe=ir`@CHSCR8dOiD}*sV3} zoKq`U~JRoi=(TRXQ2v|Zfp)5&`chrc_k zlw1g7=ht8A|Hf%Uo!3EiFLfW$-|@}!9aodsfQ%=8xYGaDiA6M6L&=Y04dtJm8~Sxo zMk^VaL>O?Nw95cKCsBc6TO$Lub9d3Tqo22n&~C|q<@8;2?dXSqBD6nd#&skpx*6z4 zdLqnFVZn1MD6xh_vfw!-6x9&)b3ze@^s!(+H58vSBvDMb%YyfyP~65ypcn%>$`bd% zp{S;yA03J?#S7gO>k!eWzf^SG1poZ=t^wX*k9x@ghYG+rW z`wjgJ5`^C@C5P6DBFRJPdmHjd3enQ`ifbdhj;Sk)JfbKo?HKs_-35!9x;uPHr=&St@Uf6Fv z_}BiS`v!dh2f{bIoQBSF4s>6k&zU29CF?dMXVB3-h&~g7@Suk8pq>{&_XzrcG{PfU z0YhbYI>4Ki4diYaAWRitV8{pu@c>Xu0Rj{N6aWAK2mq}~m`Z)eLgK+i0084>000XB z0000000031AON<300000aA9L>VP|D7dTDS_O9ci1000010096w0002$MF0Q*07ocf AuK)l5 literal 18753 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 diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs index 9e32b84..11a6299 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Pipelines/Mvc/GetRenderer/AddPageEditorWrapper.cs @@ -1,19 +1,23 @@ using Jabberwocky.Extras.Polly.Sc.Renderer; +using Sitecore; using Sitecore.Mvc.Pipelines.Response.GetRenderer; namespace Jabberwocky.Extras.Polly.Sc.Pipelines.Mvc.GetRenderer { - public class AddPageEditorWrapper : GetRendererProcessor - { - public override void Process(GetRendererArgs args) - { - if (args.Result == null) return; + public class AddPageEditorWrapper : GetRendererProcessor + { + public override void Process(GetRendererArgs args) + { + if (args.Result == null) return; - var renderer = args.Result; - var rendering = args.Rendering; - if (rendering == null) return; + var renderer = args.Result; + var rendering = args.Rendering; + if (rendering == null) return; - args.Result = new PageEditorRendererDecorator(renderer, rendering.RenderingItem); - } - } + // Only apply this decorator when in Experience Editor + if (!Context.PageMode.IsExperienceEditor) return; + + args.Result = new PageEditorRendererDecorator(renderer, rendering.RenderingItem); + } + } } diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs index 601a481..0c9b115 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs new file mode 100644 index 0000000..9ec7deb --- /dev/null +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/BaseRendererDecorator.cs @@ -0,0 +1,16 @@ +using System; + +namespace Jabberwocky.Extras.Polly.Sc.Renderer +{ + public abstract class BaseRendererDecorator : Sitecore.Mvc.Presentation.Renderer + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + + protected BaseRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + } + + public override string CacheKey => _innerRenderer.CacheKey; + } +} diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs index 20c59d1..e4df1c7 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/CircuitBreakerRendererDecorator.cs @@ -9,49 +9,45 @@ namespace Jabberwocky.Extras.Polly.Sc.Renderer { - public class CircuitBreakerRendererDecorator : Sitecore.Mvc.Presentation.Renderer - { - private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; - private readonly RenderingItem _renderingItem; - private readonly IPolicyCacheProvider _cacheProvider; - private readonly IPolicyKeyProvider _keyProvider; + public class CircuitBreakerRendererDecorator : BaseRendererDecorator + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + private readonly RenderingItem _renderingItem; + private readonly IPolicyCacheProvider _cacheProvider; + private readonly IPolicyKeyProvider _keyProvider; - public CircuitBreakerRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, - RenderingItem renderingItem, - IPolicyCacheProvider cacheProvider, - IPolicyKeyProvider keyProvider) - { - if (innerRenderer == null) throw new ArgumentNullException(nameof(innerRenderer)); - if (renderingItem == null) throw new ArgumentNullException(nameof(renderingItem)); - if (cacheProvider == null) throw new ArgumentNullException(nameof(cacheProvider)); - if (keyProvider == null) throw new ArgumentNullException(nameof(keyProvider)); - _innerRenderer = innerRenderer; - _renderingItem = renderingItem; - _cacheProvider = cacheProvider; - _keyProvider = keyProvider; - } + public CircuitBreakerRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, + RenderingItem renderingItem, + IPolicyCacheProvider cacheProvider, + IPolicyKeyProvider keyProvider) : base(innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + _renderingItem = renderingItem ?? throw new ArgumentNullException(nameof(renderingItem)); + _cacheProvider = cacheProvider ?? throw new ArgumentNullException(nameof(cacheProvider)); + _keyProvider = keyProvider ?? throw new ArgumentNullException(nameof(keyProvider)); + } - public override void Render(TextWriter writer) - { - int numExceptions; - int seconds; - if (!int.TryParse(_renderingItem.InnerItem[FieldConstants.BreakAfterExceptionCount], out numExceptions) - || !int.TryParse(_renderingItem.InnerItem[FieldConstants.OpenCircuitDurationInSeconds], out seconds)) - { - // Could not parse the values to integers, so just pass through - Log.Warn($"Configuration values on rendering '{_renderingItem.ID}' for " + - $"'{FieldConstants.BreakAfterExceptionCount}' or '{FieldConstants.OpenCircuitDurationInSeconds}' were invalid.", this); + public override void Render(TextWriter writer) + { + int numExceptions; + int seconds; + if (!int.TryParse(_renderingItem.InnerItem[FieldConstants.BreakAfterExceptionCount], out numExceptions) + || !int.TryParse(_renderingItem.InnerItem[FieldConstants.OpenCircuitDurationInSeconds], out seconds)) + { + // Could not parse the values to integers, so just pass through + Log.Warn($"Configuration values on rendering '{_renderingItem.ID}' for " + + $"'{FieldConstants.BreakAfterExceptionCount}' or '{FieldConstants.OpenCircuitDurationInSeconds}' were invalid.", this); - _innerRenderer.Render(writer); - return; - } + _innerRenderer.Render(writer); + return; + } - var policyKey = _keyProvider.GetKey(_renderingItem); + var policyKey = _keyProvider.GetKey(_renderingItem); - var policy = _cacheProvider.GetOrAddPolicy(policyKey, - key => Policy.Handle().CircuitBreaker(numExceptions, TimeSpan.FromSeconds(seconds))); + var policy = _cacheProvider.GetOrAddPolicy(policyKey, + key => Policy.Handle().CircuitBreaker(numExceptions, TimeSpan.FromSeconds(seconds))); - policy.Execute(() => _innerRenderer.Render(writer)); - } - } + policy.Execute(() => _innerRenderer.Render(writer)); + } + } } diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs index a3d807f..8a7eda2 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/ErrorHandlingRendererDecorator.cs @@ -5,29 +5,28 @@ namespace Jabberwocky.Extras.Polly.Sc.Renderer { - public class ErrorHandlingRendererDecorator : Sitecore.Mvc.Presentation.Renderer - { - private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; - private readonly RenderingItem _renderingItem; + public class ErrorHandlingRendererDecorator : BaseRendererDecorator + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + private readonly RenderingItem _renderingItem; - public ErrorHandlingRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) - { - if (innerRenderer == null) throw new ArgumentNullException(nameof(innerRenderer)); - if (renderingItem == null) throw new ArgumentNullException(nameof(renderingItem)); - _innerRenderer = innerRenderer; - _renderingItem = renderingItem; - } + public ErrorHandlingRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) + : base(innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + _renderingItem = renderingItem ?? throw new ArgumentNullException(nameof(renderingItem)); + } - public override void Render(TextWriter writer) - { - try - { - _innerRenderer.Render(writer); - } - catch (Exception ex) - { - Log.Warn($"Hiding rendering '{_renderingItem.ID}' due to error.", ex, typeof(ErrorHandlingRendererDecorator)); - } - } - } + public override void Render(TextWriter writer) + { + try + { + _innerRenderer.Render(writer); + } + catch (Exception ex) + { + Log.Error($"Hiding rendering '{_renderingItem.ID}' due to error.", ex, typeof(ErrorHandlingRendererDecorator)); + } + } + } } diff --git a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs index 7d5e63b..dea8713 100644 --- a/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs +++ b/src/Extras/Jabberwocky.Extras.Polly.Sc/Renderer/PageEditorRendererDecorator.cs @@ -1,47 +1,36 @@ using System; using System.IO; using System.Web; -using Sitecore; using Sitecore.Data.Items; using Sitecore.Diagnostics; namespace Jabberwocky.Extras.Polly.Sc.Renderer { - public class PageEditorRendererDecorator : Sitecore.Mvc.Presentation.Renderer - { - private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; - private readonly RenderingItem _renderingItem; + public class PageEditorRendererDecorator : BaseRendererDecorator + { + private readonly Sitecore.Mvc.Presentation.Renderer _innerRenderer; + private readonly RenderingItem _renderingItem; - public PageEditorRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) - { - if (innerRenderer == null) throw new ArgumentNullException(nameof(innerRenderer)); - if (renderingItem == null) throw new ArgumentNullException(nameof(renderingItem)); - _innerRenderer = innerRenderer; - _renderingItem = renderingItem; - } + public PageEditorRendererDecorator(Sitecore.Mvc.Presentation.Renderer innerRenderer, RenderingItem renderingItem) + : base(innerRenderer) + { + _innerRenderer = innerRenderer ?? throw new ArgumentNullException(nameof(innerRenderer)); + _renderingItem = renderingItem ?? throw new ArgumentNullException(nameof(renderingItem)); + } - public override void Render(TextWriter writer) - { - // Only bother with capturing exceptions if we're in Experience Editor mode - // No point in catching and immediately rethrowing when not in 'happy path' - if (Context.PageMode.IsExperienceEditor) - { - try - { - _innerRenderer.Render(writer); - } - catch (Exception ex) - { - writer.Write("

Error rendering the following component: {0}

{1}

", - HttpUtility.HtmlEncode(_renderingItem.Name), - HttpUtility.HtmlEncode(ex)); - Log.Error(ex.Message, ex, typeof(PageEditorRendererDecorator)); - } - } - else - { - _innerRenderer.Render(writer); - } - } - } + public override void Render(TextWriter writer) + { + try + { + _innerRenderer.Render(writer); + } + catch (Exception ex) + { + writer.Write("

Error rendering the following component: {0}

{1}

", + HttpUtility.HtmlEncode(_renderingItem.Name), + HttpUtility.HtmlEncode(ex)); + Log.Error(ex.Message, ex, typeof(PageEditorRendererDecorator)); + } + } + } } diff --git a/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs b/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs index 082fa5d..20b7ed8 100644 --- a/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Autofac/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Core/Properties/AssemblyInfo.cs b/src/Jabberwocky.Core/Properties/AssemblyInfo.cs index 722d0e4..94156c7 100644 --- a/src/Jabberwocky.Core/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Core/Properties/AssemblyInfo.cs @@ -34,5 +34,5 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Core.Tests")] \ No newline at end of file diff --git a/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs b/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs index b4c380f..a73ebf3 100644 --- a/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.DependencyInjection.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs b/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs index 751804c..8cac8cc 100644 --- a/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.DependencyInjection/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs index b0f245f..e2b84b6 100644 --- a/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Autofac.Mvc/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.Mvc.Tests")] \ No newline at end of file diff --git a/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs index c8df40c..c1477da 100644 --- a/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Autofac.WebApi/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs index 3ea985b..ed80a40 100644 --- a/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Autofac/Properties/AssemblyInfo.cs @@ -34,7 +34,7 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.Mvc")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac.WebApi")] diff --git a/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs index d09986e..9b2470d 100644 --- a/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs b/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs index 4582a4b..d42314d 100644 --- a/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.Glass/Properties/AssemblyInfo.cs @@ -34,6 +34,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Tests")] [assembly: InternalsVisibleTo("Jabberwocky.Glass.Autofac")] diff --git a/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs b/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs index e3672df..be68ef0 100644 --- a/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.WebApi.Sc/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs b/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs index 63c2b53..6a393b1 100644 --- a/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs +++ b/src/Jabberwocky.WebApi/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.0.0.0")] [assembly: AssemblyFileVersion("2.0.0.0")] -[assembly: AssemblyInformationalVersion("2.0.0-beta")] +[assembly: AssemblyInformationalVersion("2.0.0")] diff --git a/tools/Nuget/nuget.bat b/tools/Nuget/nuget.bat index 62dc05c..2256bf9 100644 --- a/tools/Nuget/nuget.bat +++ b/tools/Nuget/nuget.bat @@ -5,10 +5,10 @@ set projfile=!projfile:nuspec=csproj! ..\..\.nuget\NuGet.exe pack !projfile! -IncludeReferencedProjects -symbols -Build -OutputDirectory . -Prop Configuration=Release ) -..\..\.nuget\NuGet.exe pack ..\..\Jabberwocky.Library.nuspec -NoPackageAnalysis -Version 2.0.0-beta -OutputDirectory . +..\..\.nuget\NuGet.exe pack ..\..\Jabberwocky.Library.nuspec -NoPackageAnalysis -Version 2.0.0 -OutputDirectory . -..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0-beta -OutputDirectory . -Prop Configuration=Release -..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0-beta -OutputDirectory . -Prop Configuration=Release +..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis/Jabberwocky.Core.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0 -OutputDirectory . -Prop Configuration=Release +..\..\.nuget\NuGet.exe pack ..\..\diagnostics\Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis/Jabberwocky.Glass.CodeAnalysis.nuspec -NoPackageAnalysis -Version 2.0.0 -OutputDirectory . -Prop Configuration=Release REM - Copy symbol sources to 'symbols' directory mkdir symbols