Bump NServiceBus.AmazonSQS

Particular · Aug 25, 2023 · a24b2da · a24b2da
1 parent 35cc943
commit a24b2da
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 12 deletions.
diff --git a/src/NServiceBus.AwsLambda.SQS/FodyWeavers.xml b/src/NServiceBus.AwsLambda.SQS/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Obsolete HideObsoleteMembers="never" />
+</Weavers>
diff --git a/src/NServiceBus.AwsLambda.SQS/FodyWeavers.xsd b/src/NServiceBus.AwsLambda.SQS/FodyWeavers.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Obsolete" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/src/NServiceBus.AwsLambda.SQS/NServiceBus.AwsLambda.SQS.csproj b/src/NServiceBus.AwsLambda.SQS/NServiceBus.AwsLambda.SQS.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -9,7 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.Core" Version="[2.1.0, 3.0.0)" />
     <PackageReference Include="Amazon.Lambda.SQSEvents" Version="[2.1.0, 3.0.0)" />
-    <PackageReference Include="NServiceBus.AmazonSQS" Version="[6.1.1, 7.0.0)" />
+    <PackageReference Include="NServiceBus.AmazonSQS" Version="7.0.0-alpha.1" />
+    <PackageReference Include="Obsolete.Fody" Version="5.3.0" PrivateAssets="All"/>
     <PackageReference Include="Particular.Packaging" Version="3.0.0" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/NServiceBus.AwsLambda.SQS/TransportWrapper/ServerlessTransport.cs b/src/NServiceBus.AwsLambda.SQS/TransportWrapper/ServerlessTransport.cs
@@ -6,7 +6,7 @@
     using NServiceBus;
     using Transport;
 
-    sealed class ServerlessTransport : TransportDefinition
+    sealed partial class ServerlessTransport : TransportDefinition
     {
         // HINT: This constant is defined in NServiceBus but is not exposed
         const string MainReceiverId = "Main";
@@ -31,15 +31,6 @@ public override async Task<TransportInfrastructure> Initialize(HostSettings host
 
         }
 
-#pragma warning disable CS0672 // Member overrides obsolete member
-#pragma warning disable CS0618 // Type or member is obsolete
-
-        public override string ToTransportAddress(QueueAddress address) => BaseTransport.ToTransportAddress(address);
-
-#pragma warning restore CS0618 // Type or member is obsolete
-#pragma warning restore CS0672 // Member overrides obsolete member
-
-
         public override IReadOnlyCollection<TransportTransactionMode> GetSupportedTransactionModes() => supportedTransactionModes;
 
         readonly TransportTransactionMode[] supportedTransactionModes =

diff --git a/src/NServiceBus.AwsLambda.SQS/obsoletes-v2.cs b/src/NServiceBus.AwsLambda.SQS/obsoletes-v2.cs
@@ -0,0 +1,17 @@
+namespace NServiceBus.AwsLambda.SQS.TransportWrapper
+{
+    using System;
+    using NServiceBus.Transport;
+
+    sealed partial class ServerlessTransport
+    {
+#pragma warning disable CS0672 // Member overrides obsolete member
+
+        [ObsoleteEx(Message = "Inject the ITransportAddressResolver type to access the address translation mechanism at runtime. See the NServiceBus version 8 upgrade guide for further details.",
+                    TreatAsErrorFromVersion = "2",
+                    RemoveInVersion = "3")]
+        public override string ToTransportAddress(QueueAddress address) => throw new NotImplementedException();
+
+#pragma warning restore CS0672 // Member overrides obsolete member
+    }
+}