Merge pull request #260 from Particular/release-4.2

Release 4.2
Particular · Dec 11, 2018 · b248ac9 · b248ac9
2 parents 4ccbae0 + aba8711
commit b248ac9
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 45 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -5,3 +5,6 @@ branches:
     tag: beta
   release:
     tag: rc
+ignore:
+  sha:
+    - 8fb53199be08755a13ac6c1f1445052f2472578d
diff --git a/src/AcceptanceTests/AcceptanceTests.csproj b/src/AcceptanceTests/AcceptanceTests.csproj
@@ -1,23 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.AmazonSQS\NServiceBus.AmazonSQS.csproj" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.*" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.*" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.0.0" />
+    <PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="NUnit" Version="3.7.*" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>
-
 </Project>
diff --git a/src/NServiceBus.AmazonSQS/Extensions/MessageExtensions.cs b/src/NServiceBus.AmazonSQS/Extensions/MessageExtensions.cs
@@ -4,7 +4,6 @@
     using System.IO;
     using System.Threading;
     using System.Threading.Tasks;
-    using Amazon;
     using Amazon.S3;
     using Amazon.SQS.Model;
     using Transport;
@@ -48,13 +47,13 @@ static class MessageExtensions
             return new IncomingMessage(messageId, transportMessage.Headers, body);
         }
 
-        public static DateTime GetSentDateTime(this Message message)
+        public static DateTime GetSentDateTime(this Message message, TimeSpan clockOffset)
         {
             var epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
             var result = epoch.AddMilliseconds(long.Parse(message.Attributes["SentTimestamp"]));
             // Adjust for clock skew between this endpoint and aws.
             // https://aws.amazon.com/blogs/developer/clock-skew-correction/
-            return result + AWSConfigs.ClockOffset;
+            return result + clockOffset;
         }
     }
 }
diff --git a/src/NServiceBus.AmazonSQS/MessagePump.cs b/src/NServiceBus.AmazonSQS/MessagePump.cs
@@ -333,7 +333,7 @@ async Task ProcessMessage(Message receivedMessage, CancellationToken token)
                     return;
                 }
 
-                if (!IsMessageExpired(receivedMessage, incomingMessage))
+                if (!IsMessageExpired(receivedMessage, incomingMessage, sqsClient.Config.ClockOffset))
                 {
                     await ProcessMessageWithInMemoryRetries(incomingMessage, token).ConfigureAwait(false);
                 }
@@ -398,7 +398,7 @@ async Task ProcessMessageWithInMemoryRetries(IncomingMessage incomingMessage, Ca
             }
         }
 
-        static bool IsMessageExpired(Message receivedMessage, IncomingMessage incomingMessage)
+        static bool IsMessageExpired(Message receivedMessage, IncomingMessage incomingMessage, TimeSpan clockOffset)
         {
             if (!incomingMessage.Headers.TryGetValue(TransportHeaders.TimeToBeReceived, out var rawTtbr))
             {
@@ -412,7 +412,7 @@ static bool IsMessageExpired(Message receivedMessage, IncomingMessage incomingMe
                 return false;
             }
 
-            var sentDateTime = receivedMessage.GetSentDateTime();
+            var sentDateTime = receivedMessage.GetSentDateTime(clockOffset);
             var utcNow = DateTime.UtcNow;
             var expiresAt = sentDateTime + timeToBeReceived;
             if (expiresAt > utcNow)

diff --git a/src/NServiceBus.AmazonSQS/NServiceBus.AmazonSQS.csproj b/src/NServiceBus.AmazonSQS/NServiceBus.AmazonSQS.csproj
@@ -1,26 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)NServiceBus.snk</AssemblyOriginatorKeyFile>
     <Description>An Amazon SQS transport implementation for NServiceBus</Description>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="[3.3.16, 3.4)" />
-    <PackageReference Include="AWSSDK.SQS" Version="[3.3.3.2, 3.4)" />
+    <PackageReference Include="AWSSDK.S3" Version="[3.3.18.5, 3.4)" />
+    <PackageReference Include="AWSSDK.SQS" Version="[3.3.3.10, 3.4)" />
     <PackageReference Include="NServiceBus" Version="[7.0.0, 8.0.0)" />
-    <PackageReference Include="Newtonsoft.Json" Version="[11.0.1, 12.0.0)" />
+    <PackageReference Include="Newtonsoft.Json" Version="[12.0.1, 13.0.0)" />
     <PackageReference Include="Fody" Version="3.1.3" PrivateAssets="All" />
     <PackageReference Include="Obsolete.Fody" Version="4.4.1" PrivateAssets="All" />
     <PackageReference Include="Particular.CodeRules" Version="0.2.0" PrivateAssets="All" />
     <PackageReference Include="Particular.Packaging" Version="0.1.0" PrivateAssets="All" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="SourceLink.Create.GitHub" Version="2.5.0" PrivateAssets="All" />
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.5.0" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/src/Tests/APIApprovals.ApproveSqsTransport.approved.txt b/src/Tests/APIApprovals.ApproveSqsTransport.approved.txt
@@ -2,10 +2,8 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute(@"TransportTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
 [assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")]
-
 namespace NServiceBus
 {
-
     public class S3Settings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
     {
         public void ClientFactory(System.Func<Amazon.S3.IAmazonS3> factory) { }

diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,28 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\NServiceBus.AmazonSQS\NServiceBus.AmazonSQS.csproj" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.*" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.*" />
-    <PackageReference Include="NServiceBus" Version="7.0.0" />
+    <PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
+    <PackageReference Include="NServiceBus" Version="7.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="NUnit" Version="3.7.*" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
     <PackageReference Include="ApprovalTests" Version="3.0.15" />
-    <PackageReference Include="PublicApiGenerator" Version="6.*" />
+    <PackageReference Include="PublicApiGenerator" Version="7.0.1" />
   </ItemGroup>
-
 </Project>
diff --git a/src/TransportTests/TransportTests.csproj b/src/TransportTests/TransportTests.csproj
@@ -1,24 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)Test.snk</AssemblyOriginatorKeyFile>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AcceptanceTests\AcceptanceTests.csproj" />
     <ProjectReference Include="..\NServiceBus.AmazonSQS\NServiceBus.AmazonSQS.csproj" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.*" />
-    <PackageReference Include="AWSSDK.SQS" Version="3.*" />
+    <PackageReference Include="AWSSDK.S3" Version="3.3.18.5" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.10" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="7.0.0" />
-    <PackageReference Include="NUnit" Version="3.7.*" />
+    <PackageReference Include="NServiceBus.TransportTests.Sources" Version="7.1.0" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
   </ItemGroup>
-
 </Project>