From 72fa13ca5b0bfc4a16f7f50e2166d6399fb3f131 Mon Sep 17 00:00:00 2001 From: Christian Kratky Date: Sat, 14 Mar 2020 22:59:17 +0100 Subject: [PATCH] Fix build errors. --- .../MQTTnet.Extensions.Rpc/MqttRpcClient.cs | 16 ++++++++-------- Source/MQTTnet.Server/MQTTnet.Server.csproj | 4 ---- .../MqttClientUnsubscribeOptionsBuilder.cs | 5 ++--- Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj | 2 +- .../MQTTnet.TestApp.UniversalWindows.csproj | 3 ++- ....TestApp.UniversalWindows_TemporaryKey.pfx | Bin 2504 -> 2504 bytes 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs b/Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs index 8696f837..6a6a93e7 100644 --- a/Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs +++ b/Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs @@ -1,17 +1,17 @@ -using System; -using System.Collections.Concurrent; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using MQTTnet.Client; +using MQTTnet.Client; using MQTTnet.Exceptions; using MQTTnet.Extensions.Rpc.Options; using MQTTnet.Extensions.Rpc.Options.TopicGeneration; using MQTTnet.Protocol; +using System; +using System.Collections.Concurrent; +using System.Text; +using System.Threading; +using System.Threading.Tasks; namespace MQTTnet.Extensions.Rpc { - public class MqttRpcClient : IDisposable + public sealed class MqttRpcClient : IDisposable { private readonly ConcurrentDictionary> _waitingCalls = new ConcurrentDictionary>(); private readonly IMqttClient _mqttClient; @@ -101,7 +101,7 @@ namespace MQTTnet.Extensions.Rpc await _mqttClient.SubscribeAsync(responseTopic, qualityOfServiceLevel).ConfigureAwait(false); await _mqttClient.PublishAsync(requestMessage).ConfigureAwait(false); - + using (var timeoutCts = new CancellationTokenSource(timeout)) using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token)) { diff --git a/Source/MQTTnet.Server/MQTTnet.Server.csproj b/Source/MQTTnet.Server/MQTTnet.Server.csproj index 42353159..3f35d975 100644 --- a/Source/MQTTnet.Server/MQTTnet.Server.csproj +++ b/Source/MQTTnet.Server/MQTTnet.Server.csproj @@ -45,10 +45,6 @@ - - - - diff --git a/Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeOptionsBuilder.cs b/Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeOptionsBuilder.cs index 96c178ff..dbeb631d 100644 --- a/Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeOptionsBuilder.cs +++ b/Source/MQTTnet/Client/Unsubscribing/MqttClientUnsubscribeOptionsBuilder.cs @@ -1,7 +1,6 @@ using MQTTnet.Packets; using System; using System.Collections.Generic; -using System.Text; namespace MQTTnet.Client.Unsubscribing { @@ -44,12 +43,12 @@ namespace MQTTnet.Client.Unsubscribing return this; } - + public MqttClientUnsubscribeOptionsBuilder WithTopicFilter(TopicFilter topicFilter) { if (topicFilter is null) throw new ArgumentNullException(nameof(topicFilter)); - return WithTopic(topicFilter.Topic); + return WithTopicFilter(topicFilter.Topic); } public MqttClientUnsubscribeOptions Build() diff --git a/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj b/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj index c0749f7f..0305b16f 100644 --- a/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj +++ b/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net461 + netcoreapp3.1;net461 false diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj b/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj index f31fe3b1..cbb25f31 100644 --- a/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj +++ b/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows.csproj @@ -18,8 +18,9 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true MQTTnet.TestApp.UniversalWindows_TemporaryKey.pfx - 1D7434E482CF034DD18C9E6AB6B12622E08FD733 + 1B25E1E3A70C4FEF793B882295F383301B861796 win10;win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot + True true diff --git a/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows_TemporaryKey.pfx b/Tests/MQTTnet.TestApp.UniversalWindows/MQTTnet.TestApp.UniversalWindows_TemporaryKey.pfx index a81c26abd23c89c02e16a56924fdaf0a692566a6..b8877c01171c4521fccdd4602d8775b3504fa6e3 100644 GIT binary patch delta 2250 zcmV;*2sQV}6UY;gXn!+FF=66BwblXx2haq91lXGW`zghm|~PSrd;X82?y!=4Ym8O#zFgTL$v;7zxWUck@R`%jIWqv$Qzg+T?k%5mZU< z$tkNL4Gr*~u&_baRdlA!fcKFmuO@iK5D6wSPauAs{7Uu}RDUYen_sN!zi)v4p6Rd# zck)4VLR$Hh?FC8l{NdAoxSc z;jKd(K^6uH#t zsWeFTny=`jntwGSrI$df)GH5`&V3GbbeNcd5F@pF6VXTeX&YRW*b8!H3{%B+@a%Vh zc_r86e8JfG8C!Qs}K-fH><5$GINn~|OKdJF75Ckif=oEfTE4XF{Nd*lu2f%IpOK!0?$b84mFTJ0|&lX3o*qyx^% z3gF8$>z0^|W6t;9XGv?9Kc&shOsL_ohGvN36e2#(ym0TFs?1N=UWPvuc?yd%gcz9?Gjpw z!Fl@NpMTxW1Co4e4IUCtYUJyJrN-JcfU+ zfDDLa7F7H`OeXr;<+Kf^MWFKEzulS8b%_uN z?W2FE6htbRm=3n+$a{Su+gZGyL0TH_!-s{*>VL-r!1@8ov8>8TJSwd>EQ5j#mK^ti zefN#}+FFKnx9R`G#{oFSRG06gsC}k2n&&}>jEQDhp4LI&=d&!uZsn9rSo$ibWQuE{ zy!{{4c+=@pr$S{j!V;Z87;C@yqA{RFTrivGab#Vdt>^67zn)_-W|rW4RUVgjVb0Fd6~L(4uf_5buY6B{1c7; z=IfjXMqjEC;OVVi=c9DOMUN9jqFb&vz%fYL-O~pCE)Rjzb@eR(LXiw#xWHr9i#jgn zJI?R98&-MGwnrEkUt%W4OcJj%Y2p)_2FSkSAtF?+`JY#_v}3 zLFJXBy_b+bR{m#1{Bh=W31V*l*?%u+e0~PQDWPfXRYaO-_6~!C9GIzgW$i+zF7gG%wNr;^Q6S{P@F8c#<_=-X^9Ibi(jWnjgD$vc}DHASB z+b5XJbTd%YRZ}>!KMfZ4g^1Iclk(oC*l9{&LNQU@*0!3<~ zxr^%RWT=)aiSp<0WhgCKrnWWY`p86X_bR0RK#@-efpzHO^=}Hqbq2cFQSurklEC8Z zqwa_sy!e$oBGoo%vR!efP0-jaZYMP&qe{LYsw$q9rO}HtgKjXfgQ{-8_J7fCXy746 z_V<}kFdr{{;4pVxnSg6=)M5ABJU#t4W9h3$q)=9SZYbtkxMw{Rg*=A;MmY(#UPz5U zh4C=L0O5_>R`7x%l&xdTU>Q^2Z`bCX+k-&7nw+6YOdlqKnKo!0^^YF$bp#VvxQsp& zzdl!z9-w*yX*9&a@SN?J1%L9G2>|#XGy-(}bQCIY^p4YiKTnon&PMxp5v@wFpC2V1UX zIRbI@zu58zMv5*K713+H=zm4rRx%UjoL^Uc{I*8I#8B6*4|Gh4$z}2A5ZL-z`|-(g z&Z4KdyCUbsJi|V?G=EmCK(7WU8FrcQ2z({#MgXfTp3-hzx5pNj6ewL$=uK_F?KXyk zqQ_&6@gPeWsW0AgC@W<_6}{=)lmfn$3c0Cu!W6i$UrOx#&qFy63hbi8-N6w#)&UP6 z3m|x@deSipm^OC_QmZBd&t(A8p!3)u!U#_=ep}SZ=vjZ5%Q3 zF zgS^!|{{^vHGP=`TFgq|GFb4(&D-Ht!8Uz%c0P4uGmCU5CtA`yP#wowuQ+c2S6t%aS YjE`g0IRCZXsO0uxHn`k&_0(@8UO$Q delta 2250 zcmV;*2sQV}6UY;gXn*N4uG!R=7X<OR}O$5L)A^pyRVL7n7LsFjUwOuO&}x zchsIZCM9t=%1XZ%vkdyhm9Ahj(^B{+pzuWI83>@D^_YsNOQE0 zvh`cp-b3;!a9JyWd)J-^J482(&~MGi9Opx$Tn59^iZHpSgeJr16Cek?qe=EOlbf&= z06s~U)PFM7et$Sip#q8ki*-V(>)(h(00ipotHtY@IU#Yx8w$~*Sr*{PpY;p!3|{q8 zlAb>Ba|?V1Ip|GakTRBJ`N~RIk2kW*li(IpAL=n!&Epno<791U7qW5*# zg3W}~Su$t_hL;1p-wase^qXb5MhUY?_0iqjGxX9=V}Bx|0N(E3JTdf+_hCFjd-CXH z?|I|$$a?wM(8xFu3c~P9?;$NLZhtQc{6zbZ&HJz!@wWG-WJ-MDBbm34#s6g8@@C=3 z&U3!h<8tpYn#Bo7q=)yS!a|^^;c_@BfA6?gXZ7JFvPQH<=W0#iB<YtlRr(wq-{KrjO3hj6Ns4Y z$A3eHdC69kL0$8P<5|p=)&fWY5Of}Ps(VOp2m_#J*OBFl7*BjLv@(3`DkdLeEnw< z4lz!jIWjh6ju~fP`QD0mx4)%De6l8h3|5P%u|)mcme}_!6}>cFwBqK-&gR)K#D8!o zvlt!w&~|68Y1lz?ZeMGd-8sn2m-n0-iW6DoY4hEuLIAgHH*YwBQ(z{Z`DBM8^$Mn9 zI!z7!wWMeKwD=9s~CmS-ygGujRMM{%HDo}Ul_3MxE z9PBl|MiMkzaB(JVr#&{kGH8{@Cx7jVDjcF2>8MeZm!a)II(Mh0P>S{ddkOAmJ`f{c z;QgVIg`d12GcjGh0r6p=U3Wdo88%ST1uKSZ5WvadnA0PvdrrRs$;x!c&LNQUjW$YMt*dh) zmU)vF+N+ekCT0-N1(c1@<4rH^i;@kaOS6{OX$`#6^YhM^J6I~GMa4`P34bdrVurho zceVSjm{%M_rG;ZR%UY$6h^hj5aAt4Z0dCwRWJE(1*)^$YIef=Yx2IQ^%f9b)kh12t z+;;x!X{d)Tf8Ld^_Eqx(@OhkM3=g=9xK>j;qm9qtW!?bBvARmu64?kMIZh>&nWE&_ zP))yrn7G~;>2*V;$fBM_v42$uwna1&7~?-latbP-RE}^{!%erWYv7@`W--MJ;(z}48#?H{n0(scf14v zqmrB)STPJmxNjs?Wb&B5oKRkUIBKx{s)|Utl16Gh`8IyS_6kz1d-qOZ7!+c?h)aLi zCZ>1~y@1xIC!g;~n18}pypdc%{dUo@Q}AvtW)(!zmYGTb)fbsy zY_ERE!@9<>_tsj$k}?!Z~}4XH@=VT=bG zO~xC(2k5mb`nHC4RI7>AwF_1-O+H0<|2mB4d+xhRu0Jb#k$*w?WtP#C6l>N4s;Ija z=I5ZU;(XH%gCgZ0iny;F*A2R1I`K_(HMiRSBw#2j4NcX|LlPB`ffR4B4n*goxBReI zl?OZUAs5f$2REaeGV9y*5{4O#j*Cuj6psV4 Y|8i?{a^|)bw7U3b*A-=LAOZph&{SefTmS$7