Bump major (#641)

* Cleanup public API

* Bump the major

* Remove unneeded attribute

* Allow initialization to be cancelled

---------

Co-authored-by: danielmarbach <[email protected]>

Author: danielmarbach

src/Custom.Build.props

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <MinVerMinimumMajorMinor>5.0</MinVerMinimumMajorMinor>
+    <MinVerMinimumMajorMinor>6.0</MinVerMinimumMajorMinor>
     <MinVerAutoIncrement>minor</MinVerAutoIncrement>
   </PropertyGroup>
 

src/NServiceBus.AzureFunctions.Worker.ServiceBus.Tests/ApprovalFiles/APIApprovals.Approve.approved.txt

@@ -1,13 +1,11 @@
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"NServiceBus.AzureFunctions.Worker.ServiceBus.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001007f16e21368ff041183fab592d9e8ed37e7be355e93323147a1d29983d6e591b04282e4da0c9e18bd901e112c0033925eb7d7872c2f1706655891c5c9d57297994f707d16ee9a8f40d978f064ee1ffc73c0db3f4712691b23bf596f75130f4ec978cf78757ec034625a5f27e6bb50c618931ea49f6f628fd74271c32959efb1c5")]
 namespace NServiceBus
 {
-    [System.Obsolete("Use `IFunctionEndpoint` instead. Will be treated as an error from version 6.0.0. " +
-        "Will be removed in version 7.0.0.", false)]
+    [System.Obsolete("Use `IFunctionEndpoint` instead. Will be removed in version 7.0.0.", true)]
     public class FunctionEndpoint : NServiceBus.IFunctionEndpoint
     {
+        public FunctionEndpoint() { }
         public System.Threading.Tasks.Task Process(Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.Functions.Worker.ServiceBusMessageActions messageActions, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default) { }
-        [System.Obsolete(@"Change the function signature to accept a ServiceBusReceivedMessage and the ServiceBusMessageActions instead of binding to individual elements of the ServiceBusReceivedMessage. Use `Process(ServiceBusReceiveMessage message, ServiceBusMessageActions messageActions, FunctionContext functionContext, CancellationToken cancellationToken = default)` instead. Will be removed in version 6.0.0.", true)]
-        public System.Threading.Tasks.Task Process(byte[] body, System.Collections.Generic.IDictionary<string, object> userProperties, string messageId, int deliveryCount, string replyTo, string correlationId, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default) { }
         public System.Threading.Tasks.Task Publish(object message, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default) { }
         public System.Threading.Tasks.Task Publish(object message, NServiceBus.PublishOptions options, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default) { }
         public System.Threading.Tasks.Task Publish<T>(System.Action<T> messageConstructor, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default) { }
@@ -32,8 +30,6 @@ namespace NServiceBus
     public interface IFunctionEndpoint
     {
         System.Threading.Tasks.Task Process(Azure.Messaging.ServiceBus.ServiceBusReceivedMessage message, Microsoft.Azure.Functions.Worker.ServiceBusMessageActions messageActions, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default);
-        [System.Obsolete(@"Change the function signature to accept a ServiceBusReceivedMessage and the ServiceBusMessageActions instead of binding to individual elements of the ServiceBusReceivedMessage. Use `Process(ServiceBusReceiveMessage message, ServiceBusMessageActions messageActions, FunctionContext functionContext, CancellationToken cancellationToken = default)` instead. Will be removed in version 6.0.0.", true)]
-        System.Threading.Tasks.Task Process(byte[] body, System.Collections.Generic.IDictionary<string, object> userProperties, string messageId, int deliveryCount, string replyTo, string correlationId, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default);
         System.Threading.Tasks.Task Publish(object message, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default);
         System.Threading.Tasks.Task Publish(object message, NServiceBus.PublishOptions options, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default);
         System.Threading.Tasks.Task Publish<T>(System.Action<T> messageConstructor, Microsoft.Azure.Functions.Worker.FunctionContext functionContext, System.Threading.CancellationToken cancellationToken = default);

src/NServiceBus.AzureFunctions.Worker.ServiceBus/FunctionsHostBuilderExtensions.cs

@@ -149,12 +149,12 @@ static void RegisterEndpointFactory(
                 _ = services.AddSingleton(serverlessTransport);
 
                 // we are manually resolving all dependencies of FunctionEndpoint since Serverless transport is internal and we run into constructor selection issues if not
-                _ = services.AddSingleton(sp => new FunctionEndpoint(
+                _ = services.AddSingleton(sp => new InternalFunctionEndpoint(
                     sp.GetRequiredService<IStartableEndpointWithExternallyManagedContainer>(),
                     sp.GetRequiredService<ServerlessTransport>(),
                     sp));
 
-                _ = services.AddSingleton<IFunctionEndpoint>(sp => sp.GetRequiredService<FunctionEndpoint>());
+                _ = services.AddSingleton<IFunctionEndpoint>(sp => sp.GetRequiredService<InternalFunctionEndpoint>());
                 return;
 
                 string TryResolveBindingExpression()

src/NServiceBus.AzureFunctions.Worker.ServiceBus/IFunctionEndpoint.cs

@@ -1,8 +1,6 @@
 namespace NServiceBus
 {
     using System;
-    using System.Collections.Generic;
-    using System.Linq;
     using System.Threading;
     using System.Threading.Tasks;
     using Azure.Messaging.ServiceBus;
@@ -17,29 +15,7 @@ public interface IFunctionEndpoint
         /// <summary>
         /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline.
         /// </summary>
-        Task Process(
-            ServiceBusReceivedMessage message,
-            ServiceBusMessageActions messageActions,
-            FunctionContext functionContext,
-            CancellationToken cancellationToken = default) =>
-            Process(message.Body.ToArray(), message.ApplicationProperties.ToDictionary(),
-                message.MessageId, message.DeliveryCount,
-                message.ReplyTo, message.CorrelationId, functionContext,
-                cancellationToken);
-
-        /// <summary>
-        /// Processes a message received from an AzureServiceBus trigger using the NServiceBus message pipeline.
-        /// </summary>
-        [ObsoleteEx(Message = "Change the function signature to accept a ServiceBusReceivedMessage and the ServiceBusMessageActions instead of binding to individual elements of the ServiceBusReceivedMessage.", TreatAsErrorFromVersion = "5.0.0", RemoveInVersion = "6.0.0", ReplacementTypeOrMember = "Process(ServiceBusReceiveMessage message, ServiceBusMessageActions messageActions, FunctionContext functionContext, CancellationToken cancellationToken = default)")]
-        Task Process(
-            byte[] body,
-            IDictionary<string, object> userProperties,
-            string messageId,
-            int deliveryCount,
-            string replyTo,
-            string correlationId,
-            FunctionContext functionContext,
-            CancellationToken cancellationToken = default);
+        Task Process(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, FunctionContext functionContext, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Sends the provided message.

src/NServiceBus.AzureFunctions.Worker.ServiceBus/InitializationHost.cs

@@ -4,7 +4,7 @@
     using System.Threading.Tasks;
     using Microsoft.Extensions.Hosting;
 
-    class InitializationHost(FunctionEndpoint functionEndpoint) : IHostedService
+    class InitializationHost(InternalFunctionEndpoint functionEndpoint) : IHostedService
     {
         public Task StartAsync(CancellationToken cancellationToken = default) => functionEndpoint.InitializeEndpointIfNecessary(cancellationToken);
 

src/NServiceBus.AzureFunctions.Worker.ServiceBus/FunctionEndpoint.cs renamed to src/NServiceBus.AzureFunctions.Worker.ServiceBus/InternalFunctionEndpoint.cs

@@ -1,21 +1,15 @@
 namespace NServiceBus
 {
     using System;
-    using System.Collections.Generic;
     using System.Threading;
     using System.Threading.Tasks;
     using Azure.Messaging.ServiceBus;
     using AzureFunctions.Worker.ServiceBus;
     using Microsoft.Azure.Functions.Worker;
 
-    /// <summary>
-    /// An NServiceBus endpoint hosted in Azure Function which does not receive messages automatically but only handles
-    /// messages explicitly passed to it by the caller.
-    /// </summary>
-    [ObsoleteEx(TreatAsErrorFromVersion = "6", RemoveInVersion = "7", ReplacementTypeOrMember = nameof(IFunctionEndpoint))]
-    public class FunctionEndpoint : IFunctionEndpoint
+    sealed class InternalFunctionEndpoint : IFunctionEndpoint
     {
-        internal FunctionEndpoint(IStartableEndpointWithExternallyManagedContainer externallyManagedContainerEndpoint, ServerlessTransport serverlessTransport, IServiceProvider serviceProvider)
+        internal InternalFunctionEndpoint(IStartableEndpointWithExternallyManagedContainer externallyManagedContainerEndpoint, ServerlessTransport serverlessTransport, IServiceProvider serviceProvider)
         {
             this.serverlessTransport = serverlessTransport;
             this.serverlessTransport.ServiceProvider = serviceProvider;
@@ -28,28 +22,13 @@ public async Task Process(ServiceBusReceivedMessage message, ServiceBusMessageAc
         {
             FunctionsLoggerFactory.Instance.SetCurrentLogger(functionContext.GetLogger("NServiceBus"));
 
-            await InitializeEndpointIfNecessary(CancellationToken.None)
+            await InitializeEndpointIfNecessary(cancellationToken)
                 .ConfigureAwait(false);
 
             await messageProcessor.Process(message, messageActions, cancellationToken)
                 .ConfigureAwait(false);
         }
 
-        /// <inheritdoc />
-        [ObsoleteEx(Message = "Change the function signature to accept a ServiceBusReceivedMessage and the ServiceBusMessageActions instead of binding to individual elements of the ServiceBusReceivedMessage.", TreatAsErrorFromVersion = "5.0.0", RemoveInVersion = "6.0.0", ReplacementTypeOrMember = "Process(ServiceBusReceiveMessage message, ServiceBusMessageActions messageActions, FunctionContext functionContext, CancellationToken cancellationToken = default)")]
-        public Task Process(
-            byte[] body,
-            IDictionary<string, object> userProperties,
-            string messageId,
-            int deliveryCount,
-            string replyTo,
-            string correlationId,
-            FunctionContext functionContext,
-            CancellationToken cancellationToken = default) =>
-            Process(ServiceBusModelFactory.ServiceBusReceivedMessage(BinaryData.FromBytes(body),
-                properties: userProperties, messageId: messageId, deliveryCount: deliveryCount,
-                correlationId: correlationId, replyTo: replyTo), default, functionContext, cancellationToken);
-
         internal async Task InitializeEndpointIfNecessary(CancellationToken cancellationToken = default)
         {
             if (messageProcessor == null)

src/NServiceBus.AzureFunctions.Worker.ServiceBus/obsoletes-v7.cs

@@ -0,0 +1,57 @@
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
+namespace NServiceBus;
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Messaging.ServiceBus;
+using Microsoft.Azure.Functions.Worker;
+
+[ObsoleteEx(TreatAsErrorFromVersion = "6", RemoveInVersion = "7", ReplacementTypeOrMember = nameof(IFunctionEndpoint))]
+public class FunctionEndpoint : IFunctionEndpoint
+{
+    public Task Process(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions,
+        FunctionContext functionContext, CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Send(object message, SendOptions options, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Send(object message, FunctionContext functionContext, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+    public Task Send<T>(Action<T> messageConstructor, SendOptions options, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Send<T>(Action<T> messageConstructor, FunctionContext functionContext, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+    public Task Publish(object message, PublishOptions options, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Publish<T>(Action<T> messageConstructor, PublishOptions options, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Publish(object message, FunctionContext functionContext, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+    public Task Publish<T>(Action<T> messageConstructor, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Subscribe(Type eventType, SubscribeOptions options, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Subscribe(Type eventType, FunctionContext functionContext, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+
+    public Task Unsubscribe(Type eventType, UnsubscribeOptions options, FunctionContext functionContext,
+        CancellationToken cancellationToken = default) =>
+        throw new NotImplementedException();
+
+    public Task Unsubscribe(Type eventType, FunctionContext functionContext, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+}
+
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member