Threading revamp: add ThreadContext and remove Dataflow usage

.editorconfig

@@ -254,6 +254,9 @@ dotnet_diagnostic.ca1508.severity = warning # Avoid dead conditional code
 dotnet_diagnostic.ca1509.severity = warning # Invalid entry in code metrics configuration file
 dotnet_diagnostic.ca1861.severity = none # Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1861)
 
+# CA2007: Consider calling ConfigureAwait on the awaited task (this is not needed for application code, in fact we don't want to call anything but ConfigureAwait(true) which is the default)
+dotnet_diagnostic.CA2007.severity = none
+
 dotnet_diagnostic.cs8618.severity = suggestion # nullable problem
 
 

Build/Github.cs

@@ -28,11 +28,11 @@ public static async Task BuildInstallers(string token, string runId, string vers
       Content = content
     };
     request.Headers.Add("X-GitHub-Api-Version", "2022-11-28");
-    var response = await client.SendAsync(request).ConfigureAwait(false);
+    var response = await client.SendAsync(request);
     if (!response.IsSuccessStatusCode)
     {
       throw new InvalidOperationException(
-        $"{response.StatusCode} {response.ReasonPhrase} {await response.Content.ReadAsStringAsync().ConfigureAwait(false)}"
+        $"{response.StatusCode} {response.ReasonPhrase} {await response.Content.ReadAsStringAsync()}"
       );
     }
   }

Build/Program.cs

@@ -98,7 +98,7 @@ void RemoveDirectory(string d)
   VERSION,
   async () =>
   {
-    var (output, _) = await ReadAsync("dotnet", "minver -v w").ConfigureAwait(false);
+    var (output, _) = await ReadAsync("dotnet", "minver -v w");
     output = output.Trim();
     Console.WriteLine($"Version: {output}");
     Run("echo", $"\"version={output}\" >> $GITHUB_OUTPUT");

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs

@@ -78,17 +78,14 @@ public async Task Receive(string modelCardId)
           modelCard.GetReceiveInfo("ArcGIS"), // POC: get host app name from settings? same for GetSendInfo
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
           cancellationToken
-        )
-        .ConfigureAwait(false);
+        );
 
       modelCard.BakedObjectIds = receiveOperationResults.BakedObjectIds.ToList();
-      await Commands
-        .SetModelReceiveResult(
-          modelCardId,
-          receiveOperationResults.BakedObjectIds,
-          receiveOperationResults.ConversionResults
-        )
-        .ConfigureAwait(false);
+      await Commands.SetModelReceiveResult(
+        modelCardId,
+        receiveOperationResults.BakedObjectIds,
+        receiveOperationResults.ConversionResults
+      );
     }
     catch (OperationCanceledException)
     {
@@ -100,7 +97,7 @@ await Commands
     catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
     {
       _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      await Commands.SetModelError(modelCardId, ex);
     }
   }
 

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs

@@ -3,7 +3,6 @@
 using ArcGIS.Core.Data;
 using ArcGIS.Desktop.Core;
 using ArcGIS.Desktop.Editing.Events;
-using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
 using ArcGIS.Desktop.Mapping.Events;
 using Microsoft.Extensions.DependencyInjection;
@@ -93,32 +92,22 @@ MapMembersUtils mapMemberUtils
   private void SubscribeToArcGISEvents()
   {
     LayersRemovedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(async () => await GetIdsForLayersRemovedEvent(a).ConfigureAwait(false)),
+      a => _topLevelExceptionHandler.FireAndForget(async () => await GetIdsForLayersRemovedEvent(a)),
       true
     );
 
     StandaloneTablesRemovedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await GetIdsForStandaloneTablesRemovedEvent(a).ConfigureAwait(false)
-        ),
+      a => _topLevelExceptionHandler.FireAndForget(async () => await GetIdsForStandaloneTablesRemovedEvent(a)),
       true
     );
 
     MapPropertyChangedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await GetIdsForMapPropertyChangedEvent(a).ConfigureAwait(false)
-        ),
+      a => _topLevelExceptionHandler.FireAndForget(async () => await GetIdsForMapPropertyChangedEvent(a)),
       true
     ); // Map units, CRS etc.
 
     MapMemberPropertiesChangedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await GetIdsForMapMemberPropertiesChangedEvent(a).ConfigureAwait(false)
-        ),
+      a => _topLevelExceptionHandler.FireAndForget(async () => await GetIdsForMapMemberPropertiesChangedEvent(a)),
       true
     ); // e.g. Layer name
 
@@ -139,28 +128,24 @@ private void SubscribeToArcGISEvents()
 
   private void SubscribeToMapMembersDataSourceChange()
   {
-    var task = QueuedTask.Run(() =>
+    if (MapView.Active == null)
     {
-      if (MapView.Active == null)
-      {
-        return;
-      }
+      return;
+    }
 
-      // subscribe to layers
-      foreach (Layer layer in MapView.Active.Map.Layers)
-      {
-        if (layer is FeatureLayer featureLayer)
-        {
-          SubscribeToFeatureLayerDataSourceChange(featureLayer);
-        }
-      }
-      // subscribe to tables
-      foreach (StandaloneTable table in MapView.Active.Map.StandaloneTables)
+    // subscribe to layers
+    foreach (Layer layer in MapView.Active.Map.Layers)
+    {
+      if (layer is FeatureLayer featureLayer)
       {
-        SubscribeToTableDataSourceChange(table);
+        SubscribeToFeatureLayerDataSourceChange(featureLayer);
       }
-    });
-    task.Wait();
+    }
+    // subscribe to tables
+    foreach (StandaloneTable table in MapView.Active.Map.StandaloneTables)
+    {
+      SubscribeToTableDataSourceChange(table);
+    }
   }
 
   private void SubscribeToFeatureLayerDataSourceChange(FeatureLayer layer)
@@ -197,23 +182,23 @@ private void SubscribeToAnyDataSourceChange(Table layerTable)
       (args) =>
         Parent.TopLevelExceptionHandler.FireAndForget(async () =>
         {
-          await OnRowChanged(args).ConfigureAwait(false);
+          await OnRowChanged(args);
         }),
       layerTable
     );
     RowChangedEvent.Subscribe(
       (args) =>
         Parent.TopLevelExceptionHandler.FireAndForget(async () =>
         {
-          await OnRowChanged(args).ConfigureAwait(false);
+          await OnRowChanged(args);
         }),
       layerTable
     );
     RowDeletedEvent.Subscribe(
       (args) =>
         Parent.TopLevelExceptionHandler.FireAndForget(async () =>
         {
-          await OnRowChanged(args).ConfigureAwait(false);
+          await OnRowChanged(args);
         }),
       layerTable
     );
@@ -258,7 +243,7 @@ private async Task OnRowChanged(RowChangedEventArgs args)
       }
     }
 
-    await RunExpirationChecks(false).ConfigureAwait(false);
+    await RunExpirationChecks(false);
   }
 
   private async Task GetIdsForLayersRemovedEvent(LayerEventsArgs args)
@@ -267,7 +252,7 @@ private async Task GetIdsForLayersRemovedEvent(LayerEventsArgs args)
     {
       ChangedObjectIds[layer.URI] = 1;
     }
-    await RunExpirationChecks(true).ConfigureAwait(false);
+    await RunExpirationChecks(true);
   }
 
   private async Task GetIdsForStandaloneTablesRemovedEvent(StandaloneTableEventArgs args)
@@ -276,7 +261,7 @@ private async Task GetIdsForStandaloneTablesRemovedEvent(StandaloneTableEventArg
     {
       ChangedObjectIds[table.URI] = 1;
     }
-    await RunExpirationChecks(true).ConfigureAwait(false);
+    await RunExpirationChecks(true);
   }
 
   private async Task GetIdsForMapPropertyChangedEvent(MapPropertyChangedEventArgs args)
@@ -289,7 +274,7 @@ private async Task GetIdsForMapPropertyChangedEvent(MapPropertyChangedEventArgs
         ChangedObjectIds[member.URI] = 1;
       }
     }
-    await RunExpirationChecks(false).ConfigureAwait(false);
+    await RunExpirationChecks(false);
   }
 
   private void GetIdsForLayersAddedEvent(LayerEventsArgs args)
@@ -339,7 +324,7 @@ private async Task GetIdsForMapMemberPropertiesChangedEvent(MapMemberPropertiesC
       {
         ChangedObjectIds[member.URI] = 1;
       }
-      await RunExpirationChecks(false).ConfigureAwait(false);
+      await RunExpirationChecks(false);
     }
   }
 
@@ -366,64 +351,52 @@ public async Task Send(string modelCardId)
 
       CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
 
-      var sendResult = await QueuedTask
-        .Run(async () =>
+      using var scope = _serviceProvider.CreateScope();
+      scope
+        .ServiceProvider.GetRequiredService<IConverterSettingsStore<ArcGISConversionSettings>>()
+        .Initialize(
+          _arcGISConversionSettingsFactory.Create(
+            Project.Current,
+            MapView.Active.Map,
+            new CRSoffsetRotation(MapView.Active.Map)
+          )
+        );
+      List<MapMember> mapMembers = modelCard
+        .SendFilter.NotNull()
+        .RefreshObjectIds()
+        .Select(id => (MapMember)MapView.Active.Map.FindLayer(id) ?? MapView.Active.Map.FindStandaloneTable(id))
+        .Where(obj => obj != null)
+        .ToList();
+
+      if (mapMembers.Count == 0)
+      {
+        // Handle as CARD ERROR in this function
+        throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
+      }
+
+      // subscribe to the selected layer events
+      foreach (MapMember mapMember in mapMembers)
+      {
+        if (mapMember is FeatureLayer featureLayer)
         {
-          using var scope = _serviceProvider.CreateScope();
-          scope
-            .ServiceProvider.GetRequiredService<IConverterSettingsStore<ArcGISConversionSettings>>()
-            .Initialize(
-              _arcGISConversionSettingsFactory.Create(
-                Project.Current,
-                MapView.Active.Map,
-                new CRSoffsetRotation(MapView.Active.Map)
-              )
-            );
-          List<MapMember> mapMembers = modelCard
-            .SendFilter.NotNull()
-            .RefreshObjectIds()
-            .Select(id => (MapMember)MapView.Active.Map.FindLayer(id) ?? MapView.Active.Map.FindStandaloneTable(id))
-            .Where(obj => obj != null)
-            .ToList();
-
-          if (mapMembers.Count == 0)
-          {
-            // Handle as CARD ERROR in this function
-            throw new SpeckleSendFilterException(
-              "No objects were found to convert. Please update your publish filter!"
-            );
-          }
-
-          // subscribe to the selected layer events
-          foreach (MapMember mapMember in mapMembers)
-          {
-            if (mapMember is FeatureLayer featureLayer)
-            {
-              SubscribeToFeatureLayerDataSourceChange(featureLayer);
-            }
-            else if (mapMember is StandaloneTable table)
-            {
-              SubscribeToTableDataSourceChange(table);
-            }
-          }
-
-          var result = await scope
-            .ServiceProvider.GetRequiredService<SendOperation<MapMember>>()
-            .Execute(
-              mapMembers,
-              modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
-              _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
-              cancellationToken
-            )
-            .ConfigureAwait(false);
-
-          return result;
-        })
-        .ConfigureAwait(false);
-
-      await Commands
-        .SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults)
-        .ConfigureAwait(false);
+          SubscribeToFeatureLayerDataSourceChange(featureLayer);
+        }
+        else if (mapMember is StandaloneTable table)
+        {
+          SubscribeToTableDataSourceChange(table);
+        }
+      }
+
+      var sendResult = await scope
+        .ServiceProvider.GetRequiredService<SendOperation<MapMember>>()
+        .Execute(
+          mapMembers,
+          modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
+          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
+          cancellationToken
+        );
+
+      await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
     }
     catch (OperationCanceledException)
     {
@@ -435,7 +408,7 @@ await Commands
     catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
     {
       _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex).ConfigureAwait(false);
+      await Commands.SetModelError(modelCardId, ex);
     }
   }
 
@@ -470,7 +443,7 @@ private async Task RunExpirationChecks(bool idsDeleted)
       }
     }
 
-    await Commands.SetModelsExpired(expiredSenderIds).ConfigureAwait(false);
+    await Commands.SetModelsExpired(expiredSenderIds);
     ChangedObjectIds = new();
   }
 }