Fixes

- Update naming
- Config for ooproc in AzureFunctions
- Bump version to 1.6.0

Author: andystaples

src/DurableTask.SqlServer.AzureFunctions/SqlDurabilityProviderFactory.cs

@@ -22,6 +22,8 @@ class SqlDurabilityProviderFactory : IDurabilityProviderFactory
         readonly ILoggerFactory loggerFactory;
         readonly IConnectionInfoResolver connectionInfoResolver;
 
+        readonly bool useSeparateQueueForEntityWorkItems = false;
+
         SqlDurabilityOptions? defaultOptions;
         SqlDurabilityProvider? defaultProvider;
 
@@ -37,11 +39,22 @@ class SqlDurabilityProviderFactory : IDurabilityProviderFactory
         public SqlDurabilityProviderFactory(
             IOptions<DurableTaskOptions> extensionOptions,
             ILoggerFactory loggerFactory,
-            IConnectionInfoResolver connectionInfoResolver)
+            IConnectionInfoResolver connectionInfoResolver,
+#pragma warning disable CS0612 // Type or member is obsolete
+            IPlatformInformation platformInfo)
+#pragma warning restore CS0612 // Type or member is obsolete
         {
             this.extensionOptions = extensionOptions?.Value ?? throw new ArgumentNullException(nameof(extensionOptions));
             this.loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
             this.connectionInfoResolver = connectionInfoResolver ?? throw new ArgumentNullException(nameof(connectionInfoResolver));
+
+            WorkerRuntimeType runtimeType = platformInfo.GetWorkerRuntimeType();
+            if (runtimeType == WorkerRuntimeType.DotNetIsolated ||
+                runtimeType == WorkerRuntimeType.Java ||
+                runtimeType == WorkerRuntimeType.Custom)
+            {
+                this.useSeparateQueueForEntityWorkItems = true;
+            }
         }
 
         // Called by the Durable trigger binding infrastructure
@@ -85,9 +98,11 @@ public DurabilityProvider GetDurabilityProvider(DurableClientAttribute attribute
 
         SqlOrchestrationService GetOrchestrationService(SqlDurabilityOptions clientOptions)
         {
-            return new (clientOptions.GetOrchestrationServiceSettings(
+            SqlOrchestrationServiceSettings sqlOrchestrationServiceSettings = clientOptions.GetOrchestrationServiceSettings(
                 this.extensionOptions,
-                this.connectionInfoResolver));
+                this.connectionInfoResolver);
+            sqlOrchestrationServiceSettings.UseSeparateQueueForEntityWorkItems = this.useSeparateQueueForEntityWorkItems;
+            return new(sqlOrchestrationServiceSettings);
         }
 
         static string GetDurabilityProviderKey(DurableClientAttribute attribute)

src/DurableTask.SqlServer/SqlOrchestrationService.cs

@@ -65,7 +65,7 @@ public override EntityBackendProperties EntityBackendProperties
                UseSeparateQueueForEntityWorkItems = this.settings.UseSeparateQueueForEntityWorkItems,
            };
 
-        public override EntityBackendQueries? EntityBackendQueries => new EntitySqlBackendQueries(this.EntityBackendProperties);
+        public override EntityBackendQueries? EntityBackendQueries => new EntitySqlBackendQueries(this);
 
         static SqlOrchestrationServiceSettings? ValidateSettings(SqlOrchestrationServiceSettings? settings)
         {
@@ -129,7 +129,7 @@ public override Task DeleteAsync(bool deleteInstanceStore)
         public override async Task<TaskOrchestrationWorkItem> LockNextOrchestrationWorkItemAsync(TimeSpan receiveTimeout, CancellationToken cancellationToken)
         {
 #pragma warning disable CS8603 // Possible null reference return. Need to update base signature in IEntityOrchestrationService
-            return await this.LockNextTaskOrchestrationWorkItemAsync(
+            return await this.LockNextWorkItemAsync(
                 receiveTimeout, 
                 cancellationToken,
                 OrchestrationFilterType.OrchestrationsOnly);
@@ -139,7 +139,7 @@ public override async Task<TaskOrchestrationWorkItem> LockNextOrchestrationWorkI
         public override async Task<TaskOrchestrationWorkItem> LockNextEntityWorkItemAsync(TimeSpan receiveTimeout, CancellationToken cancellationToken)
         {
 #pragma warning disable CS8603 // Possible null reference return. Need to update base signature in IEntityOrchestrationService
-            return await this.LockNextTaskOrchestrationWorkItemAsync(
+            return await this.LockNextWorkItemAsync(
                 receiveTimeout, 
                 cancellationToken,
                 OrchestrationFilterType.EntitiesOnly);
@@ -150,12 +150,13 @@ public override async Task<TaskOrchestrationWorkItem> LockNextEntityWorkItemAsyn
             TimeSpan receiveTimeout,
             CancellationToken cancellationToken)
         {
-            return await this.LockNextOrchestrationWorkItemAsync(
+            return await this.LockNextWorkItemAsync(
                 receiveTimeout,
-                cancellationToken);
+                cancellationToken,
+                OrchestrationFilterType.OrchestrationsOnly);
         }
 
-        async Task<TaskOrchestrationWorkItem?> LockNextTaskOrchestrationWorkItemAsync(
+        async Task<TaskOrchestrationWorkItem?> LockNextWorkItemAsync(
             TimeSpan receiveTimeout,
             CancellationToken cancellationToken,
             OrchestrationFilterType orchestrationFilterType = OrchestrationFilterType.All)

src/common.props

@@ -16,8 +16,8 @@
   <!-- Version settings: https://andrewlock.net/version-vs-versionsuffix-vs-packageversion-what-do-they-all-mean/ -->
   <PropertyGroup>
     <MajorVersion>1</MajorVersion>
-    <MinorVersion>5</MinorVersion>
-    <PatchVersion>2</PatchVersion>
+    <MinorVersion>6</MinorVersion>
+    <PatchVersion>0</PatchVersion>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>