Skip to content

Commit b248ac9

Browse files
danielmarbachdanielmarbach
authored
Merge pull request #260 from Particular/release-4.2
Release 4.2
2 parents 4ccbae0 + aba8711 commit b248ac9

File tree

8 files changed

+28
-45
lines changed

8 files changed

+28
-45
lines changed

‎GitVersion.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ branches:
55
tag: beta
66
release:
77
tag: rc
8+
ignore:
9+
sha:
10+
- 8fb53199be08755a13ac6c1f1445052f2472578d

‎src/AcceptanceTests/AcceptanceTests.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
54
<SignAssembly>true</SignAssembly>
65
<AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
76
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<ProjectReference Include="..\NServiceBus.AmazonSQS\NServiceBus.AmazonSQS.csproj" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
15-
<PackageReference Include="AWSSDK.S3" Version="3.*" />
16-
<PackageReference Include="AWSSDK.SQS" Version="3.*" />
17-
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.0.0" />
12+
<PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
13+
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
14+
<PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.1.0" />
1815
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
19-
<PackageReference Include="NUnit" Version="3.7.*" />
16+
<PackageReference Include="NUnit" Version="3.11.0" />
2017
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
2118
</ItemGroup>
22-
2319
</Project>

‎src/NServiceBus.AmazonSQS/Extensions/MessageExtensions.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.IO;
55
using System.Threading;
66
using System.Threading.Tasks;
7-
using Amazon;
87
using Amazon.S3;
98
using Amazon.SQS.Model;
109
using Transport;
@@ -48,13 +47,13 @@ public static async Task<IncomingMessage> ToIncomingMessage(this TransportMessag
4847
return new IncomingMessage(messageId, transportMessage.Headers, body);
4948
}
5049

51-
public static DateTime GetSentDateTime(this Message message)
50+
public static DateTime GetSentDateTime(this Message message, TimeSpan clockOffset)
5251
{
5352
var epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
5453
var result = epoch.AddMilliseconds(long.Parse(message.Attributes["SentTimestamp"]));
5554
// Adjust for clock skew between this endpoint and aws.
5655
// https://aws.amazon.com/blogs/developer/clock-skew-correction/
57-
return result + AWSConfigs.ClockOffset;
56+
return result + clockOffset;
5857
}
5958
}
6059
}

‎src/NServiceBus.AmazonSQS/MessagePump.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ async Task ProcessMessage(Message receivedMessage, CancellationToken token)
333333
return;
334334
}
335335

336-
if (!IsMessageExpired(receivedMessage, incomingMessage))
336+
if (!IsMessageExpired(receivedMessage, incomingMessage, sqsClient.Config.ClockOffset))
337337
{
338338
await ProcessMessageWithInMemoryRetries(incomingMessage, token).ConfigureAwait(false);
339339
}
@@ -398,7 +398,7 @@ async Task ProcessMessageWithInMemoryRetries(IncomingMessage incomingMessage, Ca
398398
}
399399
}
400400

401-
static bool IsMessageExpired(Message receivedMessage, IncomingMessage incomingMessage)
401+
static bool IsMessageExpired(Message receivedMessage, IncomingMessage incomingMessage, TimeSpan clockOffset)
402402
{
403403
if (!incomingMessage.Headers.TryGetValue(TransportHeaders.TimeToBeReceived, out var rawTtbr))
404404
{
@@ -412,7 +412,7 @@ static bool IsMessageExpired(Message receivedMessage, IncomingMessage incomingMe
412412
return false;
413413
}
414414

415-
var sentDateTime = receivedMessage.GetSentDateTime();
415+
var sentDateTime = receivedMessage.GetSentDateTime(clockOffset);
416416
var utcNow = DateTime.UtcNow;
417417
var expiresAt = sentDateTime + timeToBeReceived;
418418
if (expiresAt > utcNow)

‎src/NServiceBus.AmazonSQS/NServiceBus.AmazonSQS.csproj‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
54
<SignAssembly>true</SignAssembly>
65
<AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
76
<Description>An Amazon SQS transport implementation for NServiceBus</Description>
87
</PropertyGroup>
9-
108
<ItemGroup>
11-
<PackageReference Include="AWSSDK.S3" Version="[3.3.16, 3.4)" />
12-
<PackageReference Include="AWSSDK.SQS" Version="[3.3.3.2, 3.4)" />
9+
<PackageReference Include="AWSSDK.S3" Version="[3.3.18.5, 3.4)" />
10+
<PackageReference Include="AWSSDK.SQS" Version="[3.3.3.10, 3.4)" />
1311
<PackageReference Include="NServiceBus" Version="[7.0.0, 8.0.0)" />
14-
<PackageReference Include="Newtonsoft.Json" Version="[11.0.1, 12.0.0)" />
12+
<PackageReference Include="Newtonsoft.Json" Version="[12.0.1, 13.0.0)" />
1513
<PackageReference Include="Fody" Version="3.1.3" PrivateAssets="All" />
1614
<PackageReference Include="Obsolete.Fody" Version="4.4.1" PrivateAssets="All" />
1715
<PackageReference Include="Particular.CodeRules" Version="0.2.0" PrivateAssets="All" />
1816
<PackageReference Include="Particular.Packaging" Version="0.1.0" PrivateAssets="All" />
1917
</ItemGroup>
20-
2118
<ItemGroup>
2219
<PackageReference Include="SourceLink.Create.GitHub" Version="2.5.0" PrivateAssets="All" />
2320
<DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.5.0" />
2421
</ItemGroup>
25-
26-
</Project>
22+
</Project>

‎src/Tests/APIApprovals.ApproveSqsTransport.approved.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
33
[assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"TransportTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
44
[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")]
5-
65
namespace NServiceBus
76
{
8-
97
public class S3Settings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
108
{
119
public void ClientFactory(System.Func<Amazon.S3.IAmazonS3> factory) { }

‎src/Tests/Tests.csproj‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
54
<SignAssembly>true</SignAssembly>
65
<AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
76
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<ProjectReference Include="..\NServiceBus.AmazonSQS\NServiceBus.AmazonSQS.csproj" />
1210
</ItemGroup>
13-
1411
<ItemGroup>
15-
<PackageReference Include="AWSSDK.S3" Version="3.*" />
16-
<PackageReference Include="AWSSDK.SQS" Version="3.*" />
17-
<PackageReference Include="NServiceBus" Version="7.0.0" />
12+
<PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
13+
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
14+
<PackageReference Include="NServiceBus" Version="7.1.0" />
1815
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
19-
<PackageReference Include="NUnit" Version="3.7.*" />
16+
<PackageReference Include="NUnit" Version="3.11.0" />
2017
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
2118
</ItemGroup>
22-
2319
<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
2420
<PackageReference Include="ApprovalTests" Version="3.0.15" />
25-
<PackageReference Include="PublicApiGenerator" Version="6.*" />
21+
<PackageReference Include="PublicApiGenerator" Version="7.0.1" />
2622
</ItemGroup>
27-
2823
</Project>

‎src/TransportTests/TransportTests.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
3+
<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
54
<SignAssembly>true</SignAssembly>
65
<AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
76
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<ProjectReference Include="..\AcceptanceTests\AcceptanceTests.csproj" />
1210
<ProjectReference Include="..\NServiceBus.AmazonSQS\NServiceBus.AmazonSQS.csproj" />
1311
</ItemGroup>
14-
1512
<ItemGroup>
16-
<PackageReference Include="AWSSDK.S3" Version="3.*" />
17-
<PackageReference Include="AWSSDK.SQS" Version="3.*" />
13+
<PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
14+
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
1815
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
19-
<PackageReference Include="NServiceBus.TransportTests.Sources" Version="7.0.0" />
20-
<PackageReference Include="NUnit" Version="3.7.*" />
16+
<PackageReference Include="NServiceBus.TransportTests.Sources" Version="7.1.0" />
17+
<PackageReference Include="NUnit" Version="3.11.0" />
2118
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
2219
</ItemGroup>
23-
2420
</Project>

0 commit comments

Comments
 (0)