Skip to content

Commit 86a9ec9

Browse files
pglombardopglombardo
authored
Github CI: Build and push multi-arch package (#166)
1 parent e9c57eb commit 86a9ec9

File tree

4 files changed

+44
-32
lines changed

4 files changed

+44
-32
lines changed

‎.github/workflows/build.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ jobs:
6767
- name: "Dotnet Cake Pack"
6868
run: dotnet cake --target=Pack
6969
shell: pwsh
70+
publish:
71+
needs: build
72+
runs-on: ubuntu-latest
73+
steps:
74+
- name: Checkout code
75+
uses: actions/[email protected]
76+
7077
- name: Push to NuGet
7178
if: github.event_name == 'release'
7279
run: dotnet nuget push ./Artifacts/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
80+
shell: pwsh

‎Source/HiveMQtt/Client/HiveMQClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ private async Task<bool> HandleDisconnectionAsync(bool clean = true)
503503

504504
// Cancel all background tasks and close the socket
505505
this.ConnectState = ConnectState.Disconnected;
506-
await this.cancellationTokenSource.CancelAsync().ConfigureAwait(false);
506+
this.cancellationTokenSource.Cancel();
507507
this.CloseSocket();
508508

509509
if (clean)

‎Source/HiveMQtt/Client/HiveMQClientEvents.cs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected virtual void BeforeConnectEventLauncher(HiveMQClientOptions options)
4545
{
4646
if (t.IsFaulted)
4747
{
48-
Logger.Error("BeforeConnectEventLauncher exception: " + t.Exception.Message);
48+
Logger.Error("BeforeConnectEventLauncher exception: " + t.Exception?.Message);
4949
}
5050
},
5151
TaskScheduler.Default);
@@ -68,7 +68,7 @@ protected virtual void AfterConnectEventLauncher(ConnectResult results)
6868
{
6969
if (t.IsFaulted)
7070
{
71-
Logger.Error("AfterConnectEventLauncher exception: " + t.Exception.Message);
71+
Logger.Error("AfterConnectEventLauncher exception: " + t.Exception?.Message);
7272
}
7373
},
7474
TaskScheduler.Default);
@@ -91,7 +91,7 @@ protected virtual void BeforeDisconnectEventLauncher()
9191
{
9292
if (t.IsFaulted)
9393
{
94-
Logger.Error("BeforeDisconnectEventLauncher exception: " + t.Exception.Message);
94+
Logger.Error("BeforeDisconnectEventLauncher exception: " + t.Exception?.Message);
9595
}
9696
},
9797
TaskScheduler.Default);
@@ -114,7 +114,7 @@ protected virtual void AfterDisconnectEventLauncher(bool clean = false)
114114
{
115115
if (t.IsFaulted)
116116
{
117-
Logger.Error("AfterDisconnectEventLauncher exception: " + t.Exception.Message);
117+
Logger.Error("AfterDisconnectEventLauncher exception: " + t.Exception?.Message);
118118
}
119119
},
120120
TaskScheduler.Default);
@@ -137,7 +137,7 @@ protected virtual void BeforeSubscribeEventLauncher(SubscribeOptions options)
137137
{
138138
if (t.IsFaulted)
139139
{
140-
Logger.Error("BeforeSubscribeEventLauncher exception: " + t.Exception.Message);
140+
Logger.Error("BeforeSubscribeEventLauncher exception: " + t.Exception?.Message);
141141
}
142142
},
143143
TaskScheduler.Default);
@@ -160,7 +160,7 @@ protected virtual void AfterSubscribeEventLauncher(SubscribeResult results)
160160
{
161161
if (t.IsFaulted)
162162
{
163-
Logger.Error("AfterSubscribeEventLauncher exception: " + t.Exception.Message);
163+
Logger.Error("AfterSubscribeEventLauncher exception: " + t.Exception?.Message);
164164
}
165165
},
166166
TaskScheduler.Default);
@@ -183,7 +183,7 @@ protected virtual void BeforeUnsubscribeEventLauncher(List<Subscription> subscri
183183
{
184184
if (t.IsFaulted)
185185
{
186-
Logger.Error("BeforeUnsubscribeEventLauncher exception: " + t.Exception.Message);
186+
Logger.Error("BeforeUnsubscribeEventLauncher exception: " + t.Exception?.Message);
187187
}
188188
},
189189
TaskScheduler.Default);
@@ -206,7 +206,7 @@ protected virtual void AfterUnsubscribeEventLauncher(UnsubscribeResult results)
206206
{
207207
if (t.IsFaulted)
208208
{
209-
Logger.Error("AfterUnsubscribeEventLauncher exception: " + t.Exception.Message);
209+
Logger.Error("AfterUnsubscribeEventLauncher exception: " + t.Exception?.Message);
210210
}
211211
},
212212
TaskScheduler.Default);
@@ -233,7 +233,7 @@ protected virtual void OnMessageReceivedEventLauncher(PublishPacket packet)
233233
{
234234
if (t.IsFaulted)
235235
{
236-
Logger.Error("OnMessageReceivedEventLauncher exception: " + t.Exception.Message);
236+
Logger.Error("OnMessageReceivedEventLauncher exception: " + t.Exception?.Message);
237237
}
238238
},
239239
TaskScheduler.Default);
@@ -254,7 +254,7 @@ protected virtual void OnMessageReceivedEventLauncher(PublishPacket packet)
254254
{
255255
if (t.IsFaulted)
256256
{
257-
Logger.Error($"per-subscription MessageReceivedEventLauncher faulted ({packet.Message.Topic}): " + t.Exception.Message);
257+
Logger.Error($"per-subscription MessageReceivedEventLauncher faulted ({packet.Message.Topic}): " + t.Exception?.Message);
258258
}
259259
},
260260
TaskScheduler.Default);
@@ -293,7 +293,7 @@ protected virtual void OnConnectSentEventLauncher(ConnectPacket packet)
293293
{
294294
if (t.IsFaulted)
295295
{
296-
Logger.Error("OnConnectSentEventLauncher exception: " + t.Exception.Message);
296+
Logger.Error("OnConnectSentEventLauncher exception: " + t.Exception?.Message);
297297
}
298298
},
299299
TaskScheduler.Default);
@@ -316,7 +316,7 @@ protected virtual void OnConnAckReceivedEventLauncher(ConnAckPacket packet)
316316
{
317317
if (t.IsFaulted)
318318
{
319-
Logger.Error("OnConnAckReceivedEventLauncher exception: " + t.Exception.Message);
319+
Logger.Error("OnConnAckReceivedEventLauncher exception: " + t.Exception?.Message);
320320
}
321321
},
322322
TaskScheduler.Default);
@@ -339,7 +339,7 @@ protected virtual void OnDisconnectSentEventLauncher(DisconnectPacket packet)
339339
{
340340
if (t.IsFaulted)
341341
{
342-
Logger.Error("OnDisconnectSentEventLauncher exception: " + t.Exception.Message);
342+
Logger.Error("OnDisconnectSentEventLauncher exception: " + t.Exception?.Message);
343343
}
344344
},
345345
TaskScheduler.Default);
@@ -362,7 +362,7 @@ protected virtual void OnDisconnectReceivedEventLauncher(DisconnectPacket packet
362362
{
363363
if (t.IsFaulted)
364364
{
365-
Logger.Error("OnDisconnectReceivedEventLauncher exception: " + t.Exception.Message);
365+
Logger.Error("OnDisconnectReceivedEventLauncher exception: " + t.Exception?.Message);
366366
}
367367
},
368368
TaskScheduler.Default);
@@ -385,7 +385,7 @@ protected virtual void OnPingReqSentEventLauncher(PingReqPacket packet)
385385
{
386386
if (t.IsFaulted)
387387
{
388-
Logger.Error("OnPingReqSentEventLauncher exception: " + t.Exception.Message);
388+
Logger.Error("OnPingReqSentEventLauncher exception: " + t.Exception?.Message);
389389
}
390390
},
391391
TaskScheduler.Default);
@@ -408,7 +408,7 @@ protected virtual void OnPingRespReceivedEventLauncher(PingRespPacket packet)
408408
{
409409
if (t.IsFaulted)
410410
{
411-
Logger.Error("OnPingRespReceivedEventLauncher exception: " + t.Exception.Message);
411+
Logger.Error("OnPingRespReceivedEventLauncher exception: " + t.Exception?.Message);
412412
}
413413
},
414414
TaskScheduler.Default);
@@ -431,7 +431,7 @@ protected virtual void OnSubscribeSentEventLauncher(SubscribePacket packet)
431431
{
432432
if (t.IsFaulted)
433433
{
434-
Logger.Error("OnSubscribeSentEventLauncher exception: " + t.Exception.Message);
434+
Logger.Error("OnSubscribeSentEventLauncher exception: " + t.Exception?.Message);
435435
}
436436
},
437437
TaskScheduler.Default);
@@ -454,7 +454,7 @@ protected virtual void OnSubAckReceivedEventLauncher(SubAckPacket packet)
454454
{
455455
if (t.IsFaulted)
456456
{
457-
Logger.Error("OnSubAckReceivedEventLauncher exception: " + t.Exception.Message);
457+
Logger.Error("OnSubAckReceivedEventLauncher exception: " + t.Exception?.Message);
458458
}
459459
},
460460
TaskScheduler.Default);
@@ -477,7 +477,7 @@ protected virtual void OnUnsubscribeSentEventLauncher(UnsubscribePacket packet)
477477
{
478478
if (t.IsFaulted)
479479
{
480-
Logger.Error("OnUnsubscribeSentEventLauncher exception: " + t.Exception.Message);
480+
Logger.Error("OnUnsubscribeSentEventLauncher exception: " + t.Exception?.Message);
481481
}
482482
},
483483
TaskScheduler.Default);
@@ -500,7 +500,7 @@ protected virtual void OnUnsubAckReceivedEventLauncher(UnsubAckPacket packet)
500500
{
501501
if (t.IsFaulted)
502502
{
503-
Logger.Error("OnUnsubAckReceivedEventLauncher exception: " + t.Exception.Message);
503+
Logger.Error("OnUnsubAckReceivedEventLauncher exception: " + t.Exception?.Message);
504504
}
505505
},
506506
TaskScheduler.Default);
@@ -523,7 +523,7 @@ protected virtual void OnPublishReceivedEventLauncher(PublishPacket packet)
523523
{
524524
if (t.IsFaulted)
525525
{
526-
Logger.Error("OnPublishReceivedEventLauncher exception: " + t.Exception.Message);
526+
Logger.Error("OnPublishReceivedEventLauncher exception: " + t.Exception?.Message);
527527
}
528528
},
529529
TaskScheduler.Default);
@@ -546,7 +546,7 @@ protected virtual void OnPublishSentEventLauncher(PublishPacket packet)
546546
{
547547
if (t.IsFaulted)
548548
{
549-
Logger.Error("OnPublishSentEventLauncher exception: " + t.Exception.Message);
549+
Logger.Error("OnPublishSentEventLauncher exception: " + t.Exception?.Message);
550550
}
551551
},
552552
TaskScheduler.Default);
@@ -569,7 +569,7 @@ protected virtual void OnPubAckReceivedEventLauncher(PubAckPacket packet)
569569
{
570570
if (t.IsFaulted)
571571
{
572-
Logger.Error("OnPubAckReceivedEventLauncher exception: " + t.Exception.Message);
572+
Logger.Error("OnPubAckReceivedEventLauncher exception: " + t.Exception?.Message);
573573
}
574574
},
575575
TaskScheduler.Default);
@@ -592,7 +592,7 @@ protected virtual void OnPubAckSentEventLauncher(PubAckPacket packet)
592592
{
593593
if (t.IsFaulted)
594594
{
595-
Logger.Error("OnPubAckSentEventLauncher exception: " + t.Exception.Message);
595+
Logger.Error("OnPubAckSentEventLauncher exception: " + t.Exception?.Message);
596596
}
597597
},
598598
TaskScheduler.Default);
@@ -615,7 +615,7 @@ protected virtual void OnPubRecReceivedEventLauncher(PubRecPacket packet)
615615
{
616616
if (t.IsFaulted)
617617
{
618-
Logger.Error("OnPubRecReceivedEventLauncher exception: " + t.Exception.Message);
618+
Logger.Error("OnPubRecReceivedEventLauncher exception: " + t.Exception?.Message);
619619
}
620620
},
621621
TaskScheduler.Default);
@@ -638,7 +638,7 @@ protected virtual void OnPubRecSentEventLauncher(PubRecPacket packet)
638638
{
639639
if (t.IsFaulted)
640640
{
641-
Logger.Error("OnPubRecSentEventLauncher exception: " + t.Exception.Message);
641+
Logger.Error("OnPubRecSentEventLauncher exception: " + t.Exception?.Message);
642642
}
643643
},
644644
TaskScheduler.Default);
@@ -661,7 +661,7 @@ protected virtual void OnPubRelReceivedEventLauncher(PubRelPacket packet)
661661
{
662662
if (t.IsFaulted)
663663
{
664-
Logger.Error("OnPubRelReceivedEventLauncher exception: " + t.Exception.Message);
664+
Logger.Error("OnPubRelReceivedEventLauncher exception: " + t.Exception?.Message);
665665
}
666666
},
667667
TaskScheduler.Default);
@@ -684,7 +684,7 @@ protected virtual void OnPubRelSentEventLauncher(PubRelPacket packet)
684684
{
685685
if (t.IsFaulted)
686686
{
687-
Logger.Error("OnPubRelSentEventLauncher exception: " + t.Exception.Message);
687+
Logger.Error("OnPubRelSentEventLauncher exception: " + t.Exception?.Message);
688688
}
689689
},
690690
TaskScheduler.Default);
@@ -707,7 +707,7 @@ protected virtual void OnPubCompReceivedEventLauncher(PubCompPacket packet)
707707
{
708708
if (t.IsFaulted)
709709
{
710-
Logger.Error("PubCompReceivedEventLauncher exception: " + t.Exception.Message);
710+
Logger.Error("PubCompReceivedEventLauncher exception: " + t.Exception?.Message);
711711
}
712712
},
713713
TaskScheduler.Default);
@@ -730,7 +730,7 @@ protected virtual void OnPubCompSentEventLauncher(PubCompPacket packet)
730730
{
731731
if (t.IsFaulted)
732732
{
733-
Logger.Error("PubCompSentEventLauncher exception: " + t.Exception.Message);
733+
Logger.Error("PubCompSentEventLauncher exception: " + t.Exception?.Message);
734734
}
735735
},
736736
TaskScheduler.Default);

‎Source/HiveMQtt/HiveMQtt.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup Label="Build">
4-
<TargetFramework>net8.0</TargetFramework>
54
<AssemblyName>HiveMQtt</AssemblyName>
65
<Description>The HiveMQ MQTT Client is a MQTT 5.0 compatible C# library.</Description>
76
</PropertyGroup>
87

8+
<PropertyGroup>
9+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
10+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11+
</PropertyGroup>
12+
913
<PropertyGroup>
1014
<MinVerTagPrefix>v</MinVerTagPrefix>
1115
</PropertyGroup>

0 commit comments

Comments
 (0)