Skip to content

Commit 59a31f8

Browse files
GitHubSync update - release-7.0 (#1325)
* GitHubSync update - release-7.0 * Fix for analyzer in test code --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: David Boike <david.boike@gmail.com>
1 parent e474562 commit 59a31f8

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/Directory.Build.props

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
<Import Project="Custom.Build.props" Condition="Exists('Custom.Build.props')" />
44

55
<PropertyGroup>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
<TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
88
<AnalysisLevel Condition="'$(AnalysisLevel)' == ''">5.0</AnalysisLevel>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10+
<!-- Will update this to 'all' in the future -->
11+
<NuGetAuditMode>direct</NuGetAuditMode>
12+
<NuGetAuditLevel>low</NuGetAuditLevel>
1013
<!-- To lock the version of Particular.Analyzers, for example, in a release branch, set this property in Custom.Build.props -->
11-
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">1.8.0</ParticularAnalyzersVersion>
14+
<ParticularAnalyzersVersion Condition="'$(ParticularAnalyzersVersion)' == ''">2.1.1</ParticularAnalyzersVersion>
1215
<NServiceBusKey>0024000004800000940000000602000000240000525341310004000001000100dde965e6172e019ac82c2639ffe494dd2e7dd16347c34762a05732b492e110f2e4e2e1b5ef2d85c848ccfb671ee20a47c8d1376276708dc30a90ff1121b647ba3b7259a6bc383b2034938ef0e275b58b920375ac605076178123693c6c4f1331661a62eba28c249386855637780e3ff5f23a6d854700eaa6803ef48907513b92</NServiceBusKey>
1316
<NServiceBusTestsKey>00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5</NServiceBusTestsKey>
1417
</PropertyGroup>

src/NServiceBus.Transport.SqlServer.AcceptanceTests/TestingInMemoryPersistence.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
4+
using System.Linq;
45
using System.Threading;
56
using System.Threading.Tasks;
67
using Microsoft.Extensions.DependencyInjection;
@@ -70,15 +71,12 @@ public Task Unsubscribe(Subscriber subscriber, MessageType messageType, ContextB
7071

7172
public Task<IEnumerable<Subscriber>> GetSubscriberAddressesForMessage(IEnumerable<MessageType> messageTypes, ContextBag context, CancellationToken cancellationToken = default)
7273
{
73-
var result = new HashSet<Subscriber>();
74-
foreach (var m in messageTypes)
75-
{
76-
if (storage.TryGetValue(m, out var list))
77-
{
78-
result.UnionWith(list.Values);
79-
}
80-
}
81-
return Task.FromResult((IEnumerable<Subscriber>)result);
74+
var subscribers = messageTypes
75+
.SelectMany(msgType => storage.TryGetValue(msgType, out var subs) ? subs.Values : Array.Empty<Subscriber>())
76+
.GroupBy(s => new { s.TransportAddress, s.Endpoint }) // Subscriber does not implement IEquatable<T>
77+
.Select(g => g.First());
78+
79+
return Task.FromResult(subscribers);
8280
}
8381

8482
ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>> storage = new ConcurrentDictionary<MessageType, ConcurrentDictionary<string, Subscriber>>();

0 commit comments

Comments
 (0)