fix: Minor gitconfig tweaks

.editorconfig

@@ -239,9 +239,6 @@ dotnet_diagnostic.ide0290.severity = suggestion # primary constructors: subjecti
 dotnet_diagnostic.ide0290.severity = suggestion # Use primary constructor: Subjective
 dotnet_diagnostic.ide0037.severity = suggestion # Use inferred member names: Sometimes its nice to be explicit
 dotnet_diagnostic.ide0301.severity = suggestion # Use collection expression for empty: Subjective, intent
-dotnet_diagnostic.ide0021.severity = suggestion # Use expression body for constructors : Subjective
-dotnet_diagnostic.ide0090.severity = suggestion # Simplify new expression : Subjective
-
 dotnet_diagnostic.ide0047.severity = suggestion # Parentheses preferences: IDEs don't properly pick it up
 
 # Maintainability rules

.github/workflows/main.yml

@@ -52,23 +52,18 @@ jobs:
     steps:
       - name: 🔫 Trigger Build Installers
         uses: ALEEF02/workflow-dispatch@v3.0.0
-        continue-on-error: true
         with:
           workflow: Build Installers
           repo: specklesystems/connector-installers
           token: ${{ secrets.CONNECTORS_GH_TOKEN }}
           inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }} }'
-          ref: main
+          ref: stable-installer-release
           wait-for-completion: true
           wait-for-completion-interval: 10s
           wait-for-completion-timeout: 10m
           display-workflow-run-url: true
           display-workflow-run-url-interval: 10s
 
-      - uses: geekyeggo/delete-artifact@v5
-        with:
-          name: output-*
-
   test:
     runs-on: ubuntu-latest
     steps:

Build/Consts.cs

@@ -23,15 +23,7 @@ public static class Consts
         new("Connectors/Revit/Speckle.Connectors.Revit2025", "net8.0-windows")
       ]
     ),
-    new(
-      "autocad",
-      [
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2022", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2024", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows")
-      ]
-    )
+    new("autocad", [new("Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48")])
   };
 }
 

Build/Program.cs

@@ -16,7 +16,6 @@ const string RESTORE_TOOLS = "restore-tools";
 const string BUILD_SERVER_VERSION = "build-server-version";
 const string CLEAN_LOCKS = "clean-locks";
 const string CHECK_SOLUTIONS = "check-solutions";
-const string DEEP_CLEAN = "deep-clean";
 
 //need to pass arguments
 /*var arguments = new List<string>();
@@ -41,33 +40,6 @@ Target(
   }
 );
 
-Target(
-  DEEP_CLEAN,
-  () =>
-  {
-    foreach (var f in Glob.Directories(".", "**/bin"))
-    {
-      if (f.StartsWith("Build"))
-      {
-        continue;
-      }
-      Console.WriteLine("Found and will delete: " + f);
-      Directory.Delete(f, true);
-    }
-    foreach (var f in Glob.Directories(".", "**/obj"))
-    {
-      if (f.StartsWith("Build"))
-      {
-        continue;
-      }
-      Console.WriteLine("Found and will delete: " + f);
-      Directory.Delete(f, true);
-    }
-    Console.WriteLine("Running restore now.");
-    Run("dotnet", "restore .\\Speckle.Connectors.sln --no-cache");
-  }
-);
-
 Target(
   CLEAN,
   ForEach("**/output"),

Build/Solutions.cs

@@ -45,6 +45,7 @@ public static class Solutions
 
     CheckAndRemoveKnown("Speckle.Objects");
     CheckAndRemoveKnown("Speckle.Sdk");
+    CheckAndRemoveKnown("Speckle.Sdk.Logging");
     if (localProjects.Count != 0)
     {
       throw new InvalidOperationException(

Build/packages.lock.json

@@ -30,15 +30,6 @@
           "System.Threading.Tasks.Dataflow": "8.0.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -82,11 +73,6 @@
         "resolved": "17.10.4",
         "contentHash": "wyABaqY+IHCMMSTQmcc3Ca6vbmg5BaEPgicnEgpll+4xyWZWlkQqUwafweUd9VAhBb4jqplMl6voUHQ6yfdUcg=="
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",

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

@@ -1,18 +1,12 @@
-using ArcGIS.Desktop.Core;
-using ArcGIS.Desktop.Mapping;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
-using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.ArcGIS3;
-using Speckle.Converters.ArcGIS3.Utils;
-using Speckle.Converters.Common;
+using Speckle.Connectors.Utils.Cancellation;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
@@ -22,38 +16,31 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding
   public string Name { get; } = "receiveBinding";
   private readonly CancellationManager _cancellationManager;
   private readonly DocumentModelStore _store;
-  private readonly IServiceProvider _serviceProvider;
+  private readonly IUnitOfWorkFactory _unitOfWorkFactory;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<ArcGISReceiveBinding> _logger;
-  private readonly IArcGISConversionSettingsFactory _arcGISConversionSettingsFactory;
 
   private ReceiveBindingUICommands Commands { get; }
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   public ArcGISReceiveBinding(
     DocumentModelStore store,
-    IBrowserBridge parent,
+    IBridge parent,
     CancellationManager cancellationManager,
-    IServiceProvider serviceProvider,
+    IUnitOfWorkFactory unitOfWorkFactory,
     IOperationProgressManager operationProgressManager,
-    ILogger<ArcGISReceiveBinding> logger,
-    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory
+    ILogger<ArcGISReceiveBinding> logger
   )
   {
     _store = store;
     _cancellationManager = cancellationManager;
     Parent = parent;
     Commands = new ReceiveBindingUICommands(parent);
-    _serviceProvider = serviceProvider;
+    _unitOfWorkFactory = unitOfWorkFactory;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
-    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
   }
 
-#pragma warning disable CA1024
-  public List<ICardSetting> GetReceiveSettings() => [];
-#pragma warning restore CA1024
-
   public async Task Receive(string modelCardId)
   {
     try
@@ -66,20 +53,12 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding
       }
 
       CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
-      using var scope = _serviceProvider.CreateScope();
-      scope
-        .ServiceProvider.GetRequiredService<IConverterSettingsStore<ArcGISConversionSettings>>()
-        .Initialize(
-          _arcGISConversionSettingsFactory.Create(
-            Project.Current,
-            MapView.Active.Map,
-            new CRSoffsetRotation(MapView.Active.Map)
-          )
-        );
+
+      using IUnitOfWork<ReceiveOperation> unitOfWork = _unitOfWorkFactory.Resolve<ReceiveOperation>();
+
       // Receive host objects
-      var receiveOperationResults = await scope
-        .ServiceProvider.GetRequiredService<ReceiveOperation>()
-        .Execute(
+      var receiveOperationResults = await unitOfWork
+        .Service.Execute(
           modelCard.GetReceiveInfo("ArcGIS"), // POC: get host app name from settings? same for GetSendInfo
           cancellationToken,
           (status, progress) =>

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

@@ -8,9 +8,9 @@ namespace Speckle.Connectors.ArcGIS.Bindings;
 public class ArcGISSelectionBinding : ISelectionBinding
 {
   public string Name => "selectionBinding";
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
-  public ArcGISSelectionBinding(IBrowserBridge parent)
+  public ArcGISSelectionBinding(IBridge parent)
   {
     Parent = parent;
     var topLevelHandler = parent.TopLevelExceptionHandler;

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

@@ -1,17 +1,13 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 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;
 using Microsoft.Extensions.Logging;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.ArcGIS.Filters;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Exceptions;
@@ -20,9 +16,9 @@ using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.ArcGIS3;
-using Speckle.Converters.ArcGIS3.Utils;
-using Speckle.Converters.Common;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Cancellation;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
 
@@ -32,17 +28,16 @@ public sealed class ArcGISSendBinding : ISendBinding
 {
   public string Name => "sendBinding";
   public SendBindingUICommands Commands { get; }
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly IServiceProvider _serviceProvider;
+  private readonly IUnitOfWorkFactory _unitOfWorkFactory; // POC: unused? :D
   private readonly List<ISendFilter> _sendFilters;
   private readonly CancellationManager _cancellationManager;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<ArcGISSendBinding> _logger;
   private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
-  private readonly IArcGISConversionSettingsFactory _arcGISConversionSettingsFactory;
 
   /// <summary>
   /// Used internally to aggregate the changed objects' id. Note we're using a concurrent dictionary here as the expiry check method is not thread safe, and this was causing problems. See:
@@ -57,33 +52,27 @@ public sealed class ArcGISSendBinding : ISendBinding
 
   public ArcGISSendBinding(
     DocumentModelStore store,
-    IBrowserBridge parent,
+    IBridge parent,
     IEnumerable<ISendFilter> sendFilters,
-    IServiceProvider serviceProvider,
+    IUnitOfWorkFactory unitOfWorkFactory,
     CancellationManager cancellationManager,
     ISendConversionCache sendConversionCache,
     IOperationProgressManager operationProgressManager,
-    ILogger<ArcGISSendBinding> logger,
-    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory
+    ILogger<ArcGISSendBinding> logger
   )
   {
     _store = store;
-    _serviceProvider = serviceProvider;
+    _unitOfWorkFactory = unitOfWorkFactory;
     _sendFilters = sendFilters.ToList();
     _cancellationManager = cancellationManager;
     _sendConversionCache = sendConversionCache;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
     _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
-    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
 
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
     SubscribeToArcGISEvents();
-    _store.DocumentChanged += (_, _) =>
-    {
-      _sendConversionCache.ClearCache();
-    };
   }
 
   private void SubscribeToArcGISEvents()
@@ -210,37 +199,23 @@ public sealed class ArcGISSendBinding : ISendBinding
     }
 
     // get the path of the edited dataset
-    Uri datasetPath = args.Row.GetTable().GetPath();
+    var datasetURI = args.Row.GetTable().GetPath();
 
+    // find all layers & tables reading from the dataset
     foreach (Layer layer in MapView.Active.Map.Layers)
     {
-      try
+      if (layer.GetPath() == datasetURI)
       {
-        if (layer.GetPath() == datasetPath)
-        {
-          ChangedObjectIds[layer.URI] = 1;
-        }
-      }
-      catch (UriFormatException) // layer.GetPath() or table.GetPath() can throw this error, if data source was removed from the hard drive
-      {
-        // ignore layers with invalid source URI
+        ChangedObjectIds[layer.URI] = 1;
       }
     }
     foreach (StandaloneTable table in MapView.Active.Map.StandaloneTables)
     {
-      try
+      if (table.GetPath() == datasetURI)
       {
-        if (table.GetPath() == datasetPath)
-        {
-          ChangedObjectIds[table.URI] = 1;
-        }
-      }
-      catch (UriFormatException) // layer.GetPath() or table.GetPath() can throw this error, if data source was removed from the hard drive
-      {
-        // ignore layers with invalid source URI
+        ChangedObjectIds[table.URI] = 1;
       }
     }
-
     RunExpirationChecks(false);
   }
 
@@ -350,7 +325,7 @@ public sealed class ArcGISSendBinding : ISendBinding
 
   public List<ISendFilter> GetSendFilters() => _sendFilters;
 
-  public List<ICardSetting> GetSendSettings() => [];
+  public List<CardSetting> GetSendSettings() => [];
 
   [SuppressMessage(
     "Maintainability",
@@ -360,7 +335,7 @@ public sealed class ArcGISSendBinding : ISendBinding
   public async Task Send(string modelCardId)
   {
     //poc: dupe code between connectors
-
+    using var unitOfWork = _unitOfWorkFactory.Resolve<SendOperation<MapMember>>();
     try
     {
       if (_store.GetModelById(modelCardId) is not SenderModelCard modelCard)
@@ -374,16 +349,6 @@ public sealed class ArcGISSendBinding : ISendBinding
       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()
             .GetObjectIds()
@@ -412,9 +377,8 @@ public sealed class ArcGISSendBinding : ISendBinding
             }
           }
 
-          var result = await scope
-            .ServiceProvider.GetRequiredService<SendOperation<MapMember>>()
-            .Execute(
+          var result = await unitOfWork
+            .Service.Execute(
               mapMembers,
               modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
               (status, progress) =>

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

@@ -6,9 +6,8 @@ using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
-using Speckle.Sdk;
+using Speckle.Connectors.Utils.Common;
 using Speckle.Sdk.Common;
-using ArcProject = ArcGIS.Desktop.Core.Project;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
 
@@ -16,16 +15,14 @@ namespace Speckle.Connectors.ArcGIS.Bindings;
 public class BasicConnectorBinding : IBasicConnectorBinding
 {
   public string Name => "baseBinding";
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   public BasicConnectorBindingCommands Commands { get; }
   private readonly DocumentModelStore _store;
-  private readonly ISpeckleApplication _speckleApplication;
 
-  public BasicConnectorBinding(DocumentModelStore store, IBrowserBridge parent, ISpeckleApplication speckleApplication)
+  public BasicConnectorBinding(DocumentModelStore store, IBridge parent)
   {
     _store = store;
-    _speckleApplication = speckleApplication;
     Parent = parent;
     Commands = new BasicConnectorBindingCommands(parent);
 
@@ -35,11 +32,11 @@ public class BasicConnectorBinding : IBasicConnectorBinding
     };
   }
 
-  public string GetSourceApplicationName() => _speckleApplication.Slug;
+  public string GetSourceApplicationName() => Speckle.Connectors.Utils.Connector.Slug;
 
-  public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
+  public string GetSourceApplicationVersion() => Speckle.Connectors.Utils.Connector.VersionString;
 
-  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
+  public string GetConnectorVersion() => typeof(BasicConnectorBinding).Assembly.GetVersion();
 
   public DocumentInfo? GetDocumentInfo()
   {
@@ -48,7 +45,7 @@ public class BasicConnectorBinding : IBasicConnectorBinding
       return null;
     }
 
-    return new DocumentInfo(ArcProject.Current.URI, MapView.Active.Map.Name, MapView.Active.Map.URI);
+    return new DocumentInfo(MapView.Active.Map.URI, MapView.Active.Map.Name, MapView.Active.Map.Name);
   }
 
   public DocumentModelStore GetDocumentState() => _store;

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Config.daml

@@ -47,7 +47,7 @@
 			</groups>
 			<controls>
 				<!-- add your controls here -->
-				<button id="SpeckleDUI3_SpeckleDUI3OpenButton" caption="Speckle (Beta)"
+				<button id="SpeckleDUI3_SpeckleDUI3OpenButton" caption="SpeckleNewUI"
 						className="SpeckleDUI3OpenButton" loadOnClick="true"
 						keytip="B1"
 						smallImage="Images/s2logo_16.png"
@@ -59,7 +59,7 @@
 			</controls>
 
             <dockPanes>
-                <dockPane id="SpeckleDUI3_SpeckleDUI3" caption="Speckle (Beta) for ArcGIS" className="SpeckleDUI3ViewModel" keytip="DockPane" initiallyVisible="true" dock="group" dockWith="esri_core_projectDockPane">
+                <dockPane id="SpeckleDUI3_SpeckleDUI3" caption="SpeckleNewUI" className="SpeckleDUI3ViewModel" keytip="DockPane" initiallyVisible="true" dock="group" dockWith="esri_core_projectDockPane">
                     <content className="SpeckleDUI3Wrapper" />
                 </dockPane>
             </dockPanes>

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs

@@ -1,21 +1,24 @@
 using ArcGIS.Desktop.Mapping;
-using Microsoft.Extensions.DependencyInjection;
+using Autofac;
+using Speckle.Autofac;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.ArcGIS.Bindings;
 using Speckle.Connectors.ArcGIS.Filters;
 using Speckle.Connectors.ArcGIS.HostApp;
 using Speckle.Connectors.ArcGIS.Operations.Receive;
 using Speckle.Connectors.ArcGis.Operations.Send;
 using Speckle.Connectors.ArcGIS.Utils;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
-using Speckle.Converters.Common;
+using Speckle.Connectors.Utils;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Instances;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk.Models.GraphTraversal;
 
 // POC: This is a temp reference to root object senders to tweak CI failing after having generic interfaces into common project.
@@ -23,47 +26,56 @@ using Speckle.Sdk.Models.GraphTraversal;
 
 namespace Speckle.Connectors.ArcGIS.DependencyInjection;
 
-public static class ArcGISConnectorModule
+public class ArcGISConnectorModule : ISpeckleModule
 {
-  public static void AddArcGIS(this IServiceCollection serviceCollection)
+  public void Load(SpeckleContainerBuilder builder)
   {
-    serviceCollection.AddConnectorUtils();
-    serviceCollection.AddDUI();
-    serviceCollection.AddDUIView();
+    builder.AddAutofac();
+    builder.AddConnectorUtils();
+    builder.AddDUI();
+    builder.AddDUIView();
 
-    serviceCollection.AddSingleton<DocumentModelStore, ArcGISDocumentStore>();
+    // POC: Overwriting the SyncToMainThread to SyncToCurrentThread for ArcGIS only!
+    // On SendOperation, once we called QueuedTask, it expect to run everything on same thread.
+    // builder.AddSingletonInstance<ISyncToThread, SyncToQueuedTask>();
+
+    builder.AddSingleton<DocumentModelStore, ArcGISDocumentStore>();
     // Register bindings
-    serviceCollection.AddSingleton<IBinding, TestBinding>();
-    serviceCollection.AddSingleton<IBinding, ConfigBinding>();
-    serviceCollection.AddSingleton<IBinding, AccountBinding>();
+    builder.AddSingleton<IBinding, TestBinding>();
+    builder.AddSingleton<IBinding, ConfigBinding>("connectorName", "ArcGIS"); // POC: Easier like this for now, should be cleaned up later
+    builder.AddSingleton<IBinding, AccountBinding>();
 
-    serviceCollection.RegisterTopLevelExceptionHandler();
+    builder.ContainerBuilder.RegisterType<TopLevelExceptionHandlerBinding>().As<IBinding>().AsSelf().SingleInstance();
+    builder.AddSingleton<ITopLevelExceptionHandler>(c =>
+      c.Resolve<TopLevelExceptionHandlerBinding>().Parent.TopLevelExceptionHandler
+    );
 
-    serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
-    serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBinding>();
+    builder
+      .ContainerBuilder.RegisterType<BasicConnectorBinding>()
+      .As<IBinding>()
+      .As<IBasicConnectorBinding>()
+      .SingleInstance();
 
-    serviceCollection.AddSingleton<IBinding, ArcGISSelectionBinding>();
-    serviceCollection.AddSingleton<IBinding, ArcGISSendBinding>();
-    serviceCollection.AddSingleton<IBinding, ArcGISReceiveBinding>();
+    builder.AddSingleton<IBinding, ArcGISSelectionBinding>();
+    builder.AddSingleton<IBinding, ArcGISSendBinding>();
+    builder.AddSingleton<IBinding, ArcGISReceiveBinding>();
 
-    serviceCollection.AddTransient<ISendFilter, ArcGISSelectionFilter>();
-    serviceCollection.AddScoped<IHostObjectBuilder, ArcGISHostObjectBuilder>();
-    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
+    builder.AddTransient<ISendFilter, ArcGISSelectionFilter>();
+    builder.AddScoped<IHostObjectBuilder, ArcGISHostObjectBuilder>();
+    builder.AddSingleton(DefaultTraversal.CreateTraversalFunc());
 
     // register send operation and dependencies
-    serviceCollection.AddScoped<SendOperation<MapMember>>();
-    serviceCollection.AddScoped<ArcGISRootObjectBuilder>();
-    serviceCollection.AddScoped<IRootObjectBuilder<MapMember>, ArcGISRootObjectBuilder>();
+    builder.AddScoped<SendOperation<MapMember>>();
+    builder.AddScoped<ArcGISRootObjectBuilder>();
+    builder.AddScoped<IRootObjectBuilder<MapMember>, ArcGISRootObjectBuilder>();
+    builder.AddScoped<ArcGISColorManager>();
 
-    serviceCollection.AddScoped<LocalToGlobalConverterUtils>();
-
-    serviceCollection.AddScoped<ArcGISColorManager>();
-    serviceCollection.AddScoped<MapMembersUtils>();
+    builder.AddScoped<ILocalToGlobalUnpacker, LocalToGlobalUnpacker>();
 
     // register send conversion cache
-    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();
+    builder.AddSingleton<ISendConversionCache, SendConversionCache>();
 
     // operation progress manager
-    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
+    builder.AddSingleton<IOperationProgressManager, OperationProgressManager>();
   }
 }

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Esri.ArcGISPro.Extensions30.Speckle.targets

@@ -204,8 +204,8 @@
       <CleanInfo ParameterType="System.String" Output="true"/>
     </ParameterGroup>
     <Task>
-<!--      <Reference Include="System.Xml.Linq"/>-->
-<!--      <Reference Include="System.Xml"/>-->
+      <Reference Include="System.Xml.Linq"/>
+      <Reference Include="System.Xml"/>
       <Using Namespace="System"/>
       <Using Namespace="System.IO"/>
       <Using Namespace="System.Xml.Linq"/>

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/HostApp/ArcGISColorManager.cs

@@ -1,10 +1,10 @@
 using System.Drawing;
 using ArcGIS.Core.CIM;
 using ArcGIS.Core.Data;
+using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
 using Speckle.Converters.ArcGIS3.Utils;
-using Speckle.Objects;
-using Speckle.Objects.Other;
+using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.GraphTraversal;
 using Speckle.Sdk.Models.Proxies;
@@ -15,7 +15,6 @@ public class ArcGISColorManager
 {
   private Dictionary<string, ColorProxy> ColorProxies { get; set; } = new();
   public Dictionary<string, Color> ObjectColorsIdMap { get; set; } = new();
-  public Dictionary<string, Color> ObjectMaterialsIdMap { get; set; } = new();
 
   /// <summary>
   /// Iterates through a given set of arcGIS map members (layers containing objects) and collects their colors.
@@ -71,69 +70,38 @@ public class ArcGISColorManager
     }
   }
 
-  /// <summary>
-  /// Parse Color renderMaterials  and stores in ObjectMaterialsIdMap the relationship between object ids and colors
-  /// </summary>
-  /// <param name="materialProxies"></param>
-  /// <param name="onOperationProgressed"></param>
-  public void ParseMaterials(List<RenderMaterialProxy> materialProxies, Action<string, double?>? onOperationProgressed)
-  {
-    // injected as Singleton, so we need to clean existing proxies first
-    ObjectMaterialsIdMap = new();
-    var count = 0;
-    foreach (RenderMaterialProxy colorProxy in materialProxies)
-    {
-      onOperationProgressed?.Invoke("Converting materials", (double)++count / materialProxies.Count);
-      foreach (string objectId in colorProxy.objects)
-      {
-        Color convertedColor = Color.FromArgb(colorProxy.value.diffuse);
-        ObjectMaterialsIdMap.TryAdd(objectId, convertedColor);
-      }
-    }
-  }
-
   /// <summary>
   /// Create a new CIMUniqueValueClass for UniqueRenderer per each object ID
   /// </summary>
   /// <param name="tc"></param>
   /// <param name="speckleGeometryType"></param>
-  private CIMUniqueValueClass CreateColorCategory(
-    TraversalContext tc,
-    esriGeometryType speckleGeometryType,
-    string uniqueLabel
-  )
+  private CIMUniqueValueClass CreateColorCategory(TraversalContext tc, esriGeometryType speckleGeometryType)
   {
+    Base baseObj = tc.Current;
+
     // declare default white color
     Color color = Color.FromArgb(255, 255, 255, 255);
 
     // get color moving upwards from the object
     foreach (var parent in tc.GetAscendants())
     {
-      if (parent.applicationId is string appId)
+      if (parent.applicationId is string appId && ObjectColorsIdMap.TryGetValue(appId, out Color objColor))
       {
-        if (ObjectMaterialsIdMap.TryGetValue(appId, out Color objColorMaterial))
-        {
-          color = objColorMaterial;
-          break;
-        }
-        if (ObjectColorsIdMap.TryGetValue(appId, out Color objColor))
-        {
-          color = objColor;
-          break;
-        }
+        color = objColor;
+        break;
       }
     }
 
     CIMSymbolReference symbol = CreateSymbol(speckleGeometryType, color);
 
     // First create a "CIMUniqueValueClass"
-    List<CIMUniqueValue> listUniqueValues = new() { new CIMUniqueValue { FieldValues = new string[] { uniqueLabel } } };
+    List<CIMUniqueValue> listUniqueValues = new() { new CIMUniqueValue { FieldValues = new string[] { baseObj.id } } };
 
     CIMUniqueValueClass newUniqueValueClass =
       new()
       {
         Editable = true,
-        Label = uniqueLabel,
+        Label = baseObj.id,
         Patch = PatchShape.Default,
         Symbol = symbol,
         Visible = true,
@@ -177,16 +145,12 @@ public class ArcGISColorManager
   /// </summary>
   /// <param name="tc"></param>
   /// <param name="trackerItem"></param>
-  public CIMUniqueValueRenderer? CreateOrEditLayerRenderer(
-    TraversalContext tc,
-    ObjectConversionTracker trackerItem,
-    CIMRenderer? existingRenderer
-  )
+  public async Task SetOrEditLayerRenderer(TraversalContext tc, ObjectConversionTracker trackerItem)
   {
     if (trackerItem.HostAppMapMember is not FeatureLayer fLayer)
     {
       // do nothing with non-feature layers
-      return null;
+      return;
     }
 
     // declare default grey color, create default symbol for the given layer geometry type
@@ -195,6 +159,8 @@ public class ArcGISColorManager
 
     // get existing renderer classes
     List<CIMUniqueValueClass> listUniqueValueClasses = new() { };
+    var existingRenderer = QueuedTask.Run(() => fLayer.GetRenderer()).Result;
+    // should be always UniqueRenderer, it's the only type we are creating atm
     if (existingRenderer is CIMUniqueValueRenderer uniqueRenderer)
     {
       if (uniqueRenderer.Groups[0].Classes != null)
@@ -220,26 +186,15 @@ public class ArcGISColorManager
 
     foreach (var tContext in traversalContexts)
     {
-      // get unique label
-      string uniqueLabel = tContext.Current.id;
-      if (tContext.Current is IGisFeature gisFeat)
+      CIMUniqueValueClass newUniqueValueClass = CreateColorCategory(tContext, fLayer.ShapeType);
+      if (!listUniqueValueClasses.Select(x => x.Label).Contains(newUniqueValueClass.Label))
       {
-        var existingLabel = gisFeat.attributes["Speckle_ID"];
-        if (existingLabel is string stringLabel)
-        {
-          uniqueLabel = stringLabel;
-        }
-      }
-
-      if (!listUniqueValueClasses.Select(x => x.Label).Contains(uniqueLabel))
-      {
-        CIMUniqueValueClass newUniqueValueClass = CreateColorCategory(tContext, fLayer.ShapeType, uniqueLabel);
         listUniqueValueClasses.Add(newUniqueValueClass);
       }
     }
 
     // Create a list of CIMUniqueValueGroup
-    CIMUniqueValueGroup uvg = new() { Classes = listUniqueValueClasses.ToArray(), Heading = "Speckle_ID" };
+    CIMUniqueValueGroup uvg = new() { Classes = listUniqueValueClasses.ToArray(), };
     List<CIMUniqueValueGroup> listUniqueValueGroups = new() { uvg };
     // Create the CIMUniqueValueRenderer
     CIMUniqueValueRenderer uvr =
@@ -251,7 +206,9 @@ public class ArcGISColorManager
         Groups = listUniqueValueGroups.ToArray(),
         Fields = new string[] { "Speckle_ID" }
       };
-    return uvr;
+
+    // Set the feature layer's renderer.
+    await QueuedTask.Run(() => fLayer.SetRenderer(uvr)).ConfigureAwait(false);
   }
 
   private string GetColorApplicationId(int argb, double order) => $"{argb}_{order}";
@@ -453,11 +410,11 @@ public class ArcGISColorManager
     // note: usually there is only 1 group
     foreach (CIMUniqueValueGroup group in uniqueRenderer.Groups)
     {
-      string[] fieldNames = uniqueRenderer.Fields;
+      string[] headings = group.Heading.Split(",");
       List<string> usedFields = new();
-      foreach (string fieldName in fieldNames)
+      foreach (string heading in headings)
       {
-        if (fields.TryGetValue(fieldName, out FieldDescription? headingField))
+        if (fields.TryGetValue(heading, out FieldDescription? headingField))
         {
           usedFields.Add(headingField.Name);
         }

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/HostApp/SyncToQueuedTask.cs

@@ -1,5 +1,5 @@
 using ArcGIS.Desktop.Framework.Threading.Tasks;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Connectors.Utils.Operations;
 
 namespace Speckle.Connectors.ArcGIS.HostApp;
 

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Receive/HostObjectBuilder.cs

@@ -5,15 +5,13 @@ using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
 using Speckle.Connectors.ArcGIS.HostApp;
 using Speckle.Connectors.ArcGIS.Utils;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Instances;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.ArcGIS3.Utils;
 using Speckle.Converters.Common;
 using Speckle.Objects.GIS;
-using Speckle.Objects.Other;
 using Speckle.Sdk;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
@@ -27,35 +25,32 @@ namespace Speckle.Connectors.ArcGIS.Operations.Receive;
 public class ArcGISHostObjectBuilder : IHostObjectBuilder
 {
   private readonly IRootToHostConverter _converter;
-  private readonly IFeatureClassUtils _featureClassUtils;
+  private readonly INonNativeFeaturesUtils _nonGisFeaturesUtils;
   private readonly ILocalToGlobalUnpacker _localToGlobalUnpacker;
-  private readonly LocalToGlobalConverterUtils _localToGlobalConverterUtils;
-  private readonly ICrsUtils _crsUtils;
+  private readonly ILocalToGlobalConverterUtils _localToGlobalConverterUtils;
 
   // POC: figure out the correct scope to only initialize on Receive
-  private readonly IConverterSettingsStore<ArcGISConversionSettings> _settingsStore;
+  private readonly IConversionContextStack<ArcGISDocument, Unit> _contextStack;
   private readonly GraphTraversal _traverseFunction;
   private readonly ArcGISColorManager _colorManager;
 
   public ArcGISHostObjectBuilder(
     IRootToHostConverter converter,
-    IConverterSettingsStore<ArcGISConversionSettings> settingsStore,
-    IFeatureClassUtils featureClassUtils,
+    IConversionContextStack<ArcGISDocument, Unit> contextStack,
+    INonNativeFeaturesUtils nonGisFeaturesUtils,
     ILocalToGlobalUnpacker localToGlobalUnpacker,
-    LocalToGlobalConverterUtils localToGlobalConverterUtils,
-    ICrsUtils crsUtils,
+    ILocalToGlobalConverterUtils localToGlobalConverterUtils,
     GraphTraversal traverseFunction,
     ArcGISColorManager colorManager
   )
   {
     _converter = converter;
-    _settingsStore = settingsStore;
-    _featureClassUtils = featureClassUtils;
+    _contextStack = contextStack;
+    _nonGisFeaturesUtils = nonGisFeaturesUtils;
     _localToGlobalUnpacker = localToGlobalUnpacker;
     _localToGlobalConverterUtils = localToGlobalConverterUtils;
     _traverseFunction = traverseFunction;
     _colorManager = colorManager;
-    _crsUtils = crsUtils;
   }
 
   public async Task<HostObjectBuilderResult> Build(
@@ -72,24 +67,27 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
     // Prompt the UI conversion started. Progress bar will swoosh.
     onOperationProgressed?.Invoke("Converting", null);
 
-    // get materials
-    List<RenderMaterialProxy>? materials = (rootObject[ProxyKeys.RENDER_MATERIAL] as List<object>)
-      ?.Cast<RenderMaterialProxy>()
-      .ToList();
-    if (materials != null)
-    {
-      _colorManager.ParseMaterials(materials, onOperationProgressed);
-    }
-
     // get colors
-    List<ColorProxy>? colors = (rootObject[ProxyKeys.COLOR] as List<object>)?.Cast<ColorProxy>().ToList();
+    List<ColorProxy>? colors = (rootObject["colorProxies"] as List<object>)?.Cast<ColorProxy>().ToList();
     if (colors != null)
     {
       _colorManager.ParseColors(colors, onOperationProgressed);
     }
 
+    var objectsToConvertTc = _traverseFunction
+      .Traverse(rootObject)
+      .Where(ctx => ctx.Current is not Collection || IsGISType(ctx.Current))
+      .Where(ctx => HasGISParent(ctx) is false)
+      .ToList();
+
+    var instanceDefinitionProxies = (rootObject["instanceDefinitionProxies"] as List<object>)
+      ?.Cast<InstanceDefinitionProxy>()
+      .ToList();
+
+    var objectsToConvert = _localToGlobalUnpacker.Unpack(instanceDefinitionProxies, objectsToConvertTc);
+
+    int allCount = objectsToConvert.Count;
     int count = 0;
-    List<LocalToGlobalMap> objectsToConvert = GetObjectsToConvert(rootObject);
     Dictionary<TraversalContext, ObjectConversionTracker> conversionTracker = new();
 
     // 1. convert everything
@@ -103,56 +101,52 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
       cancellationToken.ThrowIfCancellationRequested();
       try
       {
-        obj = _localToGlobalConverterUtils.TransformObjects(objectToConvert.AtomicObject, objectToConvert.Matrix);
-        object? conversionResult =
-          obj is GisNonGeometricFeature
-            ? null
-            : await QueuedTask.Run(() => _converter.Convert(obj)).ConfigureAwait(false);
-
-        string nestedLayerPath = $"{string.Join("\\", path)}";
-        if (objectToConvert.TraversalContext.Parent?.Current is not VectorLayer)
+        if (IsGISType(obj))
         {
-          nestedLayerPath += $"\\{obj.speckle_type.Split(".")[^1]}"; // add sub-layer by speckleType, for non-GIS objects
+          string nestedLayerPath = $"{string.Join("\\", path)}";
+          string datasetId = await QueuedTask.Run(() => (string)_converter.Convert(obj)).ConfigureAwait(false);
+          conversionTracker[objectToConvert.TraversalContext] = new ObjectConversionTracker(
+            obj,
+            nestedLayerPath,
+            datasetId
+          );
         }
+        else
+        {
+          obj = _localToGlobalConverterUtils.TransformObjects(objectToConvert.AtomicObject, objectToConvert.Matrix);
 
-        conversionTracker[objectToConvert.TraversalContext] = new ObjectConversionTracker(
-          obj,
-          (Geometry?)conversionResult,
-          nestedLayerPath
-        );
+          string nestedLayerPath = $"{string.Join("\\", path)}\\{obj.speckle_type.Split(".")[^1]}";
+          Geometry converted = await QueuedTask.Run(() => (Geometry)_converter.Convert(obj)).ConfigureAwait(false);
+
+          conversionTracker[objectToConvert.TraversalContext] = new ObjectConversionTracker(
+            obj,
+            nestedLayerPath,
+            converted
+          );
+        }
       }
       catch (Exception ex) when (!ex.IsFatal()) // DO NOT CATCH SPECIFIC STUFF, conversion errors should be recoverable
       {
         results.Add(new(Status.ERROR, obj, null, null, ex));
       }
-      onOperationProgressed?.Invoke("Converting", (double)++count / objectsToConvert.Count);
+      onOperationProgressed?.Invoke("Converting", (double)++count / allCount);
     }
 
-    // 2.1. Group conversionTrackers (to write into datasets)
-    onOperationProgressed?.Invoke("Grouping features into layers", null);
-    Dictionary<string, List<(TraversalContext, ObjectConversionTracker)>> convertedGroups = await QueuedTask
-      .Run(() =>
-      {
-        return _featureClassUtils.GroupConversionTrackers(conversionTracker, onOperationProgressed);
-      })
-      .ConfigureAwait(false);
-
-    // 2.2. Write groups of objects to Datasets
+    // 2. convert Database entries with non-GIS geometry datasets
     onOperationProgressed?.Invoke("Writing to Database", null);
     await QueuedTask
       .Run(() =>
       {
-        _featureClassUtils.CreateDatasets(conversionTracker, convertedGroups, onOperationProgressed);
+        _nonGisFeaturesUtils.WriteGeometriesToDatasets(conversionTracker, onOperationProgressed);
       })
       .ConfigureAwait(false);
 
-    // 3. add layer and tables to the Map and Table Of Content
-
-    // Create placeholder for GroupLayers
+    // Create placeholder for Group Layers
     Dictionary<string, GroupLayer> createdLayerGroups = new();
 
+    // 3. add layer and tables to the Table Of Content
     int bakeCount = 0;
-    Dictionary<string, (MapMember, CIMUniqueValueRenderer?)> bakedMapMembers = new();
+    Dictionary<string, MapMember> bakedMapMembers = new();
     onOperationProgressed?.Invoke("Adding to Map", bakeCount);
 
     foreach (var item in conversionTracker)
@@ -177,21 +171,18 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
           )
         );
       }
-      else if (bakedMapMembers.TryGetValue(trackerItem.DatasetId, out var value))
+      else if (bakedMapMembers.TryGetValue(trackerItem.DatasetId, out MapMember? value))
       {
         // if the layer already created, just add more features to report, and more color categories
         // add layer and layer URI to tracker
-        trackerItem.AddConvertedMapMember(value.Item1);
-        trackerItem.AddLayerURI(value.Item1.URI);
+        trackerItem.AddConvertedMapMember(value);
+        trackerItem.AddLayerURI(value.URI);
         conversionTracker[item.Key] = trackerItem; // not necessary atm, but needed if we use conversionTracker further
-
-        // add color category
-        CIMUniqueValueRenderer? uvr = _colorManager.CreateOrEditLayerRenderer(item.Key, trackerItem, value.Item2);
-        // replace renderer
-        bakedMapMembers[trackerItem.DatasetId] = (value.Item1, uvr);
-
         // only add a report item
         AddResultsFromTracker(trackerItem, results);
+
+        // add color category
+        await _colorManager.SetOrEditLayerRenderer(item.Key, trackerItem).ConfigureAwait(false);
       }
       else
       {
@@ -207,51 +198,23 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
         // add layer URI to bakedIds
         bakedObjectIds.Add(trackerItem.MappedLayerURI == null ? "" : trackerItem.MappedLayerURI);
 
-        // add color category
-        CIMUniqueValueRenderer? uvr = _colorManager.CreateOrEditLayerRenderer(item.Key, trackerItem, null);
         // mark dataset as already created
-        bakedMapMembers[trackerItem.DatasetId] = (mapMember, uvr);
+        bakedMapMembers[trackerItem.DatasetId] = mapMember;
 
         // add report item
         AddResultsFromTracker(trackerItem, results);
+
+        // add color category
+        await _colorManager.SetOrEditLayerRenderer(item.Key, trackerItem).ConfigureAwait(false);
       }
       onOperationProgressed?.Invoke("Adding to Map", (double)++bakeCount / conversionTracker.Count);
     }
-
-    // apply renderers to baked layers
-    foreach (var bakedMember in bakedMapMembers)
-    {
-      if (bakedMember.Value.Item1 is FeatureLayer fLayer)
-      {
-        // Set the feature layer's renderer.
-        await QueuedTask.Run(() => fLayer.SetRenderer(bakedMember.Value.Item2)).ConfigureAwait(false);
-      }
-    }
     bakedObjectIds.AddRange(createdLayerGroups.Values.Select(x => x.URI));
 
     // TODO: validated a correct set regarding bakedobject ids
     return new(bakedObjectIds, results);
   }
 
-  private List<LocalToGlobalMap> GetObjectsToConvert(Base rootObject)
-  {
-    // keep GISlayers in the list, because they are still needed to extract CRS of the commit (code below)
-    List<TraversalContext> objectsToConvertTc = _traverseFunction.Traverse(rootObject).ToList();
-
-    // get CRS from any present VectorLayer
-    Base? vLayer = objectsToConvertTc.FirstOrDefault(x => x.Current is VectorLayer)?.Current;
-    using var crs = _crsUtils.FindSetCrsDataOnReceive(vLayer); // TODO help
-
-    // now filter the objects
-    objectsToConvertTc = objectsToConvertTc.Where(ctx => ctx.Current is not Collection).ToList();
-
-    var instanceDefinitionProxies = (rootObject[ProxyKeys.INSTANCE_DEFINITION] as List<object>)
-      ?.Cast<InstanceDefinitionProxy>()
-      .ToList();
-
-    return _localToGlobalUnpacker.Unpack(instanceDefinitionProxies, objectsToConvertTc);
-  }
-
   private void AddResultsFromTracker(ObjectConversionTracker trackerItem, List<ReceiveConversionResult> results)
   {
     if (trackerItem.MappedLayerURI == null) // should not happen
@@ -306,7 +269,8 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
     {
       // get layer details
       string? datasetId = trackerItem.DatasetId; // should not be null here
-      Uri uri = new($"{_settingsStore.Current.SpeckleDatabasePath.AbsolutePath.Replace('/', '\\')}\\{datasetId}");
+      Uri uri =
+        new($"{_contextStack.Current.Document.SpeckleDatabasePath.AbsolutePath.Replace('/', '\\')}\\{datasetId}");
       string nestedLayerName = trackerItem.NestedLayerName;
 
       // add group for the current layer
@@ -316,9 +280,8 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
       // if no general group layer found
       if (createdLayerGroups.Count == 0)
       {
-        Map map = _settingsStore.Current.Map;
+        Map map = _contextStack.Current.Document.Map;
         GroupLayer mainGroupLayer = LayerFactory.Instance.CreateGroupLayer(map, 0, $"{projectName}: {modelName}");
-        mainGroupLayer.SetExpanded(true);
         createdLayerGroups["Basic Speckle Group"] = mainGroupLayer; // key doesn't really matter here
       }
 
@@ -335,13 +298,12 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
         {
           throw new SpeckleException($"Layer '{shortName}' was not created");
         }
-        layer.SetExpanded(false);
 
         // if Scene
         // https://community.esri.com/t5/arcgis-pro-sdk-questions/sdk-equivalent-to-changing-layer-s-elevation/td-p/1346139
-        if (_settingsStore.Current.Map.IsScene)
+        if (_contextStack.Current.Document.Map.IsScene)
         {
-          var groundSurfaceLayer = _settingsStore.Current.Map.GetGroundElevationSurfaceLayer();
+          var groundSurfaceLayer = _contextStack.Current.Document.Map.GetGroundElevationSurfaceLayer();
           var layerElevationSurface = new CIMLayerElevationSurface
           {
             ElevationSurfaceLayerURI = groundSurfaceLayer.URI,
@@ -355,6 +317,7 @@ public class ArcGISHostObjectBuilder : IHostObjectBuilder
           }
         }
 
+        layer.SetExpanded(true);
         return (MapMember)layer;
       }
       catch (ArgumentException)

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs

@@ -1,22 +1,21 @@
 using System.Diagnostics;
+using ArcGIS.Core.Geometry;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
+using ArcGIS.Desktop.Internal.Mapping;
 using ArcGIS.Desktop.Mapping;
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.ArcGIS.HostApp;
-using Speckle.Connectors.ArcGIS.Utils;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.Common;
 using Speckle.Objects.GIS;
 using Speckle.Sdk;
-using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Proxies;
+using ArcLayer = ArcGIS.Desktop.Mapping.Layer;
 
 namespace Speckle.Connectors.ArcGis.Operations.Send;
 
@@ -28,33 +27,22 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
   private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly ArcGISColorManager _colorManager;
-  private readonly IConverterSettingsStore<ArcGISConversionSettings> _converterSettings;
-  private readonly MapMembersUtils _mapMemberUtils;
-  private readonly ILogger<ArcGISRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
+  private readonly IConversionContextStack<ArcGISDocument, Unit> _contextStack;
 
   public ArcGISRootObjectBuilder(
     ISendConversionCache sendConversionCache,
     ArcGISColorManager colorManager,
-    IConverterSettingsStore<ArcGISConversionSettings> converterSettings,
-    IRootToSpeckleConverter rootToSpeckleConverter,
-    MapMembersUtils mapMemberUtils,
-    ILogger<ArcGISRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
+    IConversionContextStack<ArcGISDocument, Unit> contextStack,
+    IRootToSpeckleConverter rootToSpeckleConverter
   )
   {
     _sendConversionCache = sendConversionCache;
     _colorManager = colorManager;
-    _converterSettings = converterSettings;
+    _contextStack = contextStack;
     _rootToSpeckleConverter = rootToSpeckleConverter;
-    _mapMemberUtils = mapMemberUtils;
-    _logger = logger;
-    _activityFactory = activityFactory;
   }
 
-#pragma warning disable CA1506
   public async Task<RootObjectBuilderResult> Build(
-#pragma warning restore CA1506
     IReadOnlyList<MapMember> objects,
     SendInfo sendInfo,
     Action<string, double?>? onOperationProgressed = null,
@@ -67,134 +55,110 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
     int count = 0;
 
     Collection rootObjectCollection = new() { name = MapView.Active.Map.Name }; //TODO: Collections
-    rootObjectCollection["units"] = _converterSettings.Current.SpeckleUnits;
 
     List<SendConversionResult> results = new(objects.Count);
     var cacheHitCount = 0;
     List<(GroupLayer, Collection)> nestedGroups = new();
 
     // reorder selected layers by Table of Content (TOC) order
-    List<(MapMember, int)> layersWithDisplayPriority = _mapMemberUtils.GetLayerDisplayPriority(
-      MapView.Active.Map,
-      objects
-    );
+    List<(MapMember, int)> layersWithDisplayPriority = GetLayerDisplayPriority(MapView.Active.Map, objects);
 
-    onOperationProgressed?.Invoke("Converting", null);
-    using (var __ = _activityFactory.Start("Converting objects"))
+    foreach ((MapMember mapMember, _) in layersWithDisplayPriority)
     {
-      foreach ((MapMember mapMember, _) in layersWithDisplayPriority)
+      ct.ThrowIfCancellationRequested();
+      var collectionHost = rootObjectCollection;
+      var applicationId = mapMember.URI;
+      Base converted;
+
+      try
       {
-        ct.ThrowIfCancellationRequested();
-
-        using (var convertingActivity = _activityFactory.Start("Converting object"))
+        int groupCount = nestedGroups.Count; // bake here, because count will change in the loop
+        // if the layer is not a part of the group, reset groups
+        for (int i = 0; i < groupCount; i++)
         {
-          var collectionHost = rootObjectCollection;
-          string applicationId = mapMember.URI;
-          string sourceType = mapMember.GetType().Name;
-
-          Base converted;
-          try
+          if (nestedGroups.Count > 0 && !nestedGroups[0].Item1.Layers.Select(x => x.URI).Contains(applicationId))
           {
-            int groupCount = nestedGroups.Count; // bake here, because count will change in the loop
-            // if the layer is not a part of the group, reset groups
-            for (int i = 0; i < groupCount; i++)
-            {
-              if (nestedGroups.Count > 0 && !nestedGroups[0].Item1.Layers.Select(x => x.URI).Contains(applicationId))
-              {
-                nestedGroups.RemoveAt(0);
-              }
-              else
-              {
-                // break at the first group, which contains current layer
-                break;
-              }
-            }
-
-            // don't use cache for group layers
-            if (
-              mapMember is not GroupLayer
-              && _sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference? value)
-            )
-            {
-              converted = value;
-              cacheHitCount++;
-            }
-            else
-            {
-              if (mapMember is GroupLayer group)
-              {
-                // group layer will always come before it's contained layers
-                // keep active group last in the list
-                converted = new Collection();
-                nestedGroups.Insert(0, (group, (Collection)converted));
-              }
-              else
-              {
-                converted = await QueuedTask
-                  .Run(() => (Collection)_rootToSpeckleConverter.Convert(mapMember))
-                  .ConfigureAwait(false);
-
-                // get units & Active CRS (for writing geometry coords)
-                converted["units"] = _converterSettings.Current.SpeckleUnits;
-
-                var spatialRef = _converterSettings.Current.ActiveCRSoffsetRotation.SpatialReference;
-                converted["crs"] = new CRS
-                {
-                  wkt = spatialRef.Wkt,
-                  name = spatialRef.Name,
-                  offset_y = Convert.ToSingle(_converterSettings.Current.ActiveCRSoffsetRotation.LatOffset),
-                  offset_x = Convert.ToSingle(_converterSettings.Current.ActiveCRSoffsetRotation.LonOffset),
-                  rotation = Convert.ToSingle(_converterSettings.Current.ActiveCRSoffsetRotation.TrueNorthRadians),
-                  units_native = _converterSettings.Current.SpeckleUnits
-                };
-              }
-
-              // other common properties for layers and groups
-              converted["name"] = mapMember.Name;
-              converted.applicationId = applicationId;
-            }
-
-            if (
-              nestedGroups.Count == 0
-              || nestedGroups.Count == 1 && nestedGroups[0].Item2.applicationId == applicationId
-            )
-            {
-              // add to host if no groups, or current root group
-              collectionHost.elements.Add(converted);
-            }
-            else
-            {
-              // if we are adding a layer inside the group
-              var parentCollection = nestedGroups.FirstOrDefault(x =>
-                x.Item1.Layers.Select(y => y.URI).Contains(applicationId)
-              );
-              parentCollection.Item2.elements.Add(converted);
-            }
-
-            results.Add(new(Status.SUCCESS, applicationId, sourceType, converted));
-            convertingActivity?.SetStatus(SdkActivityStatusCode.Ok);
+            nestedGroups.RemoveAt(0);
           }
-          catch (Exception ex) when (!ex.IsFatal())
+          else
           {
-            _logger.LogSendConversionError(ex, sourceType);
-            results.Add(new(Status.ERROR, applicationId, sourceType, null, ex));
-            convertingActivity?.SetStatus(SdkActivityStatusCode.Error);
-            convertingActivity?.RecordException(ex);
+            // break at the first group, which contains current layer
+            break;
           }
         }
 
-        onOperationProgressed?.Invoke("Converting", (double)++count / objects.Count);
-      }
-    }
+        // don't use cache for group layers
+        if (
+          mapMember is not GroupLayer
+          && _sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference value)
+        )
+        {
+          converted = value;
+          cacheHitCount++;
+        }
+        else
+        {
+          if (mapMember is GroupLayer group)
+          {
+            // group layer will always come before it's contained layers
+            // keep active group last in the list
+            converted = new Collection();
+            nestedGroups.Insert(0, (group, (Collection)converted));
+          }
+          else
+          {
+            converted = await QueuedTask
+              .Run(() => (Collection)_rootToSpeckleConverter.Convert(mapMember))
+              .ConfigureAwait(false);
 
-    if (results.All(x => x.Status == Status.ERROR))
-    {
-      throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+            // get units & Active CRS (for writing geometry coords)
+            converted["units"] = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString;
+
+            var spatialRef = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpatialReference;
+            converted["crs"] = new CRS
+            {
+              wkt = spatialRef.Wkt,
+              name = spatialRef.Name,
+              offset_y = Convert.ToSingle(_contextStack.Current.Document.ActiveCRSoffsetRotation.LatOffset),
+              offset_x = Convert.ToSingle(_contextStack.Current.Document.ActiveCRSoffsetRotation.LonOffset),
+              rotation = Convert.ToSingle(_contextStack.Current.Document.ActiveCRSoffsetRotation.TrueNorthRadians),
+              units_native = _contextStack.Current.Document.ActiveCRSoffsetRotation.SpeckleUnitString,
+            };
+          }
+
+          // other common properties for layers and groups
+          converted["name"] = mapMember.Name;
+          converted.applicationId = applicationId;
+        }
+
+        if (nestedGroups.Count == 0 || nestedGroups.Count == 1 && nestedGroups[0].Item2.applicationId == applicationId)
+        {
+          // add to host if no groups, or current root group
+          collectionHost.elements.Add(converted);
+        }
+        else
+        {
+          // if we are adding a layer inside the group
+          var parentCollection = nestedGroups.FirstOrDefault(x =>
+            x.Item1.Layers.Select(y => y.URI).Contains(applicationId)
+          );
+          parentCollection.Item2.elements.Add(converted);
+        }
+
+        results.Add(new(Status.SUCCESS, applicationId, mapMember.GetType().Name, converted));
+      }
+      catch (Exception ex) when (!ex.IsFatal())
+      {
+        results.Add(new(Status.ERROR, applicationId, mapMember.GetType().Name, null, ex));
+        // POC: add logging
+      }
+
+      onOperationProgressed?.Invoke("Converting", (double)++count / objects.Count);
     }
 
     // POC: Add Color Proxies
     List<ColorProxy> colorProxies = _colorManager.UnpackColors(layersWithDisplayPriority);
-    rootObjectCollection[ProxyKeys.COLOR] = colorProxies;
+    rootObjectCollection["colorProxies"] = colorProxies;
 
     // POC: Log would be nice, or can be removed.
     Debug.WriteLine(
@@ -203,4 +167,64 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<MapMember>
 
     return new RootObjectBuilderResult(rootObjectCollection, results);
   }
+
+  // Gets the layer display priority for selected layers
+  public List<(MapMember, int)> GetLayerDisplayPriority(Map map, IReadOnlyList<MapMember> mapMembers)
+  {
+    // first get all map layers
+    Dictionary<MapMember, int> layersIndices = new();
+    int count = 0;
+    var layers = map.Layers;
+    count = UnpackLayersOrder(layersIndices, layers, count);
+
+    // iterate through tables
+    foreach (var layer in map.StandaloneTables)
+    {
+      layersIndices[layer] = count + 100; // random number, will be recalculated below
+    }
+
+    // recalculate selected layer priority from all map layers
+    List<(MapMember, int)> selectedLayers = new();
+    int newCount = 0;
+    foreach (KeyValuePair<MapMember, int> valuePair in layersIndices)
+    {
+      if (mapMembers.Contains(valuePair.Key))
+      {
+        selectedLayers.Add((valuePair.Key, newCount));
+        newCount++;
+      }
+    }
+
+    return selectedLayers;
+  }
+
+  private int UnpackLayersOrder(
+    Dictionary<MapMember, int> layersIndices,
+    IEnumerable<ArcLayer> layersToUnpack,
+    int count
+  )
+  {
+    foreach (var layer in layersToUnpack)
+    {
+      switch (layer)
+      {
+        case GroupLayer subGroup:
+          layersIndices[layer] = count;
+          count++;
+          count = UnpackLayersOrder(layersIndices, subGroup.Layers, count);
+          break;
+        case ILayerContainerInternal subLayerContainerInternal:
+          layersIndices[layer] = count;
+          count++;
+          count = UnpackLayersOrder(layersIndices, subLayerContainerInternal.InternalLayers, count);
+          break;
+        default:
+          layersIndices[layer] = count;
+          count++;
+          break;
+      }
+    }
+
+    return count;
+  }
 }

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj

@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\ArcGIS\Speckle.Converters.ArcGIS3\Speckle.Converters.ArcGIS3.csproj" />
+    <ProjectReference Include="..\..\..\Converters\ArcGIS\Speckle.Converters.ArcGIS3.DependencyInjection\Speckle.Converters.ArcGIS3.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
   </ItemGroup>
 
   <Import Project="Esri.ArcGISPro.Extensions30.Speckle.targets" />

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleDUI3Wrapper.cs

@@ -1,5 +1,4 @@
 using System.Windows.Controls;
-using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.DUI.WebView;
 
 namespace Speckle.Connectors.ArcGIS;
@@ -13,6 +12,6 @@ public class SpeckleDUI3Wrapper : UserControl
 
   private void Initialize()
   {
-    Content = SpeckleModule.Current.Container.GetRequiredService<DUI3ControlWebView>();
+    Content = SpeckleModule.Current.Container.Resolve<DUI3ControlWebView>();
   }
 }

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs

@@ -1,9 +1,10 @@
+using System.IO;
+using System.Reflection;
 using ArcGIS.Desktop.Framework;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.ArcGIS.DependencyInjection;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.DUI;
-using Speckle.Converters.ArcGIS3;
+using Speckle.Autofac;
+using Speckle.Autofac.DependencyInjection;
+using Speckle.Connectors.Utils;
+using Speckle.Sdk.Common;
 using Speckle.Sdk.Host;
 using Module = ArcGIS.Desktop.Framework.Contracts.Module;
 
@@ -23,19 +24,22 @@ internal sealed class SpeckleModule : Module
   public static SpeckleModule Current =>
     s_this ??= (SpeckleModule)FrameworkApplication.FindModule("ConnectorArcGIS_Module");
 
-  public ServiceProvider Container { get; }
+  public SpeckleContainer Container { get; }
 
   public SpeckleModule()
   {
     AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolver.OnAssemblyResolve<SpeckleModule>;
 
-    var services = new ServiceCollection();
+    var builder = SpeckleContainerBuilder.CreateInstance();
     // init DI
-    _disposableLogger = services.Initialize(HostApplications.ArcGIS, GetVersion());
-    services.AddArcGIS();
-    services.AddArcGISConverters();
-    Container = services.BuildServiceProvider();
-    Container.UseDUI();
+    _disposableLogger = Connector.Initialize(HostApplications.ArcGIS, GetVersion());
+
+    Container = builder
+      .LoadAutofacModules(
+        Assembly.GetExecutingAssembly(),
+        [Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location).NotNull()]
+      )
+      .Build();
   }
 
   private HostAppVersion GetVersion()
@@ -56,7 +60,6 @@ internal sealed class SpeckleModule : Module
     //TODO - add your business logic
     //return false to ~cancel~ Application close
     _disposableLogger?.Dispose();
-    Container.Dispose();
     return true;
   }
 }

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/MapMembersUtils.cs

@@ -1,72 +0,0 @@
-using ArcGIS.Desktop.Internal.Mapping;
-using ArcGIS.Desktop.Mapping;
-
-namespace Speckle.Connectors.ArcGIS.Utils;
-
-public class MapMembersUtils
-{
-  /// <summary>
-  /// Returns all Layers and Standalone Tables present on the Map
-  /// </summary>
-  /// <param name="map"></param>
-  /// <returns></returns>
-  public List<MapMember> GetAllMapMembers(Map map)
-  {
-    // first get all map layers
-    List<MapMember> mapMembers = new();
-    var layerMapMembers = UnpackMapLayers(map.Layers);
-    mapMembers.AddRange(layerMapMembers);
-
-    // add tables
-    var standaloneTableMapMembers = UnpackMapLayers(map.StandaloneTables);
-    mapMembers.AddRange(standaloneTableMapMembers);
-    return mapMembers;
-  }
-
-  public List<MapMember> UnpackMapLayers(IEnumerable<MapMember> mapMembersToUnpack)
-  {
-    List<MapMember> mapMembers = new();
-    foreach (var layer in mapMembersToUnpack)
-    {
-      switch (layer)
-      {
-        case GroupLayer subGroup:
-          mapMembers.Add(layer);
-          var subGroupMapMembers = UnpackMapLayers(subGroup.Layers);
-          mapMembers.AddRange(subGroupMapMembers);
-          break;
-        case ILayerContainerInternal subLayerContainerInternal:
-          mapMembers.Add(layer);
-          var subLayerMapMembers = UnpackMapLayers(subLayerContainerInternal.InternalLayers);
-          mapMembers.AddRange(subLayerMapMembers);
-          break;
-        default:
-          mapMembers.Add(layer);
-          break;
-      }
-    }
-
-    return mapMembers;
-  }
-
-  // Gets the layer display priority for selected layers
-  public List<(MapMember, int)> GetLayerDisplayPriority(Map map, IReadOnlyList<MapMember> selectedMapMembers)
-  {
-    // first get all map layers
-    List<MapMember> allMapMembers = GetAllMapMembers(map);
-
-    // recalculate selected layer priority from all map layers
-    List<(MapMember, int)> selectedLayers = new();
-    int newCount = 0;
-    foreach (MapMember mapMember in allMapMembers)
-    {
-      if (selectedMapMembers.Contains(mapMember))
-      {
-        selectedLayers.Add((mapMember, newCount));
-        newCount++;
-      }
-    }
-
-    return selectedLayers;
-  }
-}

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json

@@ -10,18 +10,9 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Direct",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
@@ -105,56 +96,54 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg=="
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
@@ -189,6 +178,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -219,11 +213,6 @@
           "SQLitePCLRaw.core": "2.1.4"
         }
       },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -234,26 +223,24 @@
         "resolved": "5.0.0",
         "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
       },
-      "System.Runtime.CompilerServices.Unsafe": {
+      "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "4.5.1",
-        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
       },
-      "speckle.connectors.common": {
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -264,8 +251,14 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.arcgis3": {
         "type": "Project",
@@ -274,32 +267,44 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "speckle.converters.arcgis3.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Converters.ArcGIS3": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg=="
+      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Web.WebView2": {
@@ -310,29 +315,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Autocad/Speckle.Connectors.Autocad2022/Speckle.Connectors.Autocad2022.csproj

@@ -2,20 +2,17 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <AutoCADVersion>2022</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2022;AUTOCAD2022_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>
     <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" />
   </ItemGroup>  
   
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2022\Speckle.Converters.Autocad2022.csproj" />
+  <ItemGroup>   
+    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2022.DependencyInjection\Speckle.Converters.Autocad2022.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>

Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -71,6 +62,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -100,57 +99,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -184,6 +187,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -216,22 +224,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -245,8 +253,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -258,8 +266,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -269,21 +301,24 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -294,8 +329,14 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.autocad2022": {
         "type": "Project",
@@ -304,39 +345,55 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "speckle.converters.autocad2022.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Autofac": "[5.2.0, )",
+          "Speckle.Converters.Autocad2022": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -346,29 +403,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj

@@ -2,20 +2,17 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <AutoCADVersion>2023</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2023;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>
     <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" />
   </ItemGroup>  
   
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2023\Speckle.Converters.Autocad2023.csproj" />
+  <ItemGroup>   
+    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2023.DependencyInjection\Speckle.Converters.Autocad2023.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>

Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -71,6 +62,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -100,57 +99,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -184,6 +187,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -216,22 +224,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -245,8 +253,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -258,8 +266,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -269,21 +301,24 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -294,8 +329,14 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.autocad2023": {
         "type": "Project",
@@ -304,39 +345,55 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "speckle.converters.autocad2023.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Autofac": "[5.2.0, )",
+          "Speckle.Converters.Autocad2023": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -346,29 +403,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Autocad/Speckle.Connectors.Autocad2024/Speckle.Connectors.Autocad2024.csproj

@@ -2,12 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <AutoCADVersion>2024</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2024;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>
@@ -15,7 +12,7 @@
   </ItemGroup>  
   
   <ItemGroup>   
-    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2024\Speckle.Converters.Autocad2024.csproj" />
+    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2024.DependencyInjection\Speckle.Converters.Autocad2024.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>

Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -71,6 +62,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -100,57 +99,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -184,6 +187,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -216,22 +224,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -245,8 +253,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -258,8 +266,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -269,21 +301,24 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -294,8 +329,14 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.autocad2024": {
         "type": "Project",
@@ -305,39 +346,55 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "speckle.converters.autocad2024.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Autofac": "[5.2.0, )",
+          "Speckle.Converters.Autocad2024": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -347,29 +404,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Autocad/Speckle.Connectors.Autocad2025/Speckle.Connectors.Autocad2025.csproj

@@ -2,14 +2,11 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <AutoCADVersion>2025</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD2025;AUTOCAD</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>
@@ -18,7 +15,7 @@
   </ItemGroup>  
   
   <ItemGroup>   
-    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2025\Speckle.Converters.Autocad2025.csproj" />
+    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2025.DependencyInjection\Speckle.Converters.Autocad2025.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>

Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     "net8.0-windows7.0": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -99,56 +90,54 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg=="
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
@@ -183,6 +172,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -213,11 +207,6 @@
           "SQLitePCLRaw.core": "2.1.4"
         }
       },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -228,26 +217,24 @@
         "resolved": "5.0.0",
         "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
       },
-      "System.Runtime.CompilerServices.Unsafe": {
+      "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "4.5.1",
-        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
       },
-      "speckle.connectors.common": {
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -258,8 +245,14 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.autocad2025": {
         "type": "Project",
@@ -269,39 +262,52 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "speckle.converters.autocad2025.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Autofac": "[5.2.0, )",
+          "Speckle.Converters.Autocad2025": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg=="
+      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -311,29 +317,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs

@@ -1,10 +1,10 @@
 using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Connectors.Utils.Common;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
 using Speckle.Sdk.Credentials;
@@ -13,44 +13,31 @@ namespace Speckle.Connectors.Autocad.Bindings;
 
 public class AutocadBasicConnectorBinding : IBasicConnectorBinding
 {
-  private readonly IAccountManager _accountManager;
   public string Name { get; set; } = "baseBinding";
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly ISpeckleApplication _speckleApplication;
-  private readonly ILogger<AutocadBasicConnectorBinding> _logger;
 
   public BasicConnectorBindingCommands Commands { get; }
 
-  public AutocadBasicConnectorBinding(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    IAccountManager accountManager,
-    ISpeckleApplication speckleApplication,
-    ILogger<AutocadBasicConnectorBinding> logger
-  )
+  public AutocadBasicConnectorBinding(DocumentModelStore store, IBridge parent)
   {
     _store = store;
     Parent = parent;
-    _accountManager = accountManager;
-    _speckleApplication = speckleApplication;
     Commands = new BasicConnectorBindingCommands(parent);
     _store.DocumentChanged += (_, _) =>
     {
       Commands.NotifyDocumentChanged();
     };
-
-    _logger = logger;
   }
 
-  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
+  public string GetConnectorVersion() => typeof(AutocadBasicConnectorBinding).Assembly.GetVersion();
 
-  public string GetSourceApplicationName() => _speckleApplication.Slug;
+  public string GetSourceApplicationName() => Utils.Connector.Slug;
 
-  public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
+  public string GetSourceApplicationVersion() => Utils.Connector.VersionString;
 
-  public Account[] GetAccounts() => _accountManager.GetAccounts().ToArray();
+  public Account[] GetAccounts() => AccountManager.GetAccounts().ToArray();
 
   public DocumentInfo? GetDocumentInfo()
   {
@@ -95,10 +82,8 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding
     var objectIds = Array.Empty<ObjectId>();
 
     var model = _store.GetModelById(modelCardId);
-
     if (model == null)
     {
-      _logger.LogError("Model was null when highlighting received model");
       return;
     }
 

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs

@@ -1,15 +1,12 @@
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
-using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.Autocad;
-using Speckle.Converters.Common;
+using Speckle.Connectors.Utils.Cancellation;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk;
 
 namespace Speckle.Connectors.Autocad.Bindings;
@@ -17,52 +14,39 @@ namespace Speckle.Connectors.Autocad.Bindings;
 public sealed class AutocadReceiveBinding : IReceiveBinding
 {
   public string Name => "receiveBinding";
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
   private readonly CancellationManager _cancellationManager;
-  private readonly IServiceProvider _serviceProvider;
+  private readonly IUnitOfWorkFactory _unitOfWorkFactory;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<AutocadReceiveBinding> _logger;
-  private readonly IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
-  private readonly ISpeckleApplication _speckleApplication;
 
   private ReceiveBindingUICommands Commands { get; }
 
   public AutocadReceiveBinding(
     DocumentModelStore store,
-    IBrowserBridge parent,
+    IBridge parent,
     CancellationManager cancellationManager,
-    IServiceProvider serviceProvider,
+    IUnitOfWorkFactory unitOfWorkFactory,
     IOperationProgressManager operationProgressManager,
-    ILogger<AutocadReceiveBinding> logger,
-    IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
+    ILogger<AutocadReceiveBinding> logger
   )
   {
     _store = store;
     _cancellationManager = cancellationManager;
-    _serviceProvider = serviceProvider;
+    _unitOfWorkFactory = unitOfWorkFactory;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
-    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
-    _speckleApplication = speckleApplication;
     Parent = parent;
     Commands = new ReceiveBindingUICommands(parent);
   }
 
-#pragma warning disable CA1024
-  public List<ICardSetting> GetReceiveSettings() => [];
-#pragma warning restore CA1024
-
   public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
 
   public async Task Receive(string modelCardId)
   {
-    using var scope = _serviceProvider.CreateScope();
-    scope
-      .ServiceProvider.GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
-      .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
+    using var unitOfWork = _unitOfWorkFactory.Resolve<ReceiveOperation>();
     try
     {
       // Get receiver card
@@ -80,10 +64,9 @@ public sealed class AutocadReceiveBinding : IReceiveBinding
       Application.DocumentManager.DocumentActivationEnabled = false;
 
       // Receive host objects
-      var operationResults = await scope
-        .ServiceProvider.GetRequiredService<ReceiveOperation>()
-        .Execute(
-          modelCard.GetReceiveInfo(_speckleApplication.Slug),
+      var operationResults = await unitOfWork
+        .Service.Execute(
+          modelCard.GetReceiveInfo(Speckle.Connectors.Utils.Connector.Slug),
           cancellationToken,
           (status, progress) =>
             _operationProgressManager.SetModelProgress(

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSelectionBinding.cs

@@ -14,9 +14,9 @@ public class AutocadSelectionBinding : ISelectionBinding
 
   public string Name => "selectionBinding";
 
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
-  public AutocadSelectionBinding(IBrowserBridge parent)
+  public AutocadSelectionBinding(IBridge parent)
   {
     _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
     Parent = parent;

Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs

@@ -1,13 +1,10 @@
 using System.Collections.Concurrent;
 using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Exceptions;
@@ -16,8 +13,9 @@ using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.Autocad;
-using Speckle.Converters.Common;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Cancellation;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
 
@@ -28,19 +26,17 @@ public sealed class AutocadSendBinding : ISendBinding
   public string Name => "sendBinding";
   public SendBindingUICommands Commands { get; }
   private OperationProgressManager OperationProgressManager { get; }
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
   private readonly IAutocadIdleManager _idleManager;
   private readonly List<ISendFilter> _sendFilters;
   private readonly CancellationManager _cancellationManager;
-  private readonly IServiceProvider _serviceProvider;
+  private readonly IUnitOfWorkFactory _unitOfWorkFactory;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<AutocadSendBinding> _logger;
   private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
-  private readonly IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
-  private readonly ISpeckleApplication _speckleApplication;
 
   /// <summary>
   /// Used internally to aggregate the changed objects' id. Note we're using a concurrent dictionary here as the expiry check method is not thread safe, and this was causing problems. See:
@@ -53,27 +49,23 @@ public sealed class AutocadSendBinding : ISendBinding
   public AutocadSendBinding(
     DocumentModelStore store,
     IAutocadIdleManager idleManager,
-    IBrowserBridge parent,
+    IBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     CancellationManager cancellationManager,
-    IServiceProvider serviceProvider,
+    IUnitOfWorkFactory unitOfWorkFactory,
     ISendConversionCache sendConversionCache,
     IOperationProgressManager operationProgressManager,
-    ILogger<AutocadSendBinding> logger,
-    IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
+    ILogger<AutocadSendBinding> logger
   )
   {
     _store = store;
     _idleManager = idleManager;
-    _serviceProvider = serviceProvider;
+    _unitOfWorkFactory = unitOfWorkFactory;
     _cancellationManager = cancellationManager;
     _sendFilters = sendFilters.ToList();
     _sendConversionCache = sendConversionCache;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
-    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
-    _speckleApplication = speckleApplication;
     _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
@@ -143,7 +135,7 @@ public sealed class AutocadSendBinding : ISendBinding
 
   public List<ISendFilter> GetSendFilters() => _sendFilters;
 
-  public List<ICardSetting> GetSendSettings() => [];
+  public List<CardSetting> GetSendSettings() => [];
 
   public Task Send(string modelCardId)
   {
@@ -161,10 +153,7 @@ public sealed class AutocadSendBinding : ISendBinding
         throw new InvalidOperationException("No publish model card was found.");
       }
 
-      using var scope = _serviceProvider.CreateScope();
-      scope
-        .ServiceProvider.GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
-        .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
+      using var uow = _unitOfWorkFactory.Resolve<SendOperation<AutocadRootObject>>();
 
       CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
 
@@ -184,11 +173,10 @@ public sealed class AutocadSendBinding : ISendBinding
         throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
       }
 
-      var sendResult = await scope
-        .ServiceProvider.GetRequiredService<SendOperation<AutocadRootObject>>()
-        .Execute(
+      var sendResult = await uow
+        .Service.Execute(
           autocadObjects,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(Speckle.Connectors.Utils.Connector.Slug),
           (status, progress) =>
             _operationProgressManager.SetModelProgress(
               Parent,

Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs

@@ -1,17 +1,21 @@
 #if AUTOCAD
-using Microsoft.Extensions.DependencyInjection;
+using Speckle.Autofac.DependencyInjection;
+using Speckle.Connectors.DUI.Bindings;
 
 namespace Speckle.Connectors.Autocad.DependencyInjection;
 
-public static class AutocadConnectorModule
+public class AutocadConnectorModule : ISpeckleModule
 {
-  public static void AddAutocad(this IServiceCollection serviceCollection)
+  public void Load(SpeckleContainerBuilder builder)
   {
-    serviceCollection.AddAutocadBase();
+    SharedRegistration.Load(builder);
 
     // Operations
-    serviceCollection.LoadSend();
-    serviceCollection.LoadReceive();
+    SharedRegistration.LoadSend(builder);
+    SharedRegistration.LoadReceive(builder);
+
+    // Register bindings
+    builder.AddSingleton<IBinding, ConfigBinding>("connectorName", "Autocad"); // POC: Easier like this for now, should be cleaned up later
   }
 }
 #endif

Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs

@@ -1,14 +1,19 @@
 #if CIVIL3D
-using Microsoft.Extensions.DependencyInjection;
+
+using Speckle.Autofac.DependencyInjection;
+using Speckle.Connectors.DUI.Bindings;
 
 namespace Speckle.Connectors.Autocad.DependencyInjection;
 
-public static class Civil3dConnectorModule
+public class Civil3dConnectorModule : ISpeckleModule
 {
-  public static void AddCivil3d(this IServiceCollection serviceCollection)
+  public void Load(SpeckleContainerBuilder builder)
   {
-    serviceCollection.AddAutocadBase();
-    serviceCollection.LoadSend();
+    SharedRegistration.Load(builder);
+    SharedRegistration.LoadSend(builder);
+
+    // Register bindings
+    builder.AddSingleton<IBinding, ConfigBinding>("connectorName", "Civil3d"); // POC: Easier like this for now, should be cleaned up later
   }
 }
 #endif

Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedRegistration.cs

@@ -1,101 +1,101 @@
 using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.DependencyInjection;
+using Autofac;
+using Speckle.Autofac;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.Autocad.Bindings;
 using Speckle.Connectors.Autocad.Filters;
 using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Autocad.Operations.Receive;
 using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
+using Speckle.Connectors.Utils;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Instances;
+using Speckle.Connectors.Utils.Operations;
+using Speckle.Converters.Common;
 using Speckle.Sdk.Models.GraphTraversal;
 
 namespace Speckle.Connectors.Autocad.DependencyInjection;
 
 public static class SharedRegistration
 {
-  public static void AddAutocadBase(this IServiceCollection serviceCollection)
+  public static void Load(SpeckleContainerBuilder builder)
   {
-    serviceCollection.AddConnectorUtils();
-    serviceCollection.AddDUI();
-    serviceCollection.AddDUIView();
+    builder.AddAutofac();
+    builder.AddConnectorUtils();
+    builder.AddDUI();
+    builder.AddDUIView();
 
     // Register other connector specific types
-    serviceCollection.AddTransient<TransactionContext>();
-    serviceCollection.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext
-    serviceCollection.AddSingleton<DocumentModelStore, AutocadDocumentStore>();
-    serviceCollection.AddSingleton<AutocadContext>();
-
-    // Unpackers and builders
-    serviceCollection.AddScoped<AutocadLayerUnpacker>();
-    serviceCollection.AddScoped<AutocadLayerBaker>();
-
-    serviceCollection.AddScoped<AutocadInstanceUnpacker>();
-    serviceCollection.AddScoped<AutocadInstanceBaker>();
-
-    serviceCollection.AddScoped<AutocadGroupUnpacker>();
-    serviceCollection.AddScoped<AutocadGroupBaker>();
-
-    serviceCollection.AddScoped<AutocadColorUnpacker>();
-    serviceCollection.AddScoped<AutocadColorBaker>();
-
-    serviceCollection.AddScoped<AutocadMaterialUnpacker>();
-    serviceCollection.AddScoped<AutocadMaterialBaker>();
-
-    serviceCollection.AddSingleton<IAutocadIdleManager, AutocadIdleManager>();
+    builder.AddTransient<TransactionContext>();
+    builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext
+    builder.AddSingleton<DocumentModelStore, AutocadDocumentStore>();
+    builder.AddSingleton<AutocadContext>();
+    builder.AddScoped<AutocadGroupManager>();
+    builder.AddScoped<AutocadLayerManager>();
+    builder.AddScoped<AutocadColorManager>();
+    builder.AddScoped<AutocadMaterialManager>();
+    builder.AddSingleton<IAutocadIdleManager, AutocadIdleManager>();
+    builder.AddSingleton<IHostToSpeckleUnitConverter<UnitsValue>>();
 
     // operation progress manager
-    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
+    builder.AddSingleton<IOperationProgressManager, OperationProgressManager>();
 
     // Register bindings
-    serviceCollection.AddSingleton<IBinding, TestBinding>();
-    serviceCollection.AddSingleton<IBinding, AccountBinding>();
-    serviceCollection.AddSingleton<IBinding, AutocadSelectionBinding>();
-    serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
-    serviceCollection.AddSingleton<IBasicConnectorBinding, AutocadBasicConnectorBinding>();
-    serviceCollection.AddSingleton<IBinding, ConfigBinding>();
+    builder.AddSingleton<IBinding, TestBinding>();
+    builder.AddSingleton<IBinding, AccountBinding>();
+    builder.AddSingleton<IBinding, AutocadSelectionBinding>();
+    builder
+      .ContainerBuilder.RegisterType<AutocadBasicConnectorBinding>()
+      .As<IBinding>()
+      .As<IBasicConnectorBinding>()
+      .SingleInstance();
 
-    serviceCollection.RegisterTopLevelExceptionHandler();
+    //Top Level ExceptionHandler
+    builder.ContainerBuilder.RegisterType<TopLevelExceptionHandlerBinding>().As<IBinding>().AsSelf().SingleInstance();
+    builder.AddSingleton<ITopLevelExceptionHandler>(c =>
+      c.Resolve<TopLevelExceptionHandlerBinding>().Parent.TopLevelExceptionHandler
+    );
   }
 
-  public static void LoadSend(this IServiceCollection serviceCollection)
+  public static void LoadSend(SpeckleContainerBuilder builder)
   {
     // Operations
-    serviceCollection.AddScoped<SendOperation<AutocadRootObject>>();
+    builder.AddScoped<SendOperation<AutocadRootObject>>();
 
     // Object Builders
-    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, AutocadRootObjectBuilder>();
+    builder.AddScoped<IRootObjectBuilder<AutocadRootObject>, AutocadRootObjectBuilder>();
 
     // Register bindings
-    serviceCollection.AddSingleton<IBinding, AutocadSendBinding>();
+    builder.AddSingleton<IBinding, AutocadSendBinding>();
 
     // register send filters
-    serviceCollection.AddTransient<ISendFilter, AutocadSelectionFilter>();
+    builder.AddTransient<ISendFilter, AutocadSelectionFilter>();
 
     // register send conversion cache
-    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();
-    serviceCollection.AddScoped<
+    builder.AddSingleton<ISendConversionCache, SendConversionCache>();
+    builder.AddScoped<
       IInstanceObjectsManager<AutocadRootObject, List<Entity>>,
       InstanceObjectsManager<AutocadRootObject, List<Entity>>
     >();
+    builder.AddScoped<AutocadInstanceObjectManager>();
   }
 
-  public static void LoadReceive(this IServiceCollection serviceCollection)
+  public static void LoadReceive(SpeckleContainerBuilder builder)
   {
     // traversal
-    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
+    builder.AddSingleton(DefaultTraversal.CreateTraversalFunc());
 
     // Object Builders
-    serviceCollection.AddScoped<IHostObjectBuilder, AutocadHostObjectBuilder>();
+    builder.AddScoped<IHostObjectBuilder, AutocadHostObjectBuilder>();
 
     // Register bindings
-    serviceCollection.AddSingleton<IBinding, AutocadReceiveBinding>();
+    builder.AddSingleton<IBinding, AutocadReceiveBinding>();
   }
 }

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorBaker.cs

@@ -1,78 +0,0 @@
-using Autodesk.AutoCAD.Colors;
-using Microsoft.Extensions.Logging;
-using Speckle.Sdk;
-using Speckle.Sdk.Models.Proxies;
-using AutocadColor = Autodesk.AutoCAD.Colors.Color;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-/// <summary>
-/// Expects to be a scoped dependency for a given operation and helps with layer creation and cleanup.
-/// </summary>
-public class AutocadColorBaker
-{
-  private readonly ILogger<AutocadColorBaker> _logger;
-
-  public AutocadColorBaker(ILogger<AutocadColorBaker> logger)
-  {
-    _logger = logger;
-  }
-
-  /// <summary>
-  /// For receive operations
-  /// </summary>
-  public Dictionary<string, AutocadColor> ObjectColorsIdMap { get; } = new();
-
-  /// <summary>
-  /// Parse Color Proxies and stores in ObjectColorIdMap the relationship between object ids and colors
-  /// </summary>
-  /// <param name="colorProxies"></param>
-  /// <param name="onOperationProgressed"></param>
-  public void ParseColors(List<ColorProxy> colorProxies, Action<string, double?>? onOperationProgressed)
-  {
-    var count = 0;
-    foreach (ColorProxy colorProxy in colorProxies)
-    {
-      try
-      {
-        onOperationProgressed?.Invoke("Converting colors", (double)++count / colorProxies.Count);
-
-        // skip any colors with source = layer, since object color default source is by layer
-        if (colorProxy["source"] is string source && source == "layer")
-        {
-          continue;
-        }
-
-        foreach (string objectId in colorProxy.objects)
-        {
-          AutocadColor convertedColor = ConvertColorProxyToColor(colorProxy);
-#if NET8_0
-          ObjectColorsIdMap.TryAdd(objectId, convertedColor);
-#else
-          if (!ObjectColorsIdMap.ContainsKey(objectId))
-          {
-            ObjectColorsIdMap.Add(objectId, convertedColor);
-          }
-#endif
-        }
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed parsing color proxy");
-      }
-    }
-  }
-
-  private AutocadColor ConvertColorProxyToColor(ColorProxy colorProxy)
-  {
-    // if source = block, return a default ByBlock color
-    if (colorProxy["source"] is string source && source == "block")
-    {
-      return AutocadColor.FromColorIndex(ColorMethod.ByBlock, 0);
-    }
-
-    return colorProxy["autocadColorIndex"] is long index
-      ? AutocadColor.FromColorIndex(ColorMethod.ByAci, (short)index)
-      : AutocadColor.FromColor(System.Drawing.Color.FromArgb(colorProxy.value));
-  }
-}

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorManager.cs

@@ -0,0 +1,218 @@
+using Autodesk.AutoCAD.Colors;
+using Autodesk.AutoCAD.DatabaseServices;
+using Speckle.Connectors.Autocad.HostApp.Extensions;
+using Speckle.Connectors.Autocad.Operations.Send;
+using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Models.Proxies;
+using AutocadColor = Autodesk.AutoCAD.Colors.Color;
+
+namespace Speckle.Connectors.Autocad.HostApp;
+
+/// <summary>
+/// Expects to be a scoped dependency for a given operation and helps with layer creation and cleanup.
+/// </summary>
+public class AutocadColorManager
+{
+  // POC: Will be addressed to move it into AutocadContext!
+  private Document Doc => Application.DocumentManager.MdiActiveDocument;
+
+  /// <summary>
+  /// For receive operations
+  /// </summary>
+  public Dictionary<string, AutocadColor> ObjectColorsIdMap { get; } = new();
+
+  /// <summary>
+  /// For send operations
+  /// </summary>
+  private Dictionary<string, ColorProxy> ColorProxies { get; } = new();
+  private readonly Dictionary<string, AutocadColor> _layerColorDict = new(); // keeps track of layer colors for object inheritance
+  private readonly Dictionary<string, string> _objectsByLayerDict = new(); // keeps track of ids for all objects that inherited their color by layer
+
+  /// <summary>
+  /// Processes an object's color and adds the object id to a color proxy in <see cref="ColorProxies"/> if object color is set ByAci, ByColor, or ByBlock.
+  /// Otherwise, stores the object id and color in a corresponding ByLayer dictionary for further processing block definitions after all objects are converted.
+  /// From testing, a definition object will inherit its layer's color if by layer, otherwise it will inherit the instance color settings (which we are sending with the instance).
+  /// Skips processing ByPen for now, because I don't understand what this means.
+  /// </summary>
+  /// <param name="objectId"></param>
+  /// <param name="color"></param>
+  private void ProcessObjectColor(string objectId, AutocadColor color, string? layerId = null)
+  {
+    switch (color.ColorMethod)
+    {
+      case ColorMethod.ByAci:
+      case ColorMethod.ByColor:
+      case ColorMethod.ByBlock:
+        AddObjectIdToColorProxy(objectId, color);
+        break;
+      case ColorMethod.ByLayer:
+        if (layerId != null)
+        {
+#if NET8_0
+          _objectsByLayerDict.TryAdd(objectId, layerId);
+#else
+          if (!_objectsByLayerDict.ContainsKey(objectId))
+          {
+            _objectsByLayerDict.Add(objectId, layerId);
+          }
+#endif
+        }
+        break;
+      case ColorMethod.ByPen: // POC: no idea what this means
+        break;
+    }
+  }
+
+  private void AddObjectIdToColorProxy(string objectId, AutocadColor color)
+  {
+    string colorId = color.GetSpeckleApplicationId();
+    if (ColorProxies.TryGetValue(colorId, out ColorProxy? proxy))
+    {
+      proxy.objects.Add(objectId);
+    }
+    else
+    {
+      ColorProxy newColor = ConvertColorToColorProxy(color);
+      newColor.objects.Add(objectId);
+      ColorProxies[colorId] = newColor;
+    }
+  }
+
+  private ColorProxy ConvertColorToColorProxy(AutocadColor color)
+  {
+    int argb = color.ColorValue.ToArgb();
+    string name = color.ColorNameForDisplay;
+    string id = color.GetSpeckleApplicationId();
+
+    ColorProxy colorProxy = new(argb, id, name) { objects = new() };
+
+    // add the color source as well for receiving in other apps
+    // POC: in order to support full fidelity color support across autocad and rhino, we need to keep track of the color source property. Not sure if this is the best place to keep track of the source, vs on a ColorSourceProxy or as a property on the atomic object.
+    colorProxy["source"] = color.IsByBlock
+      ? "block"
+      : color.IsByLayer
+        ? "layer"
+        : "object";
+
+    // set additional properties if by aci or by block
+    // ByBlock colors for some reason do not have their color value set to the correct color (white): instead it's a near-black
+    // ByACI is an Autocad internal index for set rgb values, which effects name presentation, see: https://gohtx.com/acadcolors.php
+    if (color.IsByAci)
+    {
+      colorProxy["autocadColorIndex"] = (int)color.ColorIndex;
+    }
+    else if (color.IsByBlock)
+    {
+      colorProxy.value = -1;
+    }
+
+    return colorProxy;
+  }
+
+  /// <summary>
+  /// Processes colors for definition objects that had their colors inherited. This method is in place primarily to process complex color inheritance in blocks.
+  /// </summary>
+  /// <returns></returns>
+  /// <remarks>
+  /// We are **always setting the color** (treating it as ColorMethod.ByColor) for definition objects with color "ByLayer" because this overrides instance color, to guarantee they look correct in the viewer and when receiving.
+  /// </remarks>
+  public void ProcessDefinitionObjects(List<InstanceDefinitionProxy> definitions)
+  {
+    // process all definition objects, while removing process objects from the by block color dict as necessary
+    foreach (InstanceDefinitionProxy definition in definitions)
+    {
+      foreach (string objectId in definition.objects)
+      {
+        if (_objectsByLayerDict.TryGetValue(objectId, out string? layerId))
+        {
+          if (_layerColorDict.TryGetValue(layerId, out AutocadColor? layerColor))
+          {
+            AddObjectIdToColorProxy(objectId, layerColor);
+          }
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Iterates through a given set of autocad objects, layers, and definitions to collect atomic object colors.
+  /// </summary>
+  /// <param name="unpackedAutocadRootObjects">atomic root objects, including definition objects</param>
+  /// <param name="layers">layers used by atomic objects</param>
+  /// <param name="definitions">definitions used by instances in atomic objects</param>
+  /// <returns></returns>
+  /// <remarks>
+  /// Due to complications in color inheritance for blocks, we are processing block definition object colors last.
+  /// </remarks>
+  public List<ColorProxy> UnpackColors(
+    List<AutocadRootObject> unpackedAutocadRootObjects,
+    List<LayerTableRecord> layers,
+    List<InstanceDefinitionProxy> definitions
+  )
+  {
+    // Stage 1: unpack colors from objects
+    foreach (AutocadRootObject rootObj in unpackedAutocadRootObjects)
+    {
+      Entity entity = rootObj.Root;
+      ProcessObjectColor(rootObj.ApplicationId, entity.Color, entity.LayerId.ToString());
+    }
+
+    // Stage 2: make sure we collect layer colors as well
+    foreach (LayerTableRecord layer in layers)
+    {
+      ProcessObjectColor(layer.GetSpeckleApplicationId(), layer.Color);
+      _layerColorDict.Add(layer.Id.ToString(), layer.Color);
+    }
+
+    // Stage 3: process definition objects that inherited their colors
+    ProcessDefinitionObjects(definitions);
+
+    return ColorProxies.Values.ToList();
+  }
+
+  public AutocadColor ConvertColorProxyToColor(ColorProxy colorProxy)
+  {
+    // if source = block, return a default ByBlock color
+    if (colorProxy["source"] is string source && source == "block")
+    {
+      return AutocadColor.FromColorIndex(ColorMethod.ByBlock, 0);
+    }
+
+    return colorProxy["autocadColorIndex"] is long index
+      ? AutocadColor.FromColorIndex(ColorMethod.ByAci, (short)index)
+      : AutocadColor.FromColor(System.Drawing.Color.FromArgb(colorProxy.value));
+  }
+
+  /// <summary>
+  /// Parse Color Proxies and stores in ObjectColorIdMap the relationship between object ids and colors
+  /// </summary>
+  /// <param name="colorProxies"></param>
+  /// <param name="onOperationProgressed"></param>
+  public void ParseColors(List<ColorProxy> colorProxies, Action<string, double?>? onOperationProgressed)
+  {
+    var count = 0;
+    foreach (ColorProxy colorProxy in colorProxies)
+    {
+      onOperationProgressed?.Invoke("Converting colors", (double)++count / colorProxies.Count);
+
+      // skip any colors with source = layer, since object color default source is by layer
+      if (colorProxy["source"] is string source && source == "layer")
+      {
+        continue;
+      }
+
+      foreach (string objectId in colorProxy.objects)
+      {
+        AutocadColor convertedColor = ConvertColorProxyToColor(colorProxy);
+#if NET8_0
+        ObjectColorsIdMap.TryAdd(objectId, convertedColor);
+#else
+        if (!ObjectColorsIdMap.ContainsKey(objectId))
+        {
+          ObjectColorsIdMap.Add(objectId, convertedColor);
+        }
+#endif
+      }
+    }
+  }
+}

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadColorUnpacker.cs

@@ -1,144 +0,0 @@
-using Autodesk.AutoCAD.Colors;
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Sdk;
-using Speckle.Sdk.Models.Proxies;
-using AutocadColor = Autodesk.AutoCAD.Colors.Color;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-/// <summary>
-/// Expects to be a scoped dependency for a given operation and helps with layer creation and cleanup.
-/// </summary>
-public class AutocadColorUnpacker
-{
-  private readonly ILogger<AutocadColorUnpacker> _logger;
-
-  public AutocadColorUnpacker(ILogger<AutocadColorUnpacker> logger)
-  {
-    _logger = logger;
-  }
-
-  /// <summary>
-  /// For send operations
-  /// </summary>
-  private Dictionary<string, ColorProxy> ColorProxies { get; } = new();
-
-  /// <summary>
-  /// Iterates through a given set of autocad objects and layers to collect colors.
-  /// </summary>
-  /// <param name="unpackedAutocadRootObjects">atomic root objects, including instance objects</param>
-  /// <param name="layers">layers used by atomic objects</param>
-  /// <returns></returns>
-  public List<ColorProxy> UnpackColors(
-    List<AutocadRootObject> unpackedAutocadRootObjects,
-    List<LayerTableRecord> layers
-  )
-  {
-    // Stage 1: unpack colors from objects
-    foreach (AutocadRootObject rootObj in unpackedAutocadRootObjects)
-    {
-      try
-      {
-        Entity entity = rootObj.Root;
-        ProcessObjectColor(rootObj.ApplicationId, entity.Color);
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed to unpack colors from Autocad Entity");
-      }
-    }
-
-    // Stage 2: make sure we collect layer colors as well
-    foreach (LayerTableRecord layer in layers)
-    {
-      try
-      {
-        ProcessObjectColor(layer.GetSpeckleApplicationId(), layer.Color);
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed to unpack colors from Autocad Layer");
-      }
-    }
-
-    return ColorProxies.Values.ToList();
-  }
-
-  /// <summary>
-  /// Processes an object's color and adds the object id to a color proxy in <see cref="ColorProxies"/> if object color is set ByAci, ByColor, or ByBlock.
-  /// Skips processing ByPen for now, because I don't understand what this means.
-  /// </summary>
-  /// <param name="objectId"></param>
-  /// <param name="color"></param>
-  /// <remarks>Skips processing object colors if it is "ByLayer" since autocad commits are structured by layer and by default sets the color by layer on receive. If this ever changes, then we do need to start processing object colors by layer.</remarks>
-  private void ProcessObjectColor(string objectId, AutocadColor color)
-  {
-    switch (color.ColorMethod)
-    {
-      case ColorMethod.ByAci:
-      case ColorMethod.ByColor:
-      case ColorMethod.ByBlock:
-        AddObjectIdToColorProxy(objectId, color);
-        break;
-      case ColorMethod.ByLayer: // skipping these since autocad commits are structured by layer. Will need to be updated if this ever changes!!
-      case ColorMethod.ByPen: // POC: no idea what this means
-        break;
-    }
-  }
-
-  private void AddObjectIdToColorProxy(string objectId, AutocadColor color)
-  {
-    string colorId = color.GetSpeckleApplicationId();
-    if (ColorProxies.TryGetValue(colorId, out ColorProxy? proxy))
-    {
-      proxy.objects.Add(objectId);
-    }
-    else
-    {
-      ColorProxy newColor = ConvertColorToColorProxy(color);
-      newColor.objects.Add(objectId);
-      ColorProxies[colorId] = newColor;
-    }
-  }
-
-  private ColorProxy ConvertColorToColorProxy(AutocadColor color)
-  {
-    int argb = color.ColorValue.ToArgb();
-    string name = color.ColorNameForDisplay;
-    string id = color.GetSpeckleApplicationId();
-
-    ColorProxy colorProxy =
-      new()
-      {
-        value = argb,
-        applicationId = id,
-        name = name,
-        objects = new()
-      };
-
-    // add the color source as well for receiving in other apps
-    // POC: in order to support full fidelity color support across autocad and rhino, we need to keep track of the color source property. Not sure if this is the best place to keep track of the source, vs on a ColorSourceProxy or as a property on the atomic object.
-    colorProxy["source"] = color.IsByBlock
-      ? "block"
-      : color.IsByLayer
-        ? "layer"
-        : "object";
-
-    // set additional properties if by aci or by block
-    // ByBlock colors for some reason do not have their color value set to the correct color (white): instead it's a near-black
-    // ByACI is an Autocad internal index for set rgb values, which effects name presentation, see: https://gohtx.com/acadcolors.php
-    if (color.IsByAci)
-    {
-      colorProxy["autocadColorIndex"] = (int)color.ColorIndex;
-    }
-    else if (color.IsByBlock)
-    {
-      colorProxy.value = -1;
-    }
-
-    return colorProxy;
-  }
-}

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadGroupManager.cs

@@ -1,25 +1,63 @@
 using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Autocad.HostApp.Extensions;
+using Speckle.Connectors.Autocad.Operations.Send;
+using Speckle.Connectors.Utils.Conversion;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.Proxies;
 
 namespace Speckle.Connectors.Autocad.HostApp;
 
 /// <summary>
-/// This resource expects to be injected "fresh" in each receive operation (scoped lifetime).
-/// Extracts group information from a set of objects into proxies in send operations; also creates groups from a set of proxies in receive operations.
-/// TODO: Oguzhan! Check whats happening on second receive unless purge groups? naming etc..
+/// This resource expects to be injected "fresh" in each send/receive operation (scoped lifetime). Extracts group information from a set of objects into proxies in send operations; also creates groups from a set of proxies in receive operations.
 /// </summary>
-public class AutocadGroupBaker
+public class AutocadGroupManager
 {
-  private readonly ILogger<AutocadGroupBaker> _logger;
   private readonly AutocadContext _autocadContext;
 
-  public AutocadGroupBaker(AutocadContext autocadContext, ILogger<AutocadGroupBaker> logger)
+  public AutocadGroupManager(AutocadContext autocadContext)
   {
     _autocadContext = autocadContext;
-    _logger = logger;
+  }
+
+  /// <summary>
+  /// Unpacks a selection of atomic objects into their groups
+  /// </summary>
+  /// <param name="autocadObjects"></param>
+  /// <returns></returns>
+  public List<GroupProxy> UnpackGroups(IEnumerable<AutocadRootObject> autocadObjects)
+  {
+    var groupProxies = new Dictionary<string, GroupProxy>();
+
+    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
+
+    foreach (var (dbObject, applicationId) in autocadObjects)
+    {
+      var persistentReactorIds = dbObject.GetPersistentReactorIds();
+      foreach (ObjectId oReactorId in persistentReactorIds)
+      {
+        var obj = transaction.GetObject(oReactorId, OpenMode.ForRead);
+        if (obj is not Group group)
+        {
+          continue;
+        }
+        var groupAppId = group.GetSpeckleApplicationId();
+        if (groupProxies.TryGetValue(groupAppId, out GroupProxy? groupProxy))
+        {
+          groupProxy.objects.Add(applicationId);
+        }
+        else
+        {
+          groupProxies[groupAppId] = new()
+          {
+            applicationId = groupAppId,
+            name = group.Name,
+            objects = [applicationId]
+          };
+        }
+      }
+    }
+
+    return groupProxies.Values.ToList();
   }
 
   /// <summary>
@@ -28,7 +66,6 @@ public class AutocadGroupBaker
   /// <param name="groupProxies"></param>
   /// <param name="applicationIdMap"></param>
   /// <returns></returns>
-  // TODO: Oguzhan! Do not report here too! But this is TBD that we don't know the shape of the report yet.
   public List<ReceiveConversionResult> CreateGroups(
     IEnumerable<GroupProxy> groupProxies,
     Dictionary<string, List<Entity>> applicationIdMap
@@ -66,10 +103,9 @@ public class AutocadGroupBaker
 
         groupCreationTransaction.AddNewlyCreatedDBObject(newGroup, true);
       }
-      catch (Exception ex) when (!ex.IsFatal())
+      catch (Exception e) when (!e.IsFatal())
       {
-        results.Add(new ReceiveConversionResult(Status.ERROR, gp, null, null, ex));
-        _logger.LogError(ex, "Failed to bake Autocad Group");
+        results.Add(new ReceiveConversionResult(Status.ERROR, gp, null, null, e));
       }
     }
 

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadGroupUnpacker.cs

@@ -1,69 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Sdk;
-using Speckle.Sdk.Models.Proxies;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-/// <summary>
-/// This resource expects to be injected "fresh" in each send/receive operation (scoped lifetime). Extracts group information from a set of objects into proxies in send operations; also creates groups from a set of proxies in receive operations.
-/// </summary>
-public class AutocadGroupUnpacker
-{
-  private readonly ILogger<AutocadGroupUnpacker> _logger;
-
-  public AutocadGroupUnpacker(ILogger<AutocadGroupUnpacker> logger)
-  {
-    _logger = logger;
-  }
-
-  /// <summary>
-  /// Unpacks a selection of atomic objects into their groups
-  /// </summary>
-  /// <param name="autocadObjects"></param>
-  /// <returns></returns>
-  public List<GroupProxy> UnpackGroups(IEnumerable<AutocadRootObject> autocadObjects)
-  {
-    var groupProxies = new Dictionary<string, GroupProxy>();
-
-    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-
-    foreach (var (dbObject, applicationId) in autocadObjects)
-    {
-      try
-      {
-        var persistentReactorIds = dbObject.GetPersistentReactorIds();
-        foreach (ObjectId oReactorId in persistentReactorIds)
-        {
-          var obj = transaction.GetObject(oReactorId, OpenMode.ForRead);
-          if (obj is not Group group)
-          {
-            continue;
-          }
-          var groupAppId = group.GetSpeckleApplicationId();
-          if (groupProxies.TryGetValue(groupAppId, out GroupProxy? groupProxy))
-          {
-            groupProxy.objects.Add(applicationId);
-          }
-          else
-          {
-            groupProxies[groupAppId] = new()
-            {
-              applicationId = groupAppId,
-              name = group.Name,
-              objects = [applicationId]
-            };
-          }
-        }
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed on unpacking Autocad group");
-      }
-    }
-
-    return groupProxies.Values.ToList();
-  }
-}

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceObjectManager.cs

@@ -1,10 +1,9 @@
 using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.Geometry;
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Converters.Autocad;
+using Speckle.Connectors.Autocad.Operations.Send;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Instances;
 using Speckle.Converters.Common;
 using Speckle.DoubleNumerics;
 using Speckle.Sdk;
@@ -17,32 +16,151 @@ using AutocadColor = Autodesk.AutoCAD.Colors.Color;
 namespace Speckle.Connectors.Autocad.HostApp;
 
 /// <summary>
-/// Expects to be a scoped dependency receive operation.
+///  Expects to be a scoped dependency per send or receive operation.
+/// POC: Split later unpacker and baker.
 /// </summary>
-public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
+public class AutocadInstanceObjectManager : IInstanceUnpacker<AutocadRootObject>, IInstanceBaker<List<Entity>>
 {
-  private readonly AutocadLayerBaker _layerBaker;
-  private readonly AutocadColorBaker _colorBaker;
-  private readonly AutocadMaterialBaker _materialBaker;
+  private readonly AutocadLayerManager _autocadLayerManager;
+  private readonly AutocadColorManager _autocadColorManager;
+  private readonly AutocadMaterialManager _autocadMaterialManager;
+  private readonly IHostToSpeckleUnitConverter<UnitsValue> _unitsConverter;
   private readonly AutocadContext _autocadContext;
-  private readonly ILogger<AutocadInstanceBaker> _logger;
-  private readonly IConverterSettingsStore<AutocadConversionSettings> _converterSettings;
 
-  public AutocadInstanceBaker(
-    AutocadLayerBaker layerBaker,
-    AutocadColorBaker colorBaker,
-    AutocadMaterialBaker materialBaker,
+  private readonly IInstanceObjectsManager<AutocadRootObject, List<Entity>> _instanceObjectsManager;
+
+  public AutocadInstanceObjectManager(
+    AutocadLayerManager autocadLayerManager,
+    AutocadColorManager autocadColorManager,
+    AutocadMaterialManager autocadMaterialManager,
+    IHostToSpeckleUnitConverter<UnitsValue> unitsConverter,
     AutocadContext autocadContext,
-    ILogger<AutocadInstanceBaker> logger,
-    IConverterSettingsStore<AutocadConversionSettings> converterSettings
+    IInstanceObjectsManager<AutocadRootObject, List<Entity>> instanceObjectsManager
   )
   {
-    _layerBaker = layerBaker;
-    _colorBaker = colorBaker;
-    _materialBaker = materialBaker;
+    _autocadLayerManager = autocadLayerManager;
+    _autocadColorManager = autocadColorManager;
+    _autocadMaterialManager = autocadMaterialManager;
+    _unitsConverter = unitsConverter;
     _autocadContext = autocadContext;
-    _logger = logger;
-    _converterSettings = converterSettings;
+    _instanceObjectsManager = instanceObjectsManager;
+  }
+
+  public UnpackResult<AutocadRootObject> UnpackSelection(IEnumerable<AutocadRootObject> objects)
+  {
+    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
+
+    foreach (var obj in objects)
+    {
+      // Note: isDynamicBlock always returns false for a selection of doc objects. Instances of dynamic blocks are represented in the document as blocks that have
+      // a definition reference to the anonymous block table record.
+      if (obj.Root is BlockReference blockReference && !blockReference.IsDynamicBlock)
+      {
+        UnpackInstance(blockReference, 0, transaction);
+      }
+      _instanceObjectsManager.AddAtomicObject(obj.ApplicationId, obj);
+    }
+    return _instanceObjectsManager.GetUnpackResult();
+  }
+
+  private void UnpackInstance(BlockReference instance, int depth, Transaction transaction)
+  {
+    string instanceId = instance.GetSpeckleApplicationId();
+
+    // If this instance has a reference to an anonymous block, it means it's spawned from a dynamic block. Anonymous blocks are
+    // used to represent specific "instances" of dynamic ones.
+    // We do not want to send the full dynamic block definition, but its current "instance", as such here we're making sure we
+    // take up the anon block table reference definition (if it exists). If it's not an instance of a dynamic block, we're
+    // using the normal def reference.
+    ObjectId definitionId = !instance.AnonymousBlockTableRecord.IsNull
+      ? instance.AnonymousBlockTableRecord
+      : instance.BlockTableRecord;
+
+    InstanceProxy instanceProxy =
+      new()
+      {
+        applicationId = instanceId,
+        definitionId = definitionId.ToString(),
+        maxDepth = depth,
+        transform = GetMatrix(instance.BlockTransform.ToArray()),
+        units = _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits)
+      };
+    _instanceObjectsManager.AddInstanceProxy(instanceId, instanceProxy);
+
+    // For each block instance that has the same definition, we need to keep track of the "maximum depth" at which is found.
+    // This will enable on receive to create them in the correct order (descending by max depth, interleaved definitions and instances).
+    // We need to interleave the creation of definitions and instances, as some definitions may depend on instances.
+    if (
+      !_instanceObjectsManager.TryGetInstanceProxiesFromDefinitionId(
+        definitionId.ToString(),
+        out List<InstanceProxy> instanceProxiesWithSameDefinition
+      )
+    )
+    {
+      instanceProxiesWithSameDefinition = new List<InstanceProxy>();
+      _instanceObjectsManager.AddInstanceProxiesByDefinitionId(
+        definitionId.ToString(),
+        instanceProxiesWithSameDefinition
+      );
+    }
+
+    // We ensure that all previous instance proxies that have the same definition are at this max depth. I kind of have a feeling this can be done more elegantly, but YOLO
+    foreach (var instanceProxyWithSameDefinition in instanceProxiesWithSameDefinition)
+    {
+      if (instanceProxyWithSameDefinition.maxDepth < depth)
+      {
+        instanceProxyWithSameDefinition.maxDepth = depth;
+      }
+    }
+
+    instanceProxiesWithSameDefinition.Add(_instanceObjectsManager.GetInstanceProxy(instanceId));
+
+    if (
+      _instanceObjectsManager.TryGetInstanceDefinitionProxy(definitionId.ToString(), out InstanceDefinitionProxy value)
+    )
+    {
+      int depthDifference = depth - value.maxDepth;
+      if (depthDifference > 0)
+      {
+        // all MaxDepth of children definitions and its instances should be increased with difference of depth
+        _instanceObjectsManager.UpdateChildrenMaxDepth(value, depthDifference);
+      }
+      return;
+    }
+
+    var definition = (BlockTableRecord)transaction.GetObject(definitionId, OpenMode.ForRead);
+    var definitionProxy = new InstanceDefinitionProxy()
+    {
+      applicationId = definitionId.ToString(),
+      objects = new(),
+      maxDepth = depth,
+      name = !instance.AnonymousBlockTableRecord.IsNull ? "Dynamic instance " + definitionId : definition.Name,
+      ["comments"] = definition.Comments
+    };
+
+    // Go through each definition object
+    foreach (ObjectId id in definition)
+    {
+      Entity obj = (Entity)transaction.GetObject(id, OpenMode.ForRead);
+
+      // In the case of dynamic blocks, this prevents sending objects that are not visibile in its current state.
+      if (!obj.Visible)
+      {
+        continue;
+      }
+
+      string appId = obj.GetSpeckleApplicationId();
+      definitionProxy.objects.Add(appId);
+
+      if (obj is BlockReference blockReference)
+      {
+        UnpackInstance(blockReference, depth + 1, transaction);
+      }
+
+      _instanceObjectsManager.AddAtomicObject(appId, new(obj, appId));
+    }
+
+    _instanceObjectsManager.AddDefinitionProxy(definitionId.ToString(), definitionProxy);
   }
 
   public BakeResult BakeInstances(
@@ -120,14 +238,20 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
           );
 
           // POC: collectionPath for instances should be an array of size 1, because we are flattening collections on traversal
-          string layerName = _layerBaker.CreateLayerForReceive(collectionPath, baseLayerName);
+          string layerName = _autocadLayerManager.CreateLayerForReceive(collectionPath, baseLayerName);
 
           // get color and material if any
           string instanceId = instanceProxy.applicationId ?? instanceProxy.id;
-          AutocadColor? objColor = _colorBaker.ObjectColorsIdMap.TryGetValue(instanceId, out AutocadColor? color)
+          AutocadColor? objColor = _autocadColorManager.ObjectColorsIdMap.TryGetValue(
+            instanceId,
+            out AutocadColor? color
+          )
             ? color
             : null;
-          ObjectId objMaterial = _materialBaker.ObjectMaterialsIdMap.TryGetValue(instanceId, out ObjectId matId)
+          ObjectId objMaterial = _autocadMaterialManager.ObjectMaterialsIdMap.TryGetValue(
+            instanceId,
+            out ObjectId matId
+          )
             ? matId
             : ObjectId.Null;
 
@@ -156,7 +280,6 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
       }
       catch (Exception ex) when (!ex.IsFatal())
       {
-        _logger.LogError(ex, "Failed to create an instance from proxy");
         conversionResults.Add(new(Status.ERROR, instanceOrDefinition as Base ?? new Base(), null, null, ex));
       }
     }
@@ -223,9 +346,34 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
     transaction.Commit();
   }
 
+  private Matrix4x4 GetMatrix(double[] t)
+  {
+    return new Matrix4x4(
+      t[0],
+      t[1],
+      t[2],
+      t[3],
+      t[4],
+      t[5],
+      t[6],
+      t[7],
+      t[8],
+      t[9],
+      t[10],
+      t[11],
+      t[12],
+      t[13],
+      t[14],
+      t[15]
+    );
+  }
+
   private Matrix3d GetMatrix3d(Matrix4x4 matrix, string units)
   {
-    var sf = Units.GetConversionFactor(units, _converterSettings.Current.SpeckleUnits);
+    var sf = Units.GetConversionFactor(
+      units,
+      _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits)
+    );
 
     var scaledTransform = new[]
     {
@@ -257,7 +405,7 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
   }
 
   // https://forums.autodesk.com/t5/net/set-blocktransform-values/m-p/6452121#M49479
-  private double[] MakePerpendicular(Matrix3d matrix)
+  private static double[] MakePerpendicular(Matrix3d matrix)
   {
     // Get the basis vectors of the matrix
     Vector3d right = new(matrix[0, 0], matrix[1, 0], matrix[2, 0]);
@@ -266,8 +414,8 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
     Vector3d newForward = right.CrossProduct(up).GetNormal();
     Vector3d newUp = newForward.CrossProduct(right).GetNormal();
 
-    return
-    [
+    return new[]
+    {
       right.X,
       newUp.X,
       newForward.X,
@@ -283,7 +431,7 @@ public class AutocadInstanceBaker : IInstanceBaker<List<Entity>>
       0.0,
       0.0,
       0.0,
-      matrix[3, 3]
-    ];
+      matrix[3, 3],
+    };
   }
 }

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadInstanceUnpacker.cs

@@ -1,161 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Converters.Common;
-using Speckle.DoubleNumerics;
-using Speckle.Sdk;
-using Speckle.Sdk.Models.Instances;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-/// <summary>
-/// Expects to be a scoped dependency per send operation.
-/// </summary>
-public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
-{
-  private readonly IHostToSpeckleUnitConverter<UnitsValue> _unitsConverter;
-  private readonly IInstanceObjectsManager<AutocadRootObject, List<Entity>> _instanceObjectsManager;
-  private readonly ILogger<AutocadInstanceUnpacker> _logger;
-
-  public AutocadInstanceUnpacker(
-    IHostToSpeckleUnitConverter<UnitsValue> unitsConverter,
-    IInstanceObjectsManager<AutocadRootObject, List<Entity>> instanceObjectsManager,
-    ILogger<AutocadInstanceUnpacker> logger
-  )
-  {
-    _unitsConverter = unitsConverter;
-    _instanceObjectsManager = instanceObjectsManager;
-    _logger = logger;
-  }
-
-  public UnpackResult<AutocadRootObject> UnpackSelection(IEnumerable<AutocadRootObject> objects)
-  {
-    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-
-    foreach (var obj in objects)
-    {
-      // Note: isDynamicBlock always returns false for a selection of doc objects. Instances of dynamic blocks are represented in the document as blocks that have
-      // a definition reference to the anonymous block table record.
-      if (obj.Root is BlockReference blockReference && !blockReference.IsDynamicBlock)
-      {
-        UnpackInstance(blockReference, 0, transaction);
-      }
-      _instanceObjectsManager.AddAtomicObject(obj.ApplicationId, obj);
-    }
-    return _instanceObjectsManager.GetUnpackResult();
-  }
-
-  private void UnpackInstance(BlockReference instance, int depth, Transaction transaction)
-  {
-    try
-    {
-      string instanceId = instance.GetSpeckleApplicationId();
-
-      // If this instance has a reference to an anonymous block, it means it's spawned from a dynamic block. Anonymous blocks are
-      // used to represent specific "instances" of dynamic ones.
-      // We do not want to send the full dynamic block definition, but its current "instance", as such here we're making sure we
-      // take up the anon block table reference definition (if it exists). If it's not an instance of a dynamic block, we're
-      // using the normal def reference.
-      ObjectId definitionId = !instance.AnonymousBlockTableRecord.IsNull
-        ? instance.AnonymousBlockTableRecord
-        : instance.BlockTableRecord;
-
-      InstanceProxy instanceProxy =
-        new()
-        {
-          applicationId = instanceId,
-          definitionId = definitionId.ToString(),
-          maxDepth = depth,
-          transform = GetMatrix(instance.BlockTransform.ToArray()),
-          units = _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits)
-        };
-      _instanceObjectsManager.AddInstanceProxy(instanceId, instanceProxy);
-
-      // For each block instance that has the same definition, we need to keep track of the "maximum depth" at which is found.
-      // This will enable on receive to create them in the correct order (descending by max depth, interleaved definitions and instances).
-      // We need to interleave the creation of definitions and instances, as some definitions may depend on instances.
-      if (
-        !_instanceObjectsManager.TryGetInstanceProxiesFromDefinitionId(
-          definitionId.ToString(),
-          out List<InstanceProxy>? instanceProxiesWithSameDefinition
-        )
-      )
-      {
-        instanceProxiesWithSameDefinition = new List<InstanceProxy>();
-        _instanceObjectsManager.AddInstanceProxiesByDefinitionId(
-          definitionId.ToString(),
-          instanceProxiesWithSameDefinition
-        );
-      }
-
-      // We ensure that all previous instance proxies that have the same definition are at this max depth. I kind of have a feeling this can be done more elegantly, but YOLO
-      foreach (var instanceProxyWithSameDefinition in instanceProxiesWithSameDefinition)
-      {
-        if (instanceProxyWithSameDefinition.maxDepth < depth)
-        {
-          instanceProxyWithSameDefinition.maxDepth = depth;
-        }
-      }
-
-      instanceProxiesWithSameDefinition.Add(_instanceObjectsManager.GetInstanceProxy(instanceId));
-
-      if (
-        _instanceObjectsManager.TryGetInstanceDefinitionProxy(
-          definitionId.ToString(),
-          out InstanceDefinitionProxy? value
-        )
-      )
-      {
-        int depthDifference = depth - value.maxDepth;
-        if (depthDifference > 0)
-        {
-          // all MaxDepth of children definitions and its instances should be increased with difference of depth
-          _instanceObjectsManager.UpdateChildrenMaxDepth(value, depthDifference);
-        }
-        return;
-      }
-
-      var definition = (BlockTableRecord)transaction.GetObject(definitionId, OpenMode.ForRead);
-      var definitionProxy = new InstanceDefinitionProxy()
-      {
-        applicationId = definitionId.ToString(),
-        objects = new(),
-        maxDepth = depth,
-        name = !instance.AnonymousBlockTableRecord.IsNull ? "Dynamic instance " + definitionId : definition.Name
-      };
-
-      // Go through each definition object
-      foreach (ObjectId id in definition)
-      {
-        Entity obj = (Entity)transaction.GetObject(id, OpenMode.ForRead);
-
-        // In the case of dynamic blocks, this prevents sending objects that are not visibile in its current state.
-        if (!obj.Visible)
-        {
-          continue;
-        }
-
-        string appId = obj.GetSpeckleApplicationId();
-        definitionProxy.objects.Add(appId);
-
-        if (obj is BlockReference blockReference)
-        {
-          UnpackInstance(blockReference, depth + 1, transaction);
-        }
-
-        _instanceObjectsManager.AddAtomicObject(appId, new(obj, appId));
-      }
-
-      _instanceObjectsManager.AddDefinitionProxy(definitionId.ToString(), definitionProxy);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex, "Failed unpacking Autocad instance");
-    }
-  }
-
-  private Matrix4x4 GetMatrix(double[] t) =>
-    new(t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7], t[8], t[9], t[10], t[11], t[12], t[13], t[14], t[15]);
-}

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerManager.cs

@@ -1,30 +1,59 @@
-using Autodesk.AutoCAD.DatabaseServices;
+using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.EditorInput;
 using Autodesk.AutoCAD.LayerManager;
-using Speckle.Connectors.Common.Operations.Receive;
+using Speckle.Connectors.Autocad.HostApp.Extensions;
+using Speckle.Converters.Common;
 using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.GraphTraversal;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;
 
 namespace Speckle.Connectors.Autocad.HostApp;
 
-public class AutocadLayerBaker : TraversalContextUnpacker
+/// <summary>
+/// Expects to be a scoped dependency for a given operation and helps with layer creation and cleanup.
+/// </summary>
+public class AutocadLayerManager
 {
-  private readonly string _layerFilterName = "Speckle";
   private readonly AutocadContext _autocadContext;
-  private readonly AutocadMaterialBaker _materialBaker;
-  private readonly AutocadColorBaker _colorBaker;
+  private readonly AutocadMaterialManager _materialManager;
+  private readonly AutocadColorManager _colorManager;
+  private readonly string _layerFilterName = "Speckle";
+  public Dictionary<string, Layer> CollectionCache { get; } = new();
+
+  // POC: Will be addressed to move it into AutocadContext!
   private Document Doc => Application.DocumentManager.MdiActiveDocument;
   private readonly HashSet<string> _uniqueLayerNames = new();
 
-  public AutocadLayerBaker(
+  public AutocadLayerManager(
     AutocadContext autocadContext,
-    AutocadMaterialBaker materialBaker,
-    AutocadColorBaker colorBaker
+    AutocadMaterialManager materialManager,
+    AutocadColorManager colorManager
   )
   {
     _autocadContext = autocadContext;
-    _materialBaker = materialBaker;
-    _colorBaker = colorBaker;
+    _materialManager = materialManager;
+    _colorManager = colorManager;
+  }
+
+  public Layer GetOrCreateSpeckleLayer(Entity entity, Transaction tr, out LayerTableRecord? layer)
+  {
+    string layerName = entity.Layer;
+    layer = null;
+    if (CollectionCache.TryGetValue(layerName, out Layer? speckleLayer))
+    {
+      return speckleLayer;
+    }
+    if (tr.GetObject(entity.LayerId, OpenMode.ForRead) is LayerTableRecord autocadLayer)
+    {
+      // Layers and geometries can have same application ids.....
+      // We should prevent it for sketchup converter. Because when it happens "objects_to_bake" definition
+      // is changing on the way if it happens.
+      speckleLayer = new Layer(layerName) { applicationId = autocadLayer.GetSpeckleApplicationId() }; // Do not use handle directly, see note in the 'GetSpeckleApplicationId' method
+      CollectionCache[layerName] = speckleLayer;
+      layer = autocadLayer;
+      return speckleLayer;
+    }
+    throw new SpeckleConversionException("Unexpected condition in GetOrCreateSpeckleLayer");
   }
 
   /// <summary>
@@ -44,7 +73,7 @@ public class AutocadLayerBaker : TraversalContextUnpacker
     // get the color and material if any, of the leaf collection with a color
     AutocadColor? layerColor = null;
     ObjectId layerMaterial = ObjectId.Null;
-    if (_colorBaker.ObjectColorsIdMap.Count > 0 || _materialBaker.ObjectMaterialsIdMap.Count > 0)
+    if (_colorManager.ObjectColorsIdMap.Count > 0 || _materialManager.ObjectMaterialsIdMap.Count > 0)
     {
       bool foundColor = false;
       bool foundMaterial = false;
@@ -56,12 +85,12 @@ public class AutocadLayerBaker : TraversalContextUnpacker
 
         if (!foundColor)
         {
-          foundColor = _colorBaker.ObjectColorsIdMap.TryGetValue(layerId, out layerColor);
+          foundColor = _colorManager.ObjectColorsIdMap.TryGetValue(layerId, out layerColor);
         }
 
         if (!foundMaterial)
         {
-          foundMaterial = _materialBaker.ObjectMaterialsIdMap.TryGetValue(layerId, out layerMaterial);
+          foundMaterial = _materialManager.ObjectMaterialsIdMap.TryGetValue(layerId, out layerMaterial);
         }
 
         if (foundColor && foundMaterial)
@@ -198,4 +227,22 @@ public class AutocadLayerBaker : TraversalContextUnpacker
     groupFilter.NestedFilters.Add(layerFilter);
     Doc.Database.LayerFilters = layerFilterTree;
   }
+
+  /// <summary>
+  /// Gets a valid collection representing a layer for a given context.
+  /// </summary>
+  /// <param name="context"></param>
+  /// <returns>A new Speckle Layer object</returns>
+  public Collection[] GetLayerPath(TraversalContext context)
+  {
+    Collection[] collectionBasedPath = context.GetAscendantOfType<Collection>().Reverse().ToArray();
+
+    if (collectionBasedPath.Length == 0)
+    {
+      string[] path = context.GetPropertyPath().Reverse().ToArray();
+      collectionBasedPath = [new Collection(string.Join("-", path))];
+    }
+
+    return collectionBasedPath;
+  }
 }

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerUnpacker.cs

@@ -1,32 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-public class AutocadLayerUnpacker
-{
-  private readonly Dictionary<string, Layer> _layerCollectionCache = new();
-
-  public Layer GetOrCreateSpeckleLayer(Entity entity, Transaction tr, out LayerTableRecord? layer)
-  {
-    string layerName = entity.Layer;
-    layer = null;
-    if (_layerCollectionCache.TryGetValue(layerName, out Layer? speckleLayer))
-    {
-      return speckleLayer;
-    }
-    if (tr.GetObject(entity.LayerId, OpenMode.ForRead) is LayerTableRecord autocadLayer)
-    {
-      // Layers and geometries can have same application ids.....
-      // We should prevent it for sketchup converter. Because when it happens "objects_to_bake" definition
-      // is changing on the way if it happens.
-      speckleLayer = new Layer(layerName) { applicationId = autocadLayer.GetSpeckleApplicationId() }; // Do not use handle directly, see note in the 'GetSpeckleApplicationId' method
-      _layerCollectionCache[layerName] = speckleLayer;
-      layer = autocadLayer;
-      return speckleLayer;
-    }
-    throw new SpeckleConversionException("Unexpected condition in GetOrCreateSpeckleLayer");
-  }
-}

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialManager.cs

@@ -1,11 +1,11 @@
 using Autodesk.AutoCAD.Colors;
 using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.GraphicsInterface;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Autocad.HostApp.Extensions;
+using Speckle.Connectors.Autocad.Operations.Send;
+using Speckle.Connectors.Utils.Conversion;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
-using Speckle.Sdk.Models;
 using Material = Autodesk.AutoCAD.DatabaseServices.Material;
 using RenderMaterial = Speckle.Objects.Other.RenderMaterial;
 
@@ -14,131 +14,104 @@ namespace Speckle.Connectors.Autocad.HostApp;
 /// <summary>
 /// Expects to be a scoped dependency for a given operation and helps with layer creation and cleanup.
 /// </summary>
-public class AutocadMaterialBaker
+public class AutocadMaterialManager
 {
-  private readonly ILogger<AutocadMaterialBaker> _logger;
   private readonly AutocadContext _autocadContext;
+
+  // POC: Will be addressed to move it into AutocadContext!
   private Document Doc => Application.DocumentManager.MdiActiveDocument;
+
   public Dictionary<string, ObjectId> ObjectMaterialsIdMap { get; } = new();
 
-  public AutocadMaterialBaker(AutocadContext autocadContext, ILogger<AutocadMaterialBaker> logger)
+  public AutocadMaterialManager(AutocadContext autocadContext)
   {
     _autocadContext = autocadContext;
-    _logger = logger;
+  }
+
+  private RenderMaterialProxy ConvertMaterialToRenderMaterialProxy(Material material, string id)
+  {
+    EntityColor diffuseColor = material.Diffuse.Color.Color;
+    System.Drawing.Color diffuse = System.Drawing.Color.FromArgb(
+      diffuseColor.Red,
+      diffuseColor.Green,
+      diffuseColor.Blue
+    );
+
+    string name = material.Name;
+    double opacity = material.Opacity.Percentage;
+
+    RenderMaterial renderMaterial = new(opacity: opacity, diffuse: diffuse) { name = name, applicationId = id };
+
+    // Add additional properties
+    renderMaterial["ior"] = material.Refraction.Index;
+    renderMaterial["reflectivity"] = material.Reflectivity;
+
+    return new(renderMaterial, new()) { applicationId = id };
   }
 
   /// <summary>
-  /// Try to get material id from original object or its parent (if provided) as fallback).
-  /// It covers one-to-many problem, i.e.
-  ///  - rhino: Brep (material id is extracted into render material proxy objects) -> [Mesh, Mesh, ...] (child objects application ids ARE NOT EXIST in render material proxy objects)
-  ///  - revit : RevitElement (material IS NOT extracted into render material proxy objects) -> [Mesh, Mesh...] (child objects application ids EXIST in render material proxy objects)
+  /// Iterates through a given set of autocad objects and collects their materials. Note: expects objects to be "atomic", and extracted out of their instances already.
   /// </summary>
-  /// <remarks>
-  /// This is a question that we need to answer where to handle these cases.
-  /// We alsa do reverse search for layer render materials on Revit Receive, and mutating the proxy list accordingly.
-  /// These cases are increasing, and need some ideation around it before going more messy.
-  /// </remarks>
-  public bool TryGetMaterialId(Base originalObject, Base? parentObject, out ObjectId materialId)
-  {
-    materialId = ObjectId.Null;
-    var originalObjectId = originalObject.applicationId ?? originalObject.id;
-    if (ObjectMaterialsIdMap.TryGetValue(originalObjectId, out ObjectId originalObjectMaterialId))
-    {
-      materialId = originalObjectMaterialId;
-      return true;
-    }
-
-    if (parentObject is null)
-    {
-      return false;
-    }
-
-    var subObjectId = parentObject.applicationId ?? parentObject.id;
-    if (ObjectMaterialsIdMap.TryGetValue(subObjectId, out ObjectId subObjectMaterialId))
-    {
-      materialId = subObjectMaterialId;
-      return true;
-    }
-
-    return false;
-  }
-
-  /// <summary>
-  /// Removes all materials with a name starting with <paramref name="namePrefix"/> from the active document
-  /// </summary>
-  /// <param name="namePrefix"></param>
-  public void PurgeMaterials(string namePrefix)
-  {
-    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-    if (transaction.GetObject(Doc.Database.MaterialDictionaryId, OpenMode.ForWrite) is DBDictionary materialDict)
-    {
-      foreach (var entry in materialDict)
-      {
-        try
-        {
-          if (entry.Key.Contains(namePrefix))
-          {
-            materialDict.Remove(entry.Value);
-          }
-        }
-        catch (Exception ex) when (!ex.IsFatal())
-        {
-          _logger.LogError(ex, "Failed to purge a material from the document");
-        }
-      }
-    }
-    transaction.Commit();
-  }
-
-  public void ParseAndBakeRenderMaterials(
-    List<RenderMaterialProxy> materialProxies,
-    string baseLayerPrefix,
-    Action<string, double?>? onOperationProgressed
+  /// <param name="unpackedAutocadObjects"></param>
+  /// <param name="layers"></param>
+  /// <returns></returns>
+  public List<RenderMaterialProxy> UnpackMaterials(
+    List<AutocadRootObject> unpackedAutocadObjects,
+    List<LayerTableRecord> layers
   )
   {
+    Dictionary<string, RenderMaterialProxy> materialProxies = new();
     using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-    var materialDict = transaction.GetObject(Doc.Database.MaterialDictionaryId, OpenMode.ForWrite) as DBDictionary;
 
-    if (materialDict == null)
+    // Stage 1: unpack materials from objects
+    foreach (AutocadRootObject rootObj in unpackedAutocadObjects)
     {
-      // POC: we should report failed conversion here if material dict is not accessible, but it is not linked to a Base source
-      transaction.Commit();
-      return;
-    }
+      Entity entity = rootObj.Root;
 
-    var count = 0;
-    foreach (RenderMaterialProxy materialProxy in materialProxies)
-    {
-      onOperationProgressed?.Invoke("Converting render materials", (double)++count / materialProxies.Count);
-
-      // bake render material
-      RenderMaterial renderMaterial = materialProxy.value;
-      string renderMaterialId = renderMaterial.applicationId ?? renderMaterial.id;
-      ObjectId materialId = ObjectId.Null;
-
-      if (!ObjectMaterialsIdMap.TryGetValue(renderMaterialId, out materialId))
-      {
-        (materialId, ReceiveConversionResult result) = BakeMaterial(
-          renderMaterial,
-          baseLayerPrefix,
-          materialDict,
-          transaction
-        );
-      }
-
-      if (materialId == ObjectId.Null)
+      // skip inherited materials
+      if (entity.Material == "ByLayer" || entity.Material == "ByBlock")
       {
         continue;
       }
 
-      // parse render material object ids
-      foreach (string objectId in materialProxy.objects)
+      if (transaction.GetObject(entity.MaterialId, OpenMode.ForRead) is Material material)
       {
-        ObjectMaterialsIdMap[objectId] = materialId;
+        string materialId = material.GetSpeckleApplicationId();
+        if (materialProxies.TryGetValue(materialId, out RenderMaterialProxy? value))
+        {
+          value.objects.Add(rootObj.ApplicationId);
+        }
+        else
+        {
+          RenderMaterialProxy materialProxy = ConvertMaterialToRenderMaterialProxy(material, materialId);
+          materialProxy.objects.Add(rootObj.ApplicationId);
+          materialProxies[materialId] = materialProxy;
+        }
+      }
+    }
+
+    // Stage 2: make sure we collect layer colors as well
+    foreach (LayerTableRecord layer in layers)
+    {
+      if (transaction.GetObject(layer.MaterialId, OpenMode.ForRead) is Material material)
+      {
+        string materialId = material.GetSpeckleApplicationId();
+        string layerId = layer.GetSpeckleApplicationId(); // Do not use handle directly, see note in the 'GetSpeckleApplicationId' method
+        if (materialProxies.TryGetValue(materialId, out RenderMaterialProxy? value))
+        {
+          value.objects.Add(layerId);
+        }
+        else
+        {
+          RenderMaterialProxy materialProxy = ConvertMaterialToRenderMaterialProxy(material, materialId);
+          materialProxy.objects.Add(layerId);
+          materialProxies[materialId] = materialProxy;
+        }
       }
     }
 
     transaction.Commit();
+    return materialProxies.Values.ToList();
   }
 
   private (ObjectId, ReceiveConversionResult) BakeMaterial(
@@ -192,8 +165,103 @@ public class AutocadMaterialBaker
     }
     catch (Exception ex) when (!ex.IsFatal())
     {
-      _logger.LogError(ex, "Failed to add a material to the document");
       return (materialId, new(Status.ERROR, renderMaterial, null, null, ex));
     }
   }
+
+  /// <summary>
+  /// Removes all materials with a name starting with <paramref name="namePrefix"/> from the active document
+  /// </summary>
+  /// <param name="namePrefix"></param>
+  public void PurgeMaterials(string namePrefix)
+  {
+    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
+    if (transaction.GetObject(Doc.Database.MaterialDictionaryId, OpenMode.ForWrite) is DBDictionary materialDict)
+    {
+      foreach (var entry in materialDict)
+      {
+        if (entry.Key.Contains(namePrefix))
+        {
+          materialDict.Remove(entry.Value);
+        }
+      }
+    }
+    transaction.Commit();
+  }
+
+  public List<ReceiveConversionResult> ParseAndBakeRenderMaterials(
+    List<RenderMaterialProxy> materialProxies,
+    string baseLayerPrefix,
+    Action<string, double?>? onOperationProgressed
+  )
+  {
+    List<ReceiveConversionResult> results = new();
+    Dictionary<string, string> objectRenderMaterialsIdMap = new();
+
+    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
+    var materialDict = transaction.GetObject(Doc.Database.MaterialDictionaryId, OpenMode.ForWrite) as DBDictionary;
+
+    if (materialDict == null)
+    {
+      // POC: we should report failed conversion here if material dict is not accessible, but it is not linked to a Base source
+      transaction.Commit();
+      return results;
+    }
+
+    var count = 0;
+    foreach (RenderMaterialProxy materialProxy in materialProxies)
+    {
+      onOperationProgressed?.Invoke("Converting render materials", (double)++count / materialProxies.Count);
+
+      // bake render material
+      RenderMaterial renderMaterial = materialProxy.value;
+      string renderMaterialId = renderMaterial.applicationId ?? renderMaterial.id;
+      ObjectId materialId = ObjectId.Null;
+
+      if (!ObjectMaterialsIdMap.TryGetValue(renderMaterialId, out materialId))
+      {
+        (materialId, ReceiveConversionResult result) = BakeMaterial(
+          renderMaterial,
+          baseLayerPrefix,
+          materialDict,
+          transaction
+        );
+
+        results.Add(result);
+      }
+      else
+      {
+        // POC: this shouldn't happen, but will if there are render materials with the same applicationID
+        results.Add(
+          new(
+            Status.ERROR,
+            renderMaterial,
+            exception: new ArgumentException("Another render material of the same id has already been created.")
+          )
+        );
+      }
+
+      if (materialId == ObjectId.Null)
+      {
+        results.Add(
+          new(
+            Status.ERROR,
+            renderMaterial,
+            exception: new InvalidOperationException("Render material failed to be added to document.")
+          )
+        );
+
+        continue;
+      }
+
+      // parse render material object ids
+      foreach (string objectId in materialProxy.objects)
+      {
+        ObjectMaterialsIdMap[objectId] = materialId;
+      }
+    }
+
+    transaction.Commit();
+    return results;
+  }
 }

Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadMaterialUnpacker.cs

@@ -1,129 +0,0 @@
-using Autodesk.AutoCAD.Colors;
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Objects.Other;
-using Speckle.Sdk;
-using Material = Autodesk.AutoCAD.DatabaseServices.Material;
-using RenderMaterial = Speckle.Objects.Other.RenderMaterial;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-/// <summary>
-/// Expects to be a scoped dependency for a given operation and helps with layer creation and cleanup.
-/// </summary>
-public class AutocadMaterialUnpacker
-{
-  private readonly ILogger<AutocadMaterialUnpacker> _logger;
-
-  public AutocadMaterialUnpacker(ILogger<AutocadMaterialUnpacker> logger)
-  {
-    _logger = logger;
-  }
-
-  /// <summary>
-  /// Iterates through a given set of autocad objects and collects their materials. Note: expects objects to be "atomic", and extracted out of their instances already.
-  /// </summary>
-  /// <param name="unpackedAutocadObjects"></param>
-  /// <param name="layers"></param>
-  /// <returns></returns>
-  public List<RenderMaterialProxy> UnpackMaterials(
-    List<AutocadRootObject> unpackedAutocadObjects,
-    List<LayerTableRecord> layers
-  )
-  {
-    Dictionary<string, RenderMaterialProxy> materialProxies = new();
-    using var transaction = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-
-    // Stage 1: unpack materials from objects
-    foreach (AutocadRootObject rootObj in unpackedAutocadObjects)
-    {
-      try
-      {
-        Entity entity = rootObj.Root;
-
-        // skip inherited materials
-        if (entity.Material == "ByLayer" || entity.Material == "ByBlock")
-        {
-          continue;
-        }
-
-        if (transaction.GetObject(entity.MaterialId, OpenMode.ForRead) is Material material)
-        {
-          string materialId = material.GetSpeckleApplicationId();
-          if (materialProxies.TryGetValue(materialId, out RenderMaterialProxy? value))
-          {
-            value.objects.Add(rootObj.ApplicationId);
-          }
-          else
-          {
-            RenderMaterialProxy materialProxy = ConvertMaterialToRenderMaterialProxy(material, materialId);
-            materialProxy.objects.Add(rootObj.ApplicationId);
-            materialProxies[materialId] = materialProxy;
-          }
-        }
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed to unpack render material from Autocad Entity");
-      }
-    }
-
-    // Stage 2: make sure we collect layer colors as well
-    foreach (LayerTableRecord layer in layers)
-    {
-      try
-      {
-        if (transaction.GetObject(layer.MaterialId, OpenMode.ForRead) is Material material)
-        {
-          string materialId = material.GetSpeckleApplicationId();
-          string layerId = layer.GetSpeckleApplicationId(); // Do not use handle directly, see note in the 'GetSpeckleApplicationId' method
-          if (materialProxies.TryGetValue(materialId, out RenderMaterialProxy? value))
-          {
-            value.objects.Add(layerId);
-          }
-          else
-          {
-            RenderMaterialProxy materialProxy = ConvertMaterialToRenderMaterialProxy(material, materialId);
-            materialProxy.objects.Add(layerId);
-            materialProxies[materialId] = materialProxy;
-          }
-        }
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed to unpack render material from Autocad Layer");
-      }
-    }
-
-    transaction.Commit();
-    return materialProxies.Values.ToList();
-  }
-
-  private RenderMaterialProxy ConvertMaterialToRenderMaterialProxy(Material material, string id)
-  {
-    EntityColor diffuseColor = material.Diffuse.Color.Color;
-    System.Drawing.Color diffuse = System.Drawing.Color.FromArgb(
-      diffuseColor.Red,
-      diffuseColor.Green,
-      diffuseColor.Blue
-    );
-
-    string name = material.Name;
-    double opacity = material.Opacity.Percentage;
-
-    RenderMaterial renderMaterial = new(opacity: opacity, diffuse: diffuse) { name = name, applicationId = id };
-
-    // Add additional properties
-    renderMaterial["ior"] = material.Refraction.Index;
-    renderMaterial["reflectivity"] = material.Reflectivity;
-
-    return new RenderMaterialProxy()
-    {
-      value = renderMaterial,
-      objects = new(),
-      applicationId = id
-    };
-  }
-}

Connectors/Autocad/Speckle.Connectors.AutocadShared/Operations/Receive/AutocadHostObjectBuilder.cs

@@ -1,15 +1,17 @@
 using Autodesk.AutoCAD.DatabaseServices;
 using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Common.Operations.Receive;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.Common;
+using Speckle.Objects.Other;
 using Speckle.Sdk;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.GraphTraversal;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Models.Proxies;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;
 
 namespace Speckle.Connectors.Autocad.Operations.Receive;
@@ -19,37 +21,37 @@ namespace Speckle.Connectors.Autocad.Operations.Receive;
 /// </summary>
 public class AutocadHostObjectBuilder : IHostObjectBuilder
 {
-  private readonly AutocadLayerBaker _layerBaker;
+  private readonly AutocadLayerManager _autocadLayerManager;
   private readonly IRootToHostConverter _converter;
+  private readonly GraphTraversal _traversalFunction;
   private readonly ISyncToThread _syncToThread;
-  private readonly AutocadGroupBaker _groupBaker;
-  private readonly AutocadMaterialBaker _materialBaker;
-  private readonly AutocadColorBaker _colorBaker;
-  private readonly AutocadInstanceBaker _instanceBaker;
+  private readonly AutocadGroupManager _groupManager;
+  private readonly AutocadMaterialManager _materialManager;
+  private readonly AutocadColorManager _colorManager;
+  private readonly AutocadInstanceObjectManager _instanceObjectsManager;
   private readonly AutocadContext _autocadContext;
-  private readonly RootObjectUnpacker _rootObjectUnpacker;
 
   public AutocadHostObjectBuilder(
     IRootToHostConverter converter,
-    AutocadLayerBaker layerBaker,
-    AutocadGroupBaker groupBaker,
-    AutocadInstanceBaker instanceBaker,
-    AutocadMaterialBaker materialBaker,
-    AutocadColorBaker colorBaker,
+    GraphTraversal traversalFunction,
+    AutocadLayerManager autocadLayerManager,
+    AutocadGroupManager groupManager,
+    AutocadInstanceObjectManager instanceObjectsManager,
+    AutocadMaterialManager materialManager,
+    AutocadColorManager colorManager,
     ISyncToThread syncToThread,
-    AutocadContext autocadContext,
-    RootObjectUnpacker rootObjectUnpacker
+    AutocadContext autocadContext
   )
   {
     _converter = converter;
-    _layerBaker = layerBaker;
-    _groupBaker = groupBaker;
-    _instanceBaker = instanceBaker;
-    _materialBaker = materialBaker;
-    _colorBaker = colorBaker;
+    _traversalFunction = traversalFunction;
+    _autocadLayerManager = autocadLayerManager;
+    _groupManager = groupManager;
+    _instanceObjectsManager = instanceObjectsManager;
+    _materialManager = materialManager;
+    _colorManager = colorManager;
     _syncToThread = syncToThread;
     _autocadContext = autocadContext;
-    _rootObjectUnpacker = rootObjectUnpacker;
   }
 
   public Task<HostObjectBuilderResult> Build(
@@ -58,61 +60,89 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
     string modelName,
     Action<string, double?>? onOperationProgressed,
     CancellationToken _
-  ) =>
-    // NOTE: This is the only place we apply ISyncToThread across connectors. We need to sync up with main thread here
-    //  after GetObject and Deserialization. It is anti-pattern now. Happiness level 3/10 but works.
-    _syncToThread.RunOnThread(() =>
+  )
+  {
+    return _syncToThread.RunOnThread(() =>
     {
       // Prompt the UI conversion started. Progress bar will swoosh.
       onOperationProgressed?.Invoke("Converting", null);
 
       // Layer filter for received commit with project and model name
-      _layerBaker.CreateLayerFilter(projectName, modelName);
+      _autocadLayerManager.CreateLayerFilter(projectName, modelName);
 
-      // 0 - Clean then Rock n Roll!
       string baseLayerPrefix = _autocadContext.RemoveInvalidChars($"SPK-{projectName}-{modelName}-");
+
       PreReceiveDeepClean(baseLayerPrefix);
 
-      // 1 - Unpack objects and proxies from root commit object
-      var unpackedRoot = _rootObjectUnpacker.Unpack(rootObject);
+      List<ReceiveConversionResult> results = new();
+      List<string> bakedObjectIds = new();
 
-      // 2 - Split atomic objects and instance components with their path
-      var (atomicObjects, instanceComponents) = _rootObjectUnpacker.SplitAtomicObjectsAndInstances(
-        unpackedRoot.ObjectsToConvert
-      );
-      var atomicObjectsWithPath = _layerBaker.GetAtomicObjectsWithPath(atomicObjects);
-      var instanceComponentsWithPath = _layerBaker.GetInstanceComponentsWithPath(instanceComponents);
+      var objectGraph = _traversalFunction.Traverse(rootObject).Where(obj => obj.Current is not Collection);
 
       // POC: these are not captured by traversal, so we need to re-add them here
-      if (unpackedRoot.DefinitionProxies != null && unpackedRoot.DefinitionProxies.Count > 0)
+      var instanceDefinitionProxies = (rootObject["instanceDefinitionProxies"] as List<object>)
+        ?.Cast<InstanceDefinitionProxy>()
+        .ToList();
+
+      var instanceComponents = new List<(Collection[] path, IInstanceComponent obj)>();
+      // POC: these are not captured by traversal, so we need to re-add them here
+      if (instanceDefinitionProxies != null && instanceDefinitionProxies.Count > 0)
       {
-        var transformed = unpackedRoot.DefinitionProxies.Select(proxy =>
+        var transformed = instanceDefinitionProxies.Select(proxy =>
           (Array.Empty<Collection>(), proxy as IInstanceComponent)
         );
-        instanceComponentsWithPath.AddRange(transformed);
+        instanceComponents.AddRange(transformed);
       }
 
-      // 3 - Bake materials and colors, as they are used later down the line by layers and objects
-      if (unpackedRoot.RenderMaterialProxies != null)
+      // POC: get colors
+      List<ColorProxy>? colors = (rootObject["colorProxies"] as List<object>)?.Cast<ColorProxy>().ToList();
+      if (colors != null)
       {
-        _materialBaker.ParseAndBakeRenderMaterials(
-          unpackedRoot.RenderMaterialProxies,
+        _colorManager.ParseColors(colors, onOperationProgressed);
+      }
+
+      // POC: get render materials
+      List<RenderMaterialProxy>? renderMaterials = (rootObject["renderMaterialProxies"] as List<object>)
+        ?.Cast<RenderMaterialProxy>()
+        .ToList();
+
+      if (renderMaterials != null)
+      {
+        List<ReceiveConversionResult> materialResults = _materialManager.ParseAndBakeRenderMaterials(
+          renderMaterials,
           baseLayerPrefix,
           onOperationProgressed
         );
+
+        results.AddRange(materialResults);
       }
 
-      if (unpackedRoot.ColorProxies != null)
+      // POC: get group proxies
+      var groupProxies = (rootObject["groupProxies"] as List<object>)?.Cast<GroupProxy>().ToList();
+
+      var atomicObjects = new List<(Collection[] layerPath, Base obj)>();
+
+      foreach (TraversalContext tc in objectGraph)
       {
-        _colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
+        // create new speckle layer from layer path
+        Collection[] layerPath = _autocadLayerManager.GetLayerPath(tc);
+        switch (tc.Current)
+        {
+          case IInstanceComponent instanceComponent:
+            instanceComponents.Add((layerPath, instanceComponent));
+            break;
+          case GroupProxy:
+            continue;
+          default:
+            atomicObjects.Add((layerPath, tc.Current));
+            break;
+        }
       }
 
-      // 5 - Convert atomic objects
-      List<ReceiveConversionResult> results = new();
-      List<string> bakedObjectIds = new();
+      // Stage 1: Convert atomic objects
       Dictionary<string, List<Entity>> applicationIdMap = new();
       var count = 0;
-      foreach (var (layerPath, atomicObject) in atomicObjectsWithPath)
+      foreach (var (layerPath, atomicObject) in atomicObjects)
       {
         string objectId = atomicObject.applicationId ?? atomicObject.id;
         onOperationProgressed?.Invoke("Converting objects", (double)++count / atomicObjects.Count);
@@ -139,9 +169,9 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
         }
       }
 
-      // 6 - Convert instances
-      var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = _instanceBaker.BakeInstances(
-        instanceComponentsWithPath,
+      // Stage 2: Convert instances
+      var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = _instanceObjectsManager.BakeInstances(
+        instanceComponents,
         applicationIdMap,
         baseLayerPrefix,
         onOperationProgressed
@@ -152,29 +182,27 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
       results.RemoveAll(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
       results.AddRange(instanceConversionResults);
 
-      // 7 - Create groups
-      if (unpackedRoot.GroupProxies != null)
+      // Stage 3: Create group
+      if (groupProxies != null)
       {
-        List<ReceiveConversionResult> groupResults = _groupBaker.CreateGroups(
-          unpackedRoot.GroupProxies,
-          applicationIdMap
-        );
+        List<ReceiveConversionResult> groupResults = _groupManager.CreateGroups(groupProxies, applicationIdMap);
         results.AddRange(groupResults);
       }
 
       return new HostObjectBuilderResult(bakedObjectIds, results);
     });
+  }
 
   private void PreReceiveDeepClean(string baseLayerPrefix)
   {
-    _layerBaker.DeleteAllLayersByPrefix(baseLayerPrefix);
-    _instanceBaker.PurgeInstances(baseLayerPrefix);
-    _materialBaker.PurgeMaterials(baseLayerPrefix);
+    _autocadLayerManager.DeleteAllLayersByPrefix(baseLayerPrefix);
+    _instanceObjectsManager.PurgeInstances(baseLayerPrefix);
+    _materialManager.PurgeMaterials(baseLayerPrefix);
   }
 
   private IEnumerable<Entity> ConvertObject(Base obj, Collection[] layerPath, string baseLayerNamePrefix)
   {
-    string layerName = _layerBaker.CreateLayerForReceive(layerPath, baseLayerNamePrefix);
+    string layerName = _autocadLayerManager.CreateLayerForReceive(layerPath, baseLayerNamePrefix);
     var convertedEntities = new List<Entity>();
 
     using var tr = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
@@ -198,15 +226,15 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
     return convertedEntities;
   }
 
-  private Entity BakeObject(Entity entity, Base originalObject, string layerName, Base? parentObject = null)
+  private Entity BakeObject(Entity entity, Base originalObject, string layerName)
   {
     var objId = originalObject.applicationId ?? originalObject.id;
-    if (_colorBaker.ObjectColorsIdMap.TryGetValue(objId, out AutocadColor? color))
+    if (_colorManager.ObjectColorsIdMap.TryGetValue(objId, out AutocadColor? color))
     {
       entity.Color = color;
     }
 
-    if (_materialBaker.TryGetMaterialId(originalObject, parentObject, out ObjectId matId))
+    if (_materialManager.ObjectMaterialsIdMap.TryGetValue(objId, out ObjectId matId))
     {
       entity.MaterialId = matId;
     }
@@ -217,14 +245,14 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
 
   private List<Entity> BakeObjectsAsGroup(
     IEnumerable<(object, Base)> fallbackConversionResult,
-    Base parentObject,
+    Base originatingObject,
     string layerName,
     string baseLayerName
   )
   {
     var ids = new ObjectIdCollection();
     var entities = new List<Entity>();
-    foreach (var (conversionResult, originalObject) in fallbackConversionResult)
+    foreach (var (conversionResult, originalBaseObject) in fallbackConversionResult)
     {
       if (conversionResult is not Entity entity)
       {
@@ -232,7 +260,7 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
         continue;
       }
 
-      BakeObject(entity, originalObject, layerName, parentObject);
+      BakeObject(entity, originalBaseObject, layerName);
       ids.Add(entity.ObjectId);
       entities.Add(entity);
     }
@@ -242,7 +270,7 @@ public class AutocadHostObjectBuilder : IHostObjectBuilder
       tr.GetObject(Application.DocumentManager.CurrentDocument.Database.GroupDictionaryId, OpenMode.ForWrite);
 
     var groupName = _autocadContext.RemoveInvalidChars(
-      $@"{parentObject.speckle_type.Split('.').Last()} - {parentObject.applicationId ?? parentObject.id}  ({baseLayerName})"
+      $@"{originatingObject.speckle_type.Split('.').Last()} - {originatingObject.applicationId ?? originatingObject.id}  ({baseLayerName})"
     );
 
     var newGroup = new Group(groupName, true);

Connectors/Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBuilder.cs

@@ -1,19 +1,17 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
 using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Autocad;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.Common;
+using Speckle.Objects.Other;
 using Speckle.Sdk;
-using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
+using Speckle.Sdk.Models.Proxies;
 
 namespace Speckle.Connectors.Autocad.Operations.Send;
 
@@ -21,39 +19,33 @@ public class AutocadRootObjectBuilder : IRootObjectBuilder<AutocadRootObject>
 {
   private readonly IRootToSpeckleConverter _converter;
   private readonly string[] _documentPathSeparator = ["\\"];
-  private readonly IConverterSettingsStore<AutocadConversionSettings> _converterSettings;
   private readonly ISendConversionCache _sendConversionCache;
-  private readonly AutocadInstanceUnpacker _instanceUnpacker;
-  private readonly AutocadMaterialUnpacker _materialUnpacker;
-  private readonly AutocadColorUnpacker _colorUnpacker;
-  private readonly AutocadLayerUnpacker _layerUnpacker;
-  private readonly AutocadGroupUnpacker _groupUnpacker;
-  private readonly ILogger<AutocadRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
+  private readonly AutocadInstanceObjectManager _instanceObjectsManager;
+  private readonly AutocadMaterialManager _materialManager;
+  private readonly AutocadColorManager _colorManager;
+  private readonly AutocadLayerManager _layerManager;
+  private readonly AutocadGroupManager _groupManager;
+  private readonly ISyncToThread _syncToThread;
 
   public AutocadRootObjectBuilder(
     IRootToSpeckleConverter converter,
     ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadLayerUnpacker layerUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory,
-    IConverterSettingsStore<AutocadConversionSettings> converterSettings
+    AutocadInstanceObjectManager instanceObjectManager,
+    AutocadMaterialManager materialManager,
+    AutocadColorManager colorManager,
+    AutocadLayerManager layerManager,
+    AutocadGroupManager groupManager,
+    ISyncToThread syncToThread
   )
   {
     _converter = converter;
     _sendConversionCache = sendConversionCache;
-    _instanceUnpacker = instanceObjectManager;
-    _materialUnpacker = materialUnpacker;
-    _colorUnpacker = colorUnpacker;
-    _layerUnpacker = layerUnpacker;
-    _groupUnpacker = groupUnpacker;
-    _logger = logger;
-    _activityFactory = activityFactory;
-    _converterSettings = converterSettings;
+    _instanceObjectsManager = instanceObjectManager;
+    _materialManager = materialManager;
+    _colorManager = colorManager;
+    _layerManager = layerManager;
+    _groupManager = groupManager;
+    _syncToThread = syncToThread;
   }
 
   public Task<RootObjectBuilderResult> Build(
@@ -61,120 +53,110 @@ public class AutocadRootObjectBuilder : IRootObjectBuilder<AutocadRootObject>
     SendInfo sendInfo,
     Action<string, double?>? onOperationProgressed = null,
     CancellationToken ct = default
-  ) => Task.FromResult(BuildSync(objects, sendInfo, onOperationProgressed, ct));
-
-  [SuppressMessage(
-    "Maintainability",
-    "CA1506:Avoid excessive class coupling",
-    Justification = """
-      It is already simplified but has many different references since it is a builder. Do not know can we simplify it now.
-      Later we might consider to refactor proxies from one proxy manager? but we do not know the shape of it all potential
-      proxy classes yet. So I'm supressing this one now!!!
-      """
-  )]
-  private RootObjectBuilderResult BuildSync(
-    IReadOnlyList<AutocadRootObject> objects,
-    SendInfo sendInfo,
-    Action<string, double?>? onOperationProgressed,
-    CancellationToken ct
   )
   {
-    // 0 - Init the root
-    Collection root =
-      new()
-      {
-        name = Application
-          .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
-          .Split(_documentPathSeparator, StringSplitOptions.None)
-          .Reverse()
-          .First()
-      };
-    root["units"] = _converterSettings.Current.SpeckleUnits;
-
-    // TODO: better handling for document and transactions!!
-    Document doc = Application.DocumentManager.CurrentDocument;
-    using Transaction tr = doc.Database.TransactionManager.StartTransaction();
-
-    // 1 - Unpack the instances
-    var (atomicObjects, instanceProxies, instanceDefinitionProxies) = _instanceUnpacker.UnpackSelection(objects);
-    root[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies;
-
-    // 2 - Unpack the groups
-    root[ProxyKeys.GROUP] = _groupUnpacker.UnpackGroups(atomicObjects);
-    using (var _ = _activityFactory.Start("Converting objects"))
+    return _syncToThread.RunOnThread(() =>
     {
-      // 3 - Convert atomic objects
-      List<LayerTableRecord> usedAcadLayers = new(); // Keeps track of autocad layers used, so we can pass them on later to the material and color unpacker.
-      List<SendConversionResult> results = new();
+      Collection modelWithLayers =
+        new()
+        {
+          name = Application
+            .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
+            .Split(_documentPathSeparator, StringSplitOptions.None)
+            .Reverse()
+            .First()
+        };
+
+      // TODO: better handling for document and transactions!!
+      Document doc = Application.DocumentManager.CurrentDocument;
+      using Transaction tr = doc.Database.TransactionManager.StartTransaction();
+
+      // Keeps track of autocad layers used, so we can pass them on later to the material and color unpacker.
+      List<LayerTableRecord> usedAcadLayers = new();
       int count = 0;
+
+      var (atomicObjects, instanceProxies, instanceDefinitionProxies) = _instanceObjectsManager.UnpackSelection(
+        objects
+      );
+
+      List<SendConversionResult> results = new();
+      var cacheHitCount = 0;
+
       foreach (var (entity, applicationId) in atomicObjects)
       {
         ct.ThrowIfCancellationRequested();
-        using (var convertActivity = _activityFactory.Start("Converting object"))
+        try
         {
+          Base converted;
+          if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
+          {
+            converted = instanceProxy;
+          }
+          else if (_sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference value))
+          {
+            converted = value;
+            cacheHitCount++;
+          }
+          else
+          {
+            converted = _converter.Convert(entity);
+            converted.applicationId = applicationId;
+          }
+
           // Create and add a collection for each layer if not done so already.
-          Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
+          Layer layer = _layerManager.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
           if (autocadLayer is not null)
           {
             usedAcadLayers.Add(autocadLayer);
-            root.elements.Add(layer);
+            modelWithLayers.elements.Add(layer);
           }
 
-          var result = ConvertAutocadEntity(entity, applicationId, layer, instanceProxies, sendInfo.ProjectId);
-          results.Add(result);
-
-          onOperationProgressed?.Invoke("Converting", (double)++count / atomicObjects.Count);
+          layer.elements.Add(converted);
+          results.Add(new(Status.SUCCESS, applicationId, entity.GetType().ToString(), converted));
         }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+          results.Add(new(Status.ERROR, applicationId, entity.GetType().ToString(), null, ex));
+          // POC: add logging
+        }
+        onOperationProgressed?.Invoke("Converting", (double)++count / atomicObjects.Count);
       }
 
-      if (results.All(x => x.Status == Status.ERROR))
+      // POC: Log would be nice, or can be removed.
+      Debug.WriteLine(
+        $"Cache hit count {cacheHitCount} out of {objects.Count} ({(double)cacheHitCount / objects.Count})"
+      );
+
+      var conversionFailedAppIds = results
+        .FindAll(result => result.Status == Status.ERROR)
+        .Select(result => result.SourceId);
+
+      // Cleans up objects that failed to convert from definition proxies.
+      // see https://linear.app/speckle/issue/CNX-115/viewer-handle-gracefully-instances-with-elements-that-failed-to
+      foreach (var definitionProxy in instanceDefinitionProxies)
       {
-        throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+        definitionProxy.objects.RemoveAll(id => conversionFailedAppIds.Contains(id));
       }
+      // Set definition proxies
+      modelWithLayers["instanceDefinitionProxies"] = instanceDefinitionProxies;
 
-      // 4 - Unpack the render material proxies
-      root[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackMaterials(atomicObjects, usedAcadLayers);
+      // set groups
+      List<GroupProxy> groupProxies = _groupManager.UnpackGroups(atomicObjects);
+      modelWithLayers["groupProxies"] = groupProxies;
 
-      // 5 - Unpack the color proxies
-      root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);
+      // set materials
+      List<RenderMaterialProxy> materialProxies = _materialManager.UnpackMaterials(atomicObjects, usedAcadLayers);
+      modelWithLayers["renderMaterialProxies"] = materialProxies;
 
-      return new RootObjectBuilderResult(root, results);
-    }
-  }
+      // set colors
+      List<ColorProxy> colorProxies = _colorManager.UnpackColors(
+        atomicObjects,
+        usedAcadLayers,
+        instanceDefinitionProxies
+      );
+      modelWithLayers["colorProxies"] = colorProxies;
 
-  private SendConversionResult ConvertAutocadEntity(
-    Entity entity,
-    string applicationId,
-    Collection collectionHost,
-    IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
-    string projectId
-  )
-  {
-    string sourceType = entity.GetType().ToString();
-    try
-    {
-      Base converted;
-      if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
-      {
-        converted = instanceProxy;
-      }
-      else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
-      {
-        converted = value;
-      }
-      else
-      {
-        converted = _converter.Convert(entity);
-        converted.applicationId = applicationId;
-      }
-
-      collectionHost.elements.Add(converted);
-      return new(Status.SUCCESS, applicationId, sourceType, converted);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogSendConversionError(ex, sourceType);
-      return new(Status.ERROR, applicationId, sourceType, null, ex);
-    }
+      return new RootObjectBuilderResult(modelWithLayers, results);
+    });
   }
 }

Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs

@@ -1,25 +1,22 @@
 using System.Drawing;
+using System.IO;
+using System.Reflection;
 using Autodesk.AutoCAD.Runtime;
 using Autodesk.AutoCAD.Windows;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Autocad.DependencyInjection;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.DUI;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.DUI.WebView;
-#if AUTOCAD
-using Speckle.Converters.Autocad;
-#elif CIVIL3D
-using Speckle.Converters.Civil3d;
-#endif
+using Speckle.Connectors.Utils;
+using Speckle.Sdk.Common;
+
 namespace Speckle.Connectors.Autocad.Plugin;
 
 public class AutocadCommand
 {
   private static PaletteSet? PaletteSet { get; set; }
   private static readonly Guid s_id = new("3223E594-1B09-4E54-B3DD-8EA0BECE7BA5");
-  public ServiceProvider? Container { get; private set; }
+  public SpeckleContainer? Container { get; private set; }
   private IDisposable? _disposableLogger;
-  public const string COMMAND_STRING = "SpeckleBeta";
+  public const string COMMAND_STRING = "SpeckleNewUI";
 
   [CommandMethod(COMMAND_STRING)]
   public void Command()
@@ -30,28 +27,26 @@ public class AutocadCommand
       return;
     }
 
-    PaletteSet = new PaletteSet("Speckle (Beta) for Autocad", s_id)
+    PaletteSet = new PaletteSet("Speckle DUI3", s_id)
     {
       Size = new Size(400, 500),
       DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
     };
 
+    var builder = SpeckleContainerBuilder.CreateInstance();
+
     // init DI
-    var services = new ServiceCollection();
-    _disposableLogger = services.Initialize(AppUtils.App, AppUtils.Version);
-#if AUTOCAD
-    services.AddAutocad();
-    services.AddAutocadConverters();
-#elif CIVIL3D
-    services.AddCivil3d();
-    services.AddCivil3dConverters();
-#endif
-    Container = services.BuildServiceProvider();
-    Container.UseDUI();
+    _disposableLogger = Connector.Initialize(AppUtils.App, AppUtils.Version);
+    Container = builder
+      .LoadAutofacModules(
+        Assembly.GetExecutingAssembly(),
+        [Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location).NotNull()]
+      )
+      .Build();
 
-    var panelWebView = Container.GetRequiredService<DUI3ControlWebView>();
+    var panelWebView = Container.Resolve<DUI3ControlWebView>();
 
-    PaletteSet.AddVisual("Speckle (Beta) for Autocad WebView", panelWebView);
+    PaletteSet.AddVisual("Speckle DUI3 WebView", panelWebView);
 
     FocusPalette();
   }

Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadExtensionApplication.cs

@@ -1,5 +1,5 @@
 using Autodesk.AutoCAD.Runtime;
-using Speckle.Connectors.Common;
+using Speckle.Autofac;
 
 namespace Speckle.Connectors.Autocad.Plugin;
 

Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadRibbon.cs

@@ -4,6 +4,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Autodesk.Windows;
 using Speckle.Sdk;
+using Speckle.Sdk.Logging;
 
 namespace Speckle.Connectors.Autocad.Plugin;
 
@@ -177,9 +178,18 @@ public class AutocadRibbon
     {
       stream = assembly.GetManifestResourceStream(resource);
     }
-    catch (FileLoadException) { }
-    catch (FileNotFoundException) { }
-    catch (NotImplementedException) { }
+    catch (FileLoadException flEx)
+    {
+      SpeckleLog.Logger.Error(flEx, "Could not load app image source: {exceptionMessage}");
+    }
+    catch (FileNotFoundException fnfEx)
+    {
+      SpeckleLog.Logger.Error(fnfEx, "Could not find app image source: {exceptionMessage}");
+    }
+    catch (NotImplementedException niEx)
+    {
+      SpeckleLog.Logger.Error(niEx, "App image source could not be loaded: {exceptionMessage}");
+    }
 
     if (stream is null)
     {

Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems

@@ -17,20 +17,15 @@
     <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\AutocadConnectorModule.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Civil3dConnectorModule.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Filters\AutocadSelectionFilter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadColorBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadColorUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadGroupBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadGroupUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadInstanceBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadInstanceUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadLayerBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadLayerUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadMaterialBaker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadMaterialManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadGroupManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadInstanceObjectManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadDocumentManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadDocumentModelStore.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadIdleManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadMaterialUnpacker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadColorManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadLayerManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\DatabaseExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\DocumentExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\EditorExtensions.cs" />

Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj

@@ -2,12 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <Civil3DVersion>2024</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2024_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +13,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2024\Speckle.Converters.Civil3d2024.csproj" />
+    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2023.DependencyInjection\Speckle.Converters.Autocad2023.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>

Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -80,6 +71,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -109,57 +108,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -193,6 +196,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -225,22 +233,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -254,8 +262,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -267,8 +275,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -278,21 +310,24 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -303,50 +338,71 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
-      },
-      "speckle.converters.civil3d2024": {
+      "speckle.connectors.utils": {
         "type": "Project",
         "dependencies": {
-          "Speckle.AutoCAD.API": "[2024.0.0, )",
-          "Speckle.Civil3D.API": "[2024.0.0, )",
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.autocad2023": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.AutoCAD.API": "[2023.0.0, )",
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
+      "speckle.converters.autocad2023.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Autofac": "[5.2.0, )",
+          "Speckle.Converters.Autocad2023": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -356,29 +412,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Revit/Speckle.Connectors.Revit2022/Plugin/Speckle.Connectors.Revit2022.addin

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RevitAddIns>
   <AddIn Type="Application">
-    <Name>Speckle (Beta) for Revit</Name>
-    <Description>Speckle (Beta) for Revit</Description>
+    <Name>Speckle Revit Connector New UI</Name>
+    <Description>Speckle Revit Connector New UI</Description>
     <Assembly>Speckle.Connectors.Revit2022\Speckle.Connectors.Revit2022.dll</Assembly>
     <FullClassName>Speckle.Connectors.Revit.Plugin.RevitExternalApplication</FullClassName>
     <ClientId>27ccff2c-011c-4374-bb79-b93990d0c86a</ClientId>

Connectors/Revit/Speckle.Connectors.Revit2022/Speckle.Connectors.Revit2022.csproj

@@ -25,9 +25,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2022.DependencyInjection\Speckle.Converters.Revit2022.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2022\Speckle.Converters.Revit2022.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI\Speckle.Connectors.DUI.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json

@@ -11,15 +11,6 @@
           "CefSharp.Common": "[65.0.1]"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -99,6 +90,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -128,57 +127,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -212,6 +215,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -244,22 +252,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -273,8 +281,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -286,8 +294,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -297,75 +329,101 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.revit2022": {
         "type": "Project",
         "dependencies": {
           "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )",
           "Speckle.Revit.API": "[2022.0.2.1, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.revit2022.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )",
+          "Speckle.Converters.Revit2022": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Revit.API": {
@@ -376,20 +434,20 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Revit/Speckle.Connectors.Revit2023/Plugin/Speckle.Connectors.Revit2023.addin

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RevitAddIns>
   <AddIn Type="Application">
-    <Name>Speckle (Beta) for Revit</Name>
-    <Description>Speckle (Beta) for Revit</Description>
+    <Name>Speckle Revit Connector New UI</Name>
+    <Description>Speckle Revit Connector New UI</Description>
     <Assembly>Speckle.Connectors.Revit2023\Speckle.Connectors.Revit2023.dll</Assembly>
     <FullClassName>Speckle.Connectors.Revit.Plugin.RevitExternalApplication</FullClassName>
     <ClientId>27ccff2c-011c-4374-bb79-b93990d0c86a</ClientId>

Connectors/Revit/Speckle.Connectors.Revit2023/Speckle.Connectors.Revit2023.csproj

@@ -24,9 +24,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2023.DependencyInjection\Speckle.Converters.Revit2023.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2023\Speckle.Converters.Revit2023.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI\Speckle.Connectors.DUI.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -35,6 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Plugin\Speckle.Connectors.Revit2023.addin" />
     <Content Include="Plugin\Speckle.Connectors.Revit2023.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json

@@ -11,15 +11,6 @@
           "CefSharp.Common": "[92.0.260]"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -99,6 +90,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -128,57 +127,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -212,6 +215,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -244,22 +252,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -273,8 +281,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -286,8 +294,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -297,32 +329,49 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.revit2023": {
@@ -332,40 +381,48 @@
           "Speckle.Revit.API": "[2023.0.0, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.revit2023.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )",
+          "Speckle.Converters.Revit2023": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Revit.API": {
@@ -376,20 +433,20 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Revit/Speckle.Connectors.Revit2024/Plugin/Speckle.Connectors.Revit2024.addin

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RevitAddIns>
   <AddIn Type="Application">
-    <Name>Speckle (Beta) for Revit</Name>
-    <Description>Speckle (Beta) for Revit</Description>
+    <Name>Speckle Revit Connector New UI</Name>
+    <Description>Speckle Revit Connector New UI</Description>
     <Assembly>Speckle.Connectors.Revit2024\Speckle.Connectors.Revit2024.dll</Assembly>
     <FullClassName>Speckle.Connectors.Revit.Plugin.RevitExternalApplication</FullClassName>
     <ClientId>27ccff2c-011c-4374-bb79-b93990d0c86a</ClientId>

Connectors/Revit/Speckle.Connectors.Revit2024/Speckle.Connectors.Revit2024.csproj

@@ -24,9 +24,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2024.DependencyInjection\Speckle.Converters.Revit2024.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2024\Speckle.Converters.Revit2024.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI\Speckle.Connectors.DUI.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json

@@ -11,15 +11,6 @@
           "CefSharp.Common": "[105.3.390]"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -99,6 +90,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -128,57 +127,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -212,6 +215,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -244,22 +252,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -273,8 +281,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -286,8 +294,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -297,32 +329,49 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.revit2024": {
@@ -332,40 +381,48 @@
           "Speckle.Revit.API": "[2024.0.0, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.revit2024.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )",
+          "Speckle.Converters.Revit2024": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Revit.API": {
@@ -376,20 +433,20 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Revit/Speckle.Connectors.Revit2025/Plugin/Speckle.Connectors.Revit2025.addin

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RevitAddIns>
   <AddIn Type="Application">
-    <Name>Speckle (Beta) for Revit</Name>
-    <Description>Speckle (Beta) for Revit</Description>
+    <Name>Speckle Revit Connector New UI</Name>
+    <Description>Speckle Revit Connector New UI</Description>
     <Assembly>Speckle.Connectors.Revit2025\Speckle.Connectors.Revit2025.dll</Assembly>
     <FullClassName>Speckle.Connectors.Revit.Plugin.RevitExternalApplication</FullClassName>
     <ClientId>27ccff2c-011c-4374-bb79-b93990d0c86a</ClientId>

Connectors/Revit/Speckle.Connectors.Revit2025/Speckle.Connectors.Revit2025.csproj

@@ -14,16 +14,18 @@
 
   <Import Project="..\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems" Label="Shared" />
 
-  <Import Project="..\Speckle.Connectors.RevitShared.Cef\Speckle.Connectors.RevitShared.Cef.projitems" Label="Shared" />
-
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2025.DependencyInjection\Speckle.Converters.Revit2025.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2025\Speckle.Converters.Revit2025.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CefSharp.Wpf.NETCore" IncludeAssets="compile" VersionOverride="119.4.30.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" IncludeAssets="compile" />
     <PackageReference Include="Revit.Async" />
   </ItemGroup>
 

Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json

@@ -2,24 +2,6 @@
   "version": 2,
   "dependencies": {
     "net8.0-windows7.0": {
-      "CefSharp.Wpf.NETCore": {
-        "type": "Direct",
-        "requested": "[119.4.30, )",
-        "resolved": "119.4.30",
-        "contentHash": "S8iTV5UAO9my2O4c6mJKtScDrXbPPS9k5cOs247X7xvly4mb0XsLOFmLjXM1/gsuYfYx5Dy0k6mgCwTZMC6NMg==",
-        "dependencies": {
-          "CefSharp.Common.NETCore": "[119.4.30]"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -30,6 +12,12 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
+      "Microsoft.Web.WebView2": {
+        "type": "Direct",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -48,19 +36,6 @@
         "resolved": "0.9.6",
         "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
       },
-      "CefSharp.Common.NETCore": {
-        "type": "Transitive",
-        "resolved": "119.4.30",
-        "contentHash": "nu5zqeOL+ubs723jU/EJWdMNAefzXtucKAewv4Mvh3tLLeoGsGbz0oZM36vIuBgAzhhsE+ZO4uzkdhk6X9JwJA==",
-        "dependencies": {
-          "chromiumembeddedframework.runtime": "[119.4.3]"
-        }
-      },
-      "chromiumembeddedframework.runtime": {
-        "type": "Transitive",
-        "resolved": "119.4.3",
-        "contentHash": "JEYg94tEtdyIIm9hQvZ/vP0/+9w5ebvZFfcJ22NG16BjeEm5y6dC0B86DIsKwwhj1RhnfyEbp8JVKuY8imCO5w=="
-      },
       "GraphQL.Client": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -121,56 +96,54 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg=="
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
@@ -205,6 +178,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -235,11 +213,6 @@
           "SQLitePCLRaw.core": "2.1.4"
         }
       },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -250,26 +223,24 @@
         "resolved": "5.0.0",
         "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
       },
-      "System.Runtime.CompilerServices.Unsafe": {
+      "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "4.5.1",
-        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
       },
-      "speckle.connectors.common": {
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -280,14 +251,28 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.revit2025": {
@@ -297,46 +282,45 @@
           "Speckle.Revit.API": "[2025.0.0, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.revit2025.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Converters.Common.DependencyInjection": "[1.0.0, )",
+          "Speckle.Converters.Revit2025": "[1.0.0, )"
         }
       },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg=="
+      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Revit.API": {
@@ -347,20 +331,20 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {
@@ -371,37 +355,16 @@
       }
     },
     "net8.0-windows7.0/win-x64": {
-      "CefSharp.Common.NETCore": {
-        "type": "Transitive",
-        "resolved": "119.4.30",
-        "contentHash": "nu5zqeOL+ubs723jU/EJWdMNAefzXtucKAewv4Mvh3tLLeoGsGbz0oZM36vIuBgAzhhsE+ZO4uzkdhk6X9JwJA==",
-        "dependencies": {
-          "chromiumembeddedframework.runtime": "[119.4.3]"
-        }
-      },
-      "chromiumembeddedframework.runtime": {
-        "type": "Transitive",
-        "resolved": "119.4.3",
-        "contentHash": "JEYg94tEtdyIIm9hQvZ/vP0/+9w5ebvZFfcJ22NG16BjeEm5y6dC0B86DIsKwwhj1RhnfyEbp8JVKuY8imCO5w==",
-        "dependencies": {
-          "chromiumembeddedframework.runtime.win-x64": "119.4.3"
-        }
-      },
-      "chromiumembeddedframework.runtime.win-x64": {
-        "type": "Transitive",
-        "resolved": "119.4.3",
-        "contentHash": "teW7othTAZyUVTlvO2DP7hceibFo1cKcjGXITFzIIhygNQVu2iAeFivzgH9HKK/tU1IUACOSSceaoR99USZ8Sw=="
+      "Microsoft.Web.WebView2": {
+        "type": "Direct",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
       "SQLitePCLRaw.lib.e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
         "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       }
     }
   }

Connectors/Revit/Speckle.Connectors.RevitShared.Cef/CefSharpPanel.xaml.cs

@@ -1,3 +1,4 @@
+#if !REVIT2025
 using System.Windows.Controls;
 using System.Windows.Threading;
 using Autodesk.Revit.UI;
@@ -31,3 +32,4 @@ public partial class CefSharpPanel : Page, Autodesk.Revit.UI.IDockablePaneProvid
     };
   }
 }
+#endif

Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs

@@ -1,10 +1,11 @@
+using System.Reflection;
 using Autodesk.Revit.DB;
-using Microsoft.Extensions.Logging;
 using Revit.Async;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.RevitShared;
+using Speckle.Connectors.Utils.Common;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
@@ -15,29 +16,19 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
 {
   // POC: name and bridge might be better for them to be protected props?
   public string Name { get; private set; }
-  public IBrowserBridge Parent { get; private set; }
+  public IBridge Parent { get; private set; }
 
   public BasicConnectorBindingCommands Commands { get; }
 
   private readonly DocumentModelStore _store;
   private readonly RevitContext _revitContext;
-  private readonly ISpeckleApplication _speckleApplication;
-  private readonly ILogger<BasicConnectorBindingRevit> _logger;
 
-  public BasicConnectorBindingRevit(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    RevitContext revitContext,
-    ISpeckleApplication speckleApplication,
-    ILogger<BasicConnectorBindingRevit> logger
-  )
+  public BasicConnectorBindingRevit(DocumentModelStore store, IBridge parent, RevitContext revitContext)
   {
     Name = "baseBinding";
     Parent = parent;
     _store = store;
     _revitContext = revitContext;
-    _speckleApplication = speckleApplication;
-    _logger = logger;
     Commands = new BasicConnectorBindingCommands(parent);
 
     // POC: event binding?
@@ -47,11 +38,11 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
     };
   }
 
-  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
+  public string GetConnectorVersion() => Assembly.GetAssembly(GetType()).NotNull().GetVersion();
 
-  public string GetSourceApplicationName() => _speckleApplication.Slug;
+  public string GetSourceApplicationName() => Speckle.Connectors.Utils.Connector.Slug.ToLower(); // POC: maybe not right place but... // ANOTHER POC: We should align this naming from somewhere in common DUI projects instead old structs. I know there are other POC comments around this
 
-  public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
+  public string GetSourceApplicationVersion() => Speckle.Connectors.Utils.Connector.VersionString; // POC: maybe not right place but...
 
   public DocumentInfo? GetDocumentInfo()
   {
@@ -84,37 +75,9 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
 
   public void HighlightModel(string modelCardId)
   {
-    var model = _store.GetModelById(modelCardId);
-
-    if (model is null)
-    {
-      _logger.LogError("Model was null when highlighting received model");
-      return;
-    }
-
-    var activeUIDoc =
-      _revitContext.UIApplication?.ActiveUIDocument
-      ?? throw new SpeckleException("Unable to retrieve active UI document");
-
-    var elementIds = new List<ElementId>();
-
-    if (model is SenderModelCard senderModelCard)
-    {
-      elementIds = senderModelCard
-        .SendFilter.NotNull()
-        .GetObjectIds()
-        .Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid))
-        .ToList();
-    }
-
-    if (model is ReceiverModelCard receiverModelCard)
-    {
-      elementIds = receiverModelCard
-        .BakedObjectIds.NotNull()
-        .Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid))
-        .ToList();
-    }
+    SenderModelCard model = (SenderModelCard)_store.GetModelById(modelCardId);
 
+    var elementIds = model.SendFilter.NotNull().GetObjectIds().Select(ElementIdHelper.Parse).ToList();
     if (elementIds.Count == 0)
     {
       Commands.SetModelError(modelCardId, new InvalidOperationException("No objects found to highlight."));
@@ -124,20 +87,8 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
     HighlightObjectsOnView(elementIds);
   }
 
-  /// <summary>
-  /// Highlights the objects from the given ids.
-  /// </summary>
-  /// <param name="objectIds"> UniqueId's of the DB.Elements.</param>
-  public void HighlightObjects(List<string> objectIds)
-  {
-    var activeUIDoc =
-      _revitContext.UIApplication?.ActiveUIDocument
-      ?? throw new SpeckleException("Unable to retrieve active UI document");
-
-    HighlightObjectsOnView(
-      objectIds.Select(uid => ElementIdHelper.GetElementIdFromUniqueId(activeUIDoc.Document, uid)).ToList()
-    );
-  }
+  public void HighlightObjects(List<string> objectIds) =>
+    HighlightObjectsOnView(objectIds.Select(ElementIdHelper.Parse).ToList());
 
   private void HighlightObjectsOnView(List<ElementId> objectIds)
   {

Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitBaseBinding.cs

@@ -9,12 +9,12 @@ internal abstract class RevitBaseBinding : IBinding
 {
   // POC: name and bridge might be better for them to be protected props?
   public string Name { get; }
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   protected readonly DocumentModelStore Store;
   protected readonly RevitContext RevitContext;
 
-  protected RevitBaseBinding(string name, DocumentModelStore store, IBrowserBridge parent, RevitContext revitContext)
+  protected RevitBaseBinding(string name, DocumentModelStore store, IBridge parent, RevitContext revitContext)
   {
     Name = name;
     Parent = parent;

Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs

@@ -1,16 +1,13 @@
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
-using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.Common;
-using Speckle.Converters.RevitShared.Settings;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Cancellation;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk;
 
 namespace Speckle.Connectors.Revit.Bindings;
@@ -18,48 +15,39 @@ namespace Speckle.Connectors.Revit.Bindings;
 internal sealed class RevitReceiveBinding : IReceiveBinding
 {
   public string Name => "receiveBinding";
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
 
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<RevitReceiveBinding> _logger;
   private readonly CancellationManager _cancellationManager;
   private readonly DocumentModelStore _store;
-  private readonly IServiceProvider _serviceProvider;
-  private readonly IRevitConversionSettingsFactory _revitConversionSettingsFactory;
-  private readonly ISpeckleApplication _speckleApplication;
+  private readonly IUnitOfWorkFactory _unitOfWorkFactory;
   private ReceiveBindingUICommands Commands { get; }
 
   public RevitReceiveBinding(
     DocumentModelStore store,
     CancellationManager cancellationManager,
-    IBrowserBridge parent,
-    IServiceProvider serviceProvider,
+    IBridge parent,
+    IUnitOfWorkFactory unitOfWorkFactory,
     IOperationProgressManager operationProgressManager,
-    ILogger<RevitReceiveBinding> logger,
-    IRevitConversionSettingsFactory revitConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
+    ILogger<RevitReceiveBinding> logger
   )
   {
     Parent = parent;
     _store = store;
-    _serviceProvider = serviceProvider;
+    _unitOfWorkFactory = unitOfWorkFactory;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
-    _revitConversionSettingsFactory = revitConversionSettingsFactory;
-    _speckleApplication = speckleApplication;
     _cancellationManager = cancellationManager;
 
     Commands = new ReceiveBindingUICommands(parent);
   }
 
-#pragma warning disable CA1024
-  public List<ICardSetting> GetReceiveSettings() => [];
-#pragma warning restore CA1024
-
   public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
 
   public async Task Receive(string modelCardId)
   {
+    using var unitOfWork = _unitOfWorkFactory.Resolve<ReceiveOperation>();
     try
     {
       // Get receiver card
@@ -71,21 +59,10 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
 
       CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
 
-      using var scope = _serviceProvider.CreateScope();
-      scope
-        .ServiceProvider.GetRequiredService<IConverterSettingsStore<RevitConversionSettings>>()
-        .Initialize(
-          _revitConversionSettingsFactory.Create(
-            DetailLevelType.Coarse, //TODO figure out
-            null,
-            false
-          )
-        );
       // Receive host objects
-      HostObjectBuilderResult conversionResults = await scope
-        .ServiceProvider.GetRequiredService<ReceiveOperation>()
-        .Execute(
-          modelCard.GetReceiveInfo(_speckleApplication.Slug),
+      HostObjectBuilderResult conversionResults = await unitOfWork
+        .Service.Execute(
+          modelCard.GetReceiveInfo(Speckle.Connectors.Utils.Connector.Slug),
           cancellationToken,
           (status, progress) =>
             _operationProgressManager.SetModelProgress(

Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs

@@ -1,10 +1,7 @@
 using System.Collections.Concurrent;
 using Autodesk.Revit.DB;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Exceptions;
@@ -13,12 +10,12 @@ using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Settings;
-using Speckle.Connectors.Revit.HostApp;
-using Speckle.Connectors.Revit.Operations.Send.Settings;
 using Speckle.Connectors.Revit.Plugin;
-using Speckle.Converters.Common;
+using Speckle.Connectors.RevitShared;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Cancellation;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.RevitShared.Helpers;
-using Speckle.Converters.RevitShared.Settings;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
 
@@ -28,14 +25,10 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
 {
   private readonly IRevitIdleManager _idleManager;
   private readonly CancellationManager _cancellationManager;
-  private readonly IServiceProvider _serviceProvider;
+  private readonly IUnitOfWorkFactory _unitOfWorkFactory;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly IOperationProgressManager _operationProgressManager;
-  private readonly ToSpeckleSettingsManager _toSpeckleSettingsManager;
   private readonly ILogger<RevitSendBinding> _logger;
-  private readonly ElementUnpacker _elementUnpacker;
-  private readonly IRevitConversionSettingsFactory _revitConversionSettingsFactory;
-  private readonly ISpeckleApplication _speckleApplication;
 
   /// <summary>
   /// Used internally to aggregate the changed objects' id. Note we're using a concurrent dictionary here as the expiry check method is not thread safe, and this was causing problems. See:
@@ -50,28 +43,20 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
     RevitContext revitContext,
     DocumentModelStore store,
     CancellationManager cancellationManager,
-    IBrowserBridge bridge,
-    IServiceProvider serviceProvider,
+    IBridge bridge,
+    IUnitOfWorkFactory unitOfWorkFactory,
     ISendConversionCache sendConversionCache,
     IOperationProgressManager operationProgressManager,
-    ToSpeckleSettingsManager toSpeckleSettingsManager,
-    ILogger<RevitSendBinding> logger,
-    ElementUnpacker elementUnpacker,
-    IRevitConversionSettingsFactory revitConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
+    ILogger<RevitSendBinding> logger
   )
     : base("sendBinding", store, bridge, revitContext)
   {
     _idleManager = idleManager;
     _cancellationManager = cancellationManager;
-    _serviceProvider = serviceProvider;
+    _unitOfWorkFactory = unitOfWorkFactory;
     _sendConversionCache = sendConversionCache;
     _operationProgressManager = operationProgressManager;
-    _toSpeckleSettingsManager = toSpeckleSettingsManager;
     _logger = logger;
-    _elementUnpacker = elementUnpacker;
-    _revitConversionSettingsFactory = revitConversionSettingsFactory;
-    _speckleApplication = speckleApplication;
     var topLevelExceptionHandler = Parent.TopLevelExceptionHandler;
 
     Commands = new SendBindingUICommands(bridge);
@@ -90,21 +75,35 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
     return new List<ISendFilter> { new RevitSelectionFilter() { IsDefault = true } };
   }
 
-  public List<ICardSetting> GetSendSettings() =>
-    [
-      new DetailLevelSetting(DetailLevelType.Medium),
-      new ReferencePointSetting(ReferencePointType.InternalOrigin),
-      new SendParameterNullOrEmptyStringsSetting(false)
-    ];
+  public List<CardSetting> GetSendSettings() =>
+    new()
+    {
+      new()
+      {
+        Id = "modelOrigin",
+        Title = "Model Origin",
+        Type = "string",
+        Enum = ["Internal Origin", "Project Base", "Survey"],
+        Value = "Internal Origin"
+      },
+      new()
+      {
+        Id = "geometryFidelity",
+        Title = "Geometry Fidelity",
+        Type = "string",
+        Enum = ["Coarse", "Medium", "Fine"],
+        Value = "Coarse"
+      },
+    };
 
-  public void CancelSend(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
+  public void CancelSend(string modelCardId)
+  {
+    _cancellationManager.CancelOperation(modelCardId);
+  }
 
   public SendBindingUICommands Commands { get; }
 
-  // yes we know Send function calls many different namespace, we know. But currently I don't see any simplification area we can work on!
-#pragma warning disable CA1506
   public async Task Send(string modelCardId)
-#pragma warning restore CA1506
   {
     // Note: removed top level handling thing as it was confusing me
     try
@@ -117,24 +116,14 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
 
       CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
 
-      using var scope = _serviceProvider.CreateScope();
-      scope
-        .ServiceProvider.GetRequiredService<IConverterSettingsStore<RevitConversionSettings>>()
-        .Initialize(
-          _revitConversionSettingsFactory.Create(
-            _toSpeckleSettingsManager.GetDetailLevelSetting(modelCard),
-            _toSpeckleSettingsManager.GetReferencePointSetting(modelCard),
-            _toSpeckleSettingsManager.GetSendParameterNullOrEmptyStringsSetting(modelCard)
-          )
-        );
+      using IUnitOfWork<SendOperation<ElementId>> sendOperation = _unitOfWorkFactory.Resolve<
+        SendOperation<ElementId>
+      >();
 
-      var activeUIDoc =
-        RevitContext.UIApplication?.ActiveUIDocument
-        ?? throw new SpeckleException("Unable to retrieve active UI document");
       List<ElementId> revitObjects = modelCard
         .SendFilter.NotNull()
         .GetObjectIds()
-        .Select(uid => activeUIDoc.Document.GetElement(uid).Id)
+        .Select(ElementIdHelper.Parse)
         .ToList();
 
       if (revitObjects.Count == 0)
@@ -143,11 +132,10 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
         throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
       }
 
-      var sendResult = await scope
-        .ServiceProvider.GetRequiredService<SendOperation<ElementId>>()
-        .Execute(
+      var sendResult = await sendOperation
+        .Service.Execute(
           revitObjects,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(Speckle.Connectors.Utils.Connector.Slug),
           (status, progress) =>
             _operationProgressManager.SetModelProgress(
               Parent,
@@ -200,74 +188,21 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
       ChangedObjectIds[elementId.ToString()] = 1;
     }
 
-    if (HaveUnitsChanged(e.GetDocument()))
-    {
-      var objectIds = Store.GetSenders().SelectMany(s => s.SendFilter != null ? s.SendFilter.GetObjectIds() : []);
-      var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objectIds.ToList());
-      _sendConversionCache.EvictObjects(unpackedObjectIds);
-    }
+    // TODO: CHECK IF ANY OF THE ABOVE ELEMENTS NEED TO TRIGGER A FILTER REFRESH
     _idleManager.SubscribeToIdle(nameof(RevitSendBinding), RunExpirationChecks);
   }
 
-  // Keeps track of doc and current units
-  private readonly Dictionary<string, string> _docUnitCache = new();
-
-  private bool HaveUnitsChanged(Document doc)
-  {
-    var docId = doc.Title + doc.PathName;
-    var unitSpecTypeIds = new List<ForgeTypeId>() // list of units we care about
-    {
-      SpecTypeId.Angle,
-      SpecTypeId.Area,
-      SpecTypeId.Distance,
-      SpecTypeId.Length,
-      SpecTypeId.Volume
-    };
-    var units = "";
-    foreach (var typeId in unitSpecTypeIds)
-    {
-      units += doc.GetUnits().GetFormatOptions(typeId).GetUnitTypeId().TypeId;
-    }
-
-    if (_docUnitCache.TryGetValue(docId, out string? value))
-    {
-      if (value == units)
-      {
-        return false;
-      }
-      _docUnitCache[docId] = units;
-      return true;
-    }
-
-    _docUnitCache[docId] = units;
-    return false;
-  }
-
   private void RunExpirationChecks()
   {
     var senders = Store.GetSenders();
     string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
-    var doc = RevitContext.UIApplication?.ActiveUIDocument.Document;
-
-    if (doc == null)
-    {
-      return;
-    }
-
-    // Note: We're using unique ids as application ids in revit, so cache eviction must happen by those.
-    var objUniqueIds = objectIdsList
-      .Select(id => new ElementId(Convert.ToInt32(id)))
-      .Select(doc.GetElement)
-      .Where(el => el is not null)
-      .Select(el => el.UniqueId)
-      .ToList();
-    _sendConversionCache.EvictObjects(objUniqueIds);
-
-    // Note: we're doing object selection and card expiry management by old school ids
     List<string> expiredSenderIds = new();
+
+    _sendConversionCache.EvictObjects(objectIdsList);
+
     foreach (SenderModelCard modelCard in senders)
     {
-      var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objUniqueIds).ToList();
+      var intersection = modelCard.SendFilter.NotNull().GetObjectIds().Intersect(objectIdsList).ToList();
       bool isExpired = intersection.Count != 0;
       if (isExpired)
       {

Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/SelectionBinding.cs

@@ -18,7 +18,7 @@ internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, ID
     RevitContext revitContext,
     DocumentModelStore store,
     IRevitIdleManager revitIdleManager,
-    IBrowserBridge parent
+    IBridge parent
   )
     : base("selectionBinding", store, parent, revitContext)
   {
@@ -52,14 +52,12 @@ internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, ID
       return new SelectionInfo(Array.Empty<string>(), "No objects selected.");
     }
 
-    var activeUIDoc = RevitContext.UIApplication.ActiveUIDocument.NotNull();
-
     // POC: this was also being called on shutdown
     // probably the bridge needs to be able to know if the plugin has been terminated
     // also on termination the OnSelectionChanged event needs unwinding
-    var selectionIds = activeUIDoc
-      .Selection.GetElementIds()
-      .Select(eid => activeUIDoc.Document.GetElement(eid).UniqueId.ToString())
+    var selectionIds = (RevitContext.UIApplication?.ActiveUIDocument?.Selection.GetElementIds())
+      .NotNull()
+      .Select(id => id.ToString())
       .ToList();
     return new SelectionInfo(selectionIds, $"{selectionIds.Count} objects selected.");
   }

Connectors/Revit/Speckle.Connectors.RevitShared/DependencyInjection/RevitConnectorModule.cs

@@ -1,10 +1,7 @@
 using Autodesk.Revit.DB;
-using CefSharp;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Operations;
+using Autofac;
+using Speckle.Autofac;
+using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
@@ -13,86 +10,101 @@ using Speckle.Connectors.Revit.Bindings;
 using Speckle.Connectors.Revit.HostApp;
 using Speckle.Connectors.Revit.Operations.Receive;
 using Speckle.Connectors.Revit.Operations.Send;
-using Speckle.Connectors.Revit.Operations.Send.Settings;
 using Speckle.Connectors.Revit.Plugin;
-using Speckle.Converters.Common;
+using Speckle.Connectors.Utils;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Sdk.Models.GraphTraversal;
+#if REVIT2025
+using Speckle.Connectors.DUI.WebView;
+#else
+using CefSharp;
+#endif
 
 namespace Speckle.Connectors.Revit.DependencyInjection;
 
 // POC: should interface out things that are not
-public static class ServiceRegistration
+public class RevitConnectorModule : ISpeckleModule
 {
-  public static void AddRevit(this IServiceCollection serviceCollection)
+  public void Load(SpeckleContainerBuilder builder)
   {
-    serviceCollection.AddConnectorUtils();
-    serviceCollection.AddDUI();
-    RegisterUiDependencies(serviceCollection);
+    builder.AddAutofac();
+    builder.AddConnectorUtils();
+    builder.AddDUI();
+    RegisterUiDependencies(builder);
 
+    builder.AddSingletonInstance<ISyncToThread, RevitContextAccessor>();
     // register
-    serviceCollection.AddSingleton<DocumentModelStore, RevitDocumentStore>();
+    builder.AddSingleton<DocumentModelStore, RevitDocumentStore>();
 
     // Storage Schema
-    serviceCollection.AddScoped<DocumentModelStorageSchema>();
-    serviceCollection.AddScoped<IdStorageSchema>();
+    builder.AddScoped<DocumentModelStorageSchema>();
+    builder.AddScoped<IdStorageSchema>();
 
     // POC: we need to review the scopes and create a document on what the policy is
     // and where the UoW should be
     // register UI bindings
-    serviceCollection.AddSingleton<IBinding, TestBinding>();
-    serviceCollection.AddSingleton<IBinding, ConfigBinding>();
-    serviceCollection.AddSingleton<IBinding, AccountBinding>();
-    serviceCollection.AddSingleton<IBinding, SelectionBinding>();
-    serviceCollection.AddSingleton<IBinding, RevitSendBinding>();
-    serviceCollection.AddSingleton<IBinding, RevitReceiveBinding>();
-    serviceCollection.AddSingleton<IRevitIdleManager, RevitIdleManager>();
+    builder.AddSingleton<IBinding, TestBinding>();
+    builder.AddSingleton<IBinding, ConfigBinding>("connectorName", "Revit"); // POC: Easier like this for now, should be cleaned up later
+    builder.AddSingleton<IBinding, AccountBinding>();
+    builder.AddSingleton<IBinding, SelectionBinding>();
+    builder.AddSingleton<IBinding, RevitSendBinding>();
+    // builder.AddSingleton<IBinding, RevitReceiveBinding>(); // TODO: Have it back once we comfortable enough!
+    builder.AddSingleton<IRevitIdleManager, RevitIdleManager>();
 
-    serviceCollection.RegisterTopLevelExceptionHandler();
+    builder.ContainerBuilder.RegisterType<TopLevelExceptionHandlerBinding>().As<IBinding>().AsSelf().SingleInstance();
+    builder.AddSingleton<ITopLevelExceptionHandler>(c =>
+      c.Resolve<TopLevelExceptionHandlerBinding>().Parent.TopLevelExceptionHandler
+    );
 
-    serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
-    serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBindingRevit>();
+    builder
+      .ContainerBuilder.RegisterType<BasicConnectorBindingRevit>()
+      .As<IBinding>()
+      .As<IBasicConnectorBinding>()
+      .SingleInstance();
 
     // send operation and dependencies
-    serviceCollection.AddScoped<SendOperation<ElementId>>();
-    serviceCollection.AddScoped<ElementUnpacker>();
-    serviceCollection.AddScoped<SendCollectionManager>();
-    serviceCollection.AddScoped<IRootObjectBuilder<ElementId>, RevitRootObjectBuilder>();
-    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();
-    serviceCollection.AddSingleton<ToSpeckleSettingsManager>();
+    builder.AddScoped<SendOperation<ElementId>>();
+    builder.AddScoped<ElementUnpacker>();
+    builder.AddScoped<SendCollectionManager>();
+    builder.AddScoped<IRootObjectBuilder<ElementId>, RevitRootObjectBuilder>();
+    builder.AddSingleton<ISendConversionCache, SendConversionCache>();
 
     // receive operation and dependencies
-    serviceCollection.AddScoped<IHostObjectBuilder, RevitHostObjectBuilder>();
-    serviceCollection.AddScoped<ITransactionManager, TransactionManager>();
-    serviceCollection.AddScoped<RevitGroupBaker>();
-    serviceCollection.AddScoped<RevitMaterialBaker>();
-    serviceCollection.AddSingleton<RevitUtils>();
-    serviceCollection.AddSingleton<IFailuresPreprocessor, HideWarningsFailuresPreprocessor>();
-    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
-
-    serviceCollection.AddScoped<LocalToGlobalConverterUtils>();
+    builder.AddScoped<IHostObjectBuilder, RevitHostObjectBuilder>();
+    builder.AddScoped<ITransactionManager, TransactionManager>();
+    builder.AddSingleton(DefaultTraversal.CreateTraversalFunc());
 
     // operation progress manager
-    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
+    builder.AddSingleton<IOperationProgressManager, OperationProgressManager>();
   }
 
-  public static void RegisterUiDependencies(IServiceCollection serviceCollection)
+  public void RegisterUiDependencies(SpeckleContainerBuilder builder)
   {
-#if REVIT2022
+    // if revit 2025 or higher, register webview2 dependencies
+    // else register cefSharp depenedencies
+#if REVIT2025
+    builder.AddDUIView();
+    builder.AddSingleton<IRevitPlugin, RevitWebViewPlugin>();
+    builder.AddSingleton<DUI3ControlWebView>();
+    builder.AddSingleton<DUI3ControlWebViewDockable>();
+#elif REVIT2022
     //different versons for different versions of CEF
-    serviceCollection.AddSingleton(new BindingOptions() { CamelCaseJavascriptNames = false });
-    serviceCollection.AddSingleton<CefSharpPanel>();
-    serviceCollection.AddSingleton<IBrowserScriptExecutor>(sp => sp.GetRequiredService<CefSharpPanel>());
-    serviceCollection.AddSingleton<IRevitPlugin, RevitCefPlugin>();
+    builder.AddSingleton(new BindingOptions() { CamelCaseJavascriptNames = false });
+    builder.AddSingleton<CefSharpPanel>();
+    builder.AddSingleton<IBrowserScriptExecutor>(c => c.Resolve<CefSharpPanel>());
+    builder.AddSingleton<IRevitPlugin, RevitCefPlugin>();
 #else
-    // different versions for different versions of CEF
-    serviceCollection.AddSingleton(BindingOptions.DefaultBinder);
+    // POC: different versons for different versions of CEF
+    builder.AddSingleton(BindingOptions.DefaultBinder);
 
     var panel = new CefSharpPanel();
     panel.Browser.JavascriptObjectRepository.NameConverter = null;
 
-    serviceCollection.AddSingleton(panel);
-    serviceCollection.AddSingleton<IBrowserScriptExecutor>(c => c.GetRequiredService<CefSharpPanel>());
-    serviceCollection.AddSingleton<IRevitPlugin, RevitCefPlugin>();
+    builder.AddSingleton(panel);
+    builder.AddSingleton<IBrowserScriptExecutor>(c => c.Resolve<CefSharpPanel>());
+    builder.AddSingleton<IRevitPlugin, RevitCefPlugin>();
 #endif
   }
 }

Connectors/Revit/Speckle.Connectors.RevitShared/ElementIdHelper.cs

@@ -5,14 +5,13 @@ namespace Speckle.Connectors.RevitShared;
 
 public static class ElementIdHelper
 {
-  public static ElementId GetElementIdFromUniqueId(Document doc, string uniqueId)
+  public static ElementId Parse(string idStr)
   {
-    Element element = doc.GetElement(uniqueId);
-    if (element == null)
+    if (!int.TryParse(idStr, out var result))
     {
-      throw new SpeckleConversionException($"Cannot find element with UniqueId: {uniqueId}");
+      throw new SpeckleConversionException($"Cannot parse ElementId: {idStr}");
     }
 
-    return element.Id;
+    return new ElementId(result);
   }
 }

Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/ElementUnpacker.cs

@@ -9,11 +9,11 @@ namespace Speckle.Connectors.Revit.HostApp;
 /// </summary>
 public class ElementUnpacker
 {
-  private readonly RevitContext _revitContext;
+  private readonly IRevitConversionContextStack _contextStack;
 
-  public ElementUnpacker(RevitContext revitContext)
+  public ElementUnpacker(IRevitConversionContextStack contextStack)
   {
-    _revitContext = revitContext;
+    _contextStack = contextStack;
   }
 
   /// <summary>
@@ -34,25 +34,9 @@ public class ElementUnpacker
     return PackCurtainWallElements(atomicObjects);
   }
 
-  /// <summary>
-  /// Unpacks input element ids into their subelements, eg groups and nested family instances
-  /// </summary>
-  /// <param name="objectIds"></param>
-  /// <returns></returns>
-  /// <remarks>
-  /// This is used to invalidate object ids in the send conversion cache when the selected object id is only the parent element id
-  /// </remarks>
-  public IEnumerable<string> GetUnpackedElementIds(List<string> objectIds)
-  {
-    var doc = _revitContext.UIApplication?.ActiveUIDocument.Document!;
-    var docElements = doc.GetElements(objectIds);
-    return UnpackSelectionForConversion(docElements).Select(o => o.UniqueId).ToList();
-  }
-
   private List<Element> UnpackElements(IEnumerable<Element> elements)
   {
     var unpackedElements = new List<Element>(); // note: could be a hashset/map so we prevent duplicates (?)
-    var doc = _revitContext.UIApplication?.ActiveUIDocument.Document!;
 
     foreach (var element in elements)
     {
@@ -60,13 +44,16 @@ public class ElementUnpacker
       if (element is Group g)
       {
         // POC: this might screw up generating hosting rel generation here, because nested families in groups get flattened out by GetMemberIds().
-        var groupElements = g.GetMemberIds().Select(doc.GetElement);
+        var groupElements = g.GetMemberIds().Select(_contextStack.Current.Document.GetElement);
         unpackedElements.AddRange(UnpackElements(groupElements));
       }
       // UNPACK: Family instances (as they potentially have nested families inside)
       else if (element is FamilyInstance familyInstance)
       {
-        var familyElements = familyInstance.GetSubComponentIds().Select(doc.GetElement).ToArray();
+        var familyElements = familyInstance
+          .GetSubComponentIds()
+          .Select(_contextStack.Current.Document.GetElement)
+          .ToArray();
 
         if (familyElements.Length != 0)
         {
@@ -77,7 +64,7 @@ public class ElementUnpacker
       }
       else if (element is MultistoryStairs multistoryStairs)
       {
-        var stairs = multistoryStairs.GetAllStairsIds().Select(doc.GetElement);
+        var stairs = multistoryStairs.GetAllStairsIds().Select(_contextStack.Current.Document.GetElement);
         unpackedElements.AddRange(UnpackElements(stairs));
       }
       else
@@ -132,22 +119,6 @@ public class ElementUnpacker
             }
           }
           break;
-        case FootPrintRoof footPrintRoof:
-          if (footPrintRoof.CurtainGrids is { } gs)
-          {
-            foreach (CurtainGrid roofGrid in gs)
-            {
-              foreach (var mullionId in roofGrid.GetMullionIds())
-              {
-                ids.Add(mullionId.ToString());
-              }
-              foreach (var panelId in roofGrid.GetPanelIds())
-              {
-                ids.Add(panelId.ToString());
-              }
-            }
-          }
-          break;
         default:
           break;
       }

Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitGroupBaker.cs

@@ -1,133 +0,0 @@
-using Autodesk.Revit.DB;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Converters.Common;
-using Speckle.Converters.RevitShared.Settings;
-using Speckle.Sdk.Models.GraphTraversal;
-
-namespace Speckle.Connectors.Revit.HostApp;
-
-/// <summary>
-/// <para>On receive, this class will help structure atomic objects into nested revit groups based on the hierarchy that they're coming from. Expects to be a scoped dependency per receive operation.</para>
-/// <para>How to use: during atomic object conversion, on each succesful conversion call <see cref="AddToGroupMapping"/>. Afterward, at the end of the recieve operation, call <see cref="BakeGroups"/> to actually create the groups in the revit document.</para>
-/// </summary>
-public class RevitGroupBaker : TraversalContextUnpacker
-{
-  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
-  private readonly RevitUtils _revitUtils;
-
-  public RevitGroupBaker(IConverterSettingsStore<RevitConversionSettings> converterSettings, RevitUtils revitUtils)
-  {
-    _converterSettings = converterSettings;
-    _revitUtils = revitUtils;
-  }
-
-  /// <summary>
-  /// Adds the object to the correct group in preparation for <see cref="BakeGroups"/> at the end of the receive operation.
-  /// </summary>
-  /// <param name="traversalContext"></param>
-  /// <param name="revitElement"></param>
-  public void AddToGroupMapping(TraversalContext traversalContext, Element revitElement)
-  {
-    var collectionPath = GetCollectionPath(traversalContext);
-    var currentLayerName = string.Empty;
-    FakeGroup? previousGroup = null;
-    var currentDepth = 0;
-
-    foreach (var collection in collectionPath)
-    {
-      currentLayerName += collection.name + "-";
-      if (_groupCache.TryGetValue(currentLayerName, out var g))
-      {
-        previousGroup = g;
-        currentDepth++;
-        continue;
-      }
-
-      var group = new FakeGroup()
-      {
-        // POC group names should be unique
-        Name = _revitUtils.RemoveInvalidChars(currentLayerName[..^1]),
-        Depth = currentDepth++,
-        Parent = previousGroup!
-      };
-      _groupCache[currentLayerName] = group;
-      previousGroup = group;
-    }
-
-    previousGroup!.Ids.Add(revitElement.Id);
-  }
-
-  private readonly Dictionary<string, FakeGroup> _groupCache = new();
-
-  /// <summary>
-  /// Bakes the accumulated groups in Revit, with their objects.
-  /// </summary>
-  /// <param name="baseGroupName"></param>
-  public void BakeGroups(string baseGroupName)
-  {
-    var orderedGroups = _groupCache.Values.OrderByDescending(group => group.Depth);
-    Group? lastGroup = null;
-
-    foreach (var group in orderedGroups)
-    {
-      var docGroup = _converterSettings.Current.Document.Create.NewGroup(group.Ids);
-      group.Parent?.Ids.Add(docGroup.Id);
-      docGroup.GroupType.Name = group.Name;
-      lastGroup = docGroup;
-    }
-
-    lastGroup!.GroupType.Name = _revitUtils.RemoveInvalidChars(baseGroupName);
-  }
-
-  public void PurgeGroups(string baseGroupName)
-  {
-    var document = _converterSettings.Current.Document;
-    var groups = GetGroupsByName(document, baseGroupName);
-
-    foreach (var group in groups)
-    {
-      List<ElementId> subgroupTypeIds = new List<ElementId>();
-      CollectSubGroupTypeIds(document, group, subgroupTypeIds);
-      document.Delete(subgroupTypeIds);
-    }
-  }
-
-  private List<Group> GetGroupsByName(Autodesk.Revit.DB.Document doc, string groupName)
-  {
-    var validGroupName = _revitUtils.RemoveInvalidChars(groupName);
-
-    using (var collector = new FilteredElementCollector(doc))
-    {
-      ICollection<Element> groupElements = collector.OfClass(typeof(Group)).ToElements();
-      List<Group> groups = groupElements.Cast<Group>().Where(g => g.GroupType.Name == validGroupName).ToList();
-      return groups;
-    }
-  }
-
-  private void CollectSubGroupTypeIds(Autodesk.Revit.DB.Document document, Group group, List<ElementId> subGroupTypeIds)
-  {
-    ICollection<ElementId> groupMemberIds = group.GetMemberIds();
-
-    foreach (ElementId memberId in groupMemberIds)
-    {
-      Element element = document.GetElement(memberId);
-
-      if (element is Group subgroup)
-      {
-        subGroupTypeIds.Add(subgroup.GroupType.Id);
-        CollectSubGroupTypeIds(document, subgroup, subGroupTypeIds);
-      }
-    }
-  }
-
-  /// <summary>
-  /// Little intermediate data structure that helps with the operations above.
-  /// </summary>
-  private sealed class FakeGroup
-  {
-    public List<ElementId> Ids { get; set; } = new();
-    public int Depth { get; set; }
-    public string Name { get; set; }
-    public FakeGroup Parent { get; set; }
-  }
-}

Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitMaterialBaker.cs

@@ -1,166 +0,0 @@
-using Autodesk.Revit.DB;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Converters.Common;
-using Speckle.Converters.RevitShared.Settings;
-using Speckle.Objects.Other;
-using Speckle.Sdk;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Extensions;
-using Speckle.Sdk.Models.GraphTraversal;
-
-namespace Speckle.Connectors.Revit.HostApp;
-
-/// <summary>
-/// Utility class that converts and bakes materials in Revit. Expects to be a scoped dependency per unit of work.
-/// </summary>
-public class RevitMaterialBaker
-{
-  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
-  private readonly ILogger<RevitMaterialBaker> _logger;
-  private readonly RevitUtils _revitUtils;
-
-  public RevitMaterialBaker(
-    ILogger<RevitMaterialBaker> logger,
-    RevitUtils revitUtils,
-    IConverterSettingsStore<RevitConversionSettings> converterSettings
-  )
-  {
-    _logger = logger;
-    _revitUtils = revitUtils;
-    _converterSettings = converterSettings;
-  }
-
-  /// <summary>
-  /// Checks the every atomic object has render material or not, if not it tries to find it from its layer tree and mutates
-  /// its render material proxy objects list with the traversal current. It will also map displayable objects' display values to their
-  /// respective material proxy.
-  /// </summary>
-  public void MapLayersRenderMaterials(RootObjectUnpackerResult unpackedRoot)
-  {
-    if (unpackedRoot.RenderMaterialProxies is null)
-    {
-      return;
-    }
-
-    foreach (var context in unpackedRoot.ObjectsToConvert)
-    {
-      if (context.Current.applicationId is null)
-      {
-        continue;
-      }
-
-      var targetRenderMaterialProxy = unpackedRoot.RenderMaterialProxies.FirstOrDefault(rmp =>
-        rmp.objects.Contains(context.Current.applicationId)
-      );
-
-      if (targetRenderMaterialProxy is null)
-      {
-        var layerParents = context.GetAscendants().Where(parent => parent is Layer);
-
-        var layer = layerParents.FirstOrDefault(layer =>
-          unpackedRoot.RenderMaterialProxies.Any(rmp => rmp.objects.Contains(layer.applicationId!))
-        );
-
-        if (layer is not null)
-        {
-          var layerRenderMaterialProxy = unpackedRoot.RenderMaterialProxies.First(rmp =>
-            rmp.objects.Contains(layer.applicationId!)
-          );
-
-          targetRenderMaterialProxy = layerRenderMaterialProxy;
-        }
-      }
-
-      if (targetRenderMaterialProxy is null)
-      {
-        continue; // exit fast, no proxy, we can't do much more.
-      }
-      // We mutate the existing proxy list that comes from source application. Because we do not keep track of parent-child relationship of objects in terms of render materials.
-      targetRenderMaterialProxy.objects.Add(context.Current.applicationId!);
-
-      // This is somewhat evil: we're unpacking here displayable elements by adding their display value to the target render material proxy.
-      // If the display value items do not have an application id, we will generate one.
-      var displayable = context.Current.TryGetDisplayValue();
-      if (displayable != null)
-      {
-        foreach (var @base in displayable)
-        {
-          if (@base.applicationId == null)
-          {
-            var guid = Guid.NewGuid().ToString();
-            @base.applicationId = guid;
-            targetRenderMaterialProxy.objects.Add(guid);
-          }
-          else
-          {
-            targetRenderMaterialProxy.objects.Add(@base.applicationId);
-          }
-        }
-      }
-    }
-  }
-
-  /// <summary>
-  /// Will bake render materials in the revit document.
-  /// </summary>
-  /// <param name="speckleRenderMaterialProxies"></param>
-  /// <param name="baseLayerName"></param>
-  /// <returns></returns>
-  public Dictionary<string, ElementId> BakeMaterials(
-    List<RenderMaterialProxy> speckleRenderMaterialProxies,
-    string baseLayerName
-  )
-  {
-    Dictionary<string, ElementId> objectIdAndMaterialIndexMap = new();
-    foreach (var proxy in speckleRenderMaterialProxies)
-    {
-      var speckleRenderMaterial = proxy.value;
-
-      try
-      {
-        var diffuse = System.Drawing.Color.FromArgb(speckleRenderMaterial.diffuse);
-        double transparency = 1 - speckleRenderMaterial.opacity;
-        double smoothness = 1 - speckleRenderMaterial.roughness;
-        string materialId = speckleRenderMaterial.applicationId ?? speckleRenderMaterial.id;
-        string matName = _revitUtils.RemoveInvalidChars($"{speckleRenderMaterial.name}-({materialId})-{baseLayerName}");
-
-        var newMaterialId = Autodesk.Revit.DB.Material.Create(_converterSettings.Current.Document, matName);
-        var revitMaterial = (Autodesk.Revit.DB.Material)_converterSettings.Current.Document.GetElement(newMaterialId);
-        revitMaterial.Color = new Color(diffuse.R, diffuse.G, diffuse.B);
-
-        revitMaterial.Transparency = (int)(transparency * 100);
-        revitMaterial.Shininess = (int)(speckleRenderMaterial.metalness * 128);
-        revitMaterial.Smoothness = (int)(smoothness * 128);
-
-        foreach (var objectId in proxy.objects)
-        {
-          objectIdAndMaterialIndexMap[objectId] = revitMaterial.Id;
-        }
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, "Failed to create material in Revit");
-      }
-    }
-
-    return objectIdAndMaterialIndexMap;
-  }
-
-  public void PurgeMaterials(string baseGroupName)
-  {
-    var validBaseGroupName = _revitUtils.RemoveInvalidChars(baseGroupName);
-    var document = _converterSettings.Current.Document;
-
-    using (var collector = new FilteredElementCollector(document))
-    {
-      var materialIds = collector
-        .OfClass(typeof(Autodesk.Revit.DB.Material))
-        .Where(m => m.Name.Contains(validBaseGroupName))
-        .Select(m => m.Id)
-        .ToList();
-
-      document.Delete(materialIds);
-    }
-  }
-}

Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitUtils.cs

@@ -1,18 +0,0 @@
-namespace Speckle.Connectors.Revit.HostApp;
-
-public class RevitUtils
-{
-  // see Revit Parameter Name Limitations here
-  // https://www.autodesk.com/support/technical/article/caas/tsarticles/ts/3RVyShGL7OMlDJPLasuKFL.html
-  private const string REVIT_INVALID_CHARS = @"\:{}[]|;<>?`~";
-
-  public string RemoveInvalidChars(string str)
-  {
-    foreach (char c in REVIT_INVALID_CHARS)
-    {
-      str = str.Replace(c.ToString(), string.Empty);
-    }
-
-    return str;
-  }
-}

Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/SendCollectionManager.cs

@@ -1,6 +1,5 @@
 using Autodesk.Revit.DB;
-using Speckle.Converters.Common;
-using Speckle.Converters.RevitShared.Settings;
+using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk.Models.Collections;
 
 namespace Speckle.Connectors.Revit.HostApp;
@@ -10,12 +9,12 @@ namespace Speckle.Connectors.Revit.HostApp;
 /// </summary>
 public class SendCollectionManager
 {
-  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
+  private readonly IRevitConversionContextStack _contextStack;
   private readonly Dictionary<string, Collection> _collectionCache = new();
 
-  public SendCollectionManager(IConverterSettingsStore<RevitConversionSettings> converterSettings)
+  public SendCollectionManager(IRevitConversionContextStack contextStack)
   {
-    _converterSettings = converterSettings;
+    _contextStack = contextStack;
   }
 
   /// <summary>
@@ -27,7 +26,7 @@ public class SendCollectionManager
   /// <returns></returns>
   public Collection GetAndCreateObjectHostCollection(Element element, Collection rootObject)
   {
-    var doc = _converterSettings.Current.Document;
+    var doc = _contextStack.Current.Document;
     var path = new List<string>();
 
     // Step 1: create path components. Currently, this is

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/HideWarningsFailuresPreprocessor.cs

@@ -1,17 +0,0 @@
-using Autodesk.Revit.DB;
-
-namespace Speckle.Connectors.Revit.Operations.Receive;
-
-/// <summary>
-/// This class will suppress warnings on the Revit UI
-/// Currently we use it after Revit receive when we create the group hierarchy
-/// </summary>
-
-public class HideWarningsFailuresPreprocessor : IFailuresPreprocessor
-{
-  public FailureProcessingResult PreprocessFailures(FailuresAccessor failuresAccessor)
-  {
-    failuresAccessor.DeleteAllWarnings();
-    return FailureProcessingResult.Continue;
-  }
-}

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/ITransactionManager.cs

@@ -9,7 +9,5 @@ public interface ITransactionManager : IDisposable
   void RollbackSubTransaction();
   void RollbackTransaction();
   void StartSubtransaction();
-
-  // POC improve how the error handling behaviour is selected
-  void StartTransaction(bool enableFailurePreprocessor = false);
+  void StartTransaction();
 }

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitContextAccessor.cs

@@ -1,5 +1,5 @@
 using Revit.Async;
-using Speckle.Connectors.Common.Operations;
+using Speckle.Connectors.Utils.Operations;
 
 namespace Speckle.Connectors.Revit.Operations.Receive;
 

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/RevitHostObjectBuilder.cs

@@ -1,60 +1,42 @@
 using Autodesk.Revit.DB;
-using Microsoft.Extensions.Logging;
-using Revit.Async;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Connectors.Revit.HostApp;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Helpers;
-using Speckle.Converters.RevitShared.Settings;
 using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.GraphTraversal;
 
 namespace Speckle.Connectors.Revit.Operations.Receive;
 
+/// <summary>
+/// Potentially consolidate all application specific IHostObjectBuilders
+/// https://spockle.atlassian.net/browse/DUI3-465
+/// </summary>
 internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
 {
   private readonly IRootToHostConverter _converter;
-  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
-  private readonly RevitToHostCacheSingleton _revitToHostCacheSingleton;
+  private readonly IRevitConversionContextStack _contextStack;
+  private readonly GraphTraversal _traverseFunction;
   private readonly ITransactionManager _transactionManager;
-  private readonly ILocalToGlobalUnpacker _localToGlobalUnpacker;
-  private readonly LocalToGlobalConverterUtils _localToGlobalConverterUtils;
-  private readonly RevitGroupBaker _groupBaker;
-  private readonly RevitMaterialBaker _materialBaker;
-  private readonly ILogger<RevitHostObjectBuilder> _logger;
-
-  private readonly RootObjectUnpacker _rootObjectUnpacker;
-  private readonly ISdkActivityFactory _activityFactory;
+  private readonly ISyncToThread _syncToThread;
 
   public RevitHostObjectBuilder(
     IRootToHostConverter converter,
-    IConverterSettingsStore<RevitConversionSettings> converterSettings,
+    IRevitConversionContextStack contextStack,
+    GraphTraversal traverseFunction,
     ITransactionManager transactionManager,
-    ISdkActivityFactory activityFactory,
-    ILocalToGlobalUnpacker localToGlobalUnpacker,
-    LocalToGlobalConverterUtils localToGlobalConverterUtils,
-    RevitGroupBaker groupManager,
-    RevitMaterialBaker materialBaker,
-    RootObjectUnpacker rootObjectUnpacker,
-    ILogger<RevitHostObjectBuilder> logger,
-    RevitToHostCacheSingleton revitToHostCacheSingleton
+    ISyncToThread syncToThread
   )
   {
     _converter = converter;
-    _converterSettings = converterSettings;
+    _contextStack = contextStack;
+    _traverseFunction = traverseFunction;
     _transactionManager = transactionManager;
-    _localToGlobalUnpacker = localToGlobalUnpacker;
-    _localToGlobalConverterUtils = localToGlobalConverterUtils;
-    _groupBaker = groupManager;
-    _materialBaker = materialBaker;
-    _rootObjectUnpacker = rootObjectUnpacker;
-    _logger = logger;
-    _revitToHostCacheSingleton = revitToHostCacheSingleton;
-    _activityFactory = activityFactory;
+    _syncToThread = syncToThread;
   }
 
   public Task<HostObjectBuilderResult> Build(
@@ -64,144 +46,53 @@ internal sealed class RevitHostObjectBuilder : IHostObjectBuilder, IDisposable
     Action<string, double?>? onOperationProgressed,
     CancellationToken cancellationToken
   ) =>
-    RevitTask.RunAsync(() => BuildSync(rootObject, projectName, modelName, onOperationProgressed, cancellationToken));
-
-  private HostObjectBuilderResult BuildSync(
-    Base rootObject,
-    string projectName,
-    string modelName,
-    Action<string, double?>? onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    var baseGroupName = $"Project {projectName}: Model {modelName}"; // TODO: unify this across connectors!
-
-    onOperationProgressed?.Invoke("Converting", null);
-    using var activity = _activityFactory.Start("Build");
-
-    // 0 - Clean then Rock n Roll! 🎸
-    using TransactionGroup preReceiveCleanTransaction = new(_converterSettings.Current.Document, "Pre-receive clean");
-    preReceiveCleanTransaction.Start();
-    _transactionManager.StartTransaction(true);
-
-    try
+    _syncToThread.RunOnThread(() =>
     {
-      PreReceiveDeepClean(baseGroupName);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex, "Failed to clean up before receive in Revit");
-    }
-
-    using (var _ = _activityFactory.Start("Commit"))
-    {
-      _transactionManager.CommitTransaction();
-      preReceiveCleanTransaction.Assimilate();
-    }
-
-    // 1 - Unpack objects and proxies from root commit object
-    var unpackedRoot = _rootObjectUnpacker.Unpack(rootObject);
-    var localToGlobalMaps = _localToGlobalUnpacker.Unpack(
-      unpackedRoot.DefinitionProxies,
-      unpackedRoot.ObjectsToConvert.ToList()
-    );
-
-    using TransactionGroup transactionGroup =
-      new(_converterSettings.Current.Document, $"Received data from {projectName}");
-    transactionGroup.Start();
-    _transactionManager.StartTransaction();
-
-    if (unpackedRoot.RenderMaterialProxies != null)
-    {
-      _materialBaker.MapLayersRenderMaterials(unpackedRoot);
-      // NOTE: do not set _contextStack.RenderMaterialProxyCache directly, things stop working. Ogu/Dim do not know why :) not a problem as we hopefully will refactor some of these hacks out.
-      var map = _materialBaker.BakeMaterials(unpackedRoot.RenderMaterialProxies, baseGroupName);
-      foreach (var kvp in map)
+      using var activity = SpeckleActivityFactory.Start("Build");
+      IEnumerable<TraversalContext> objectsToConvert;
+      using (var _ = SpeckleActivityFactory.Start("Traverse"))
       {
-        _revitToHostCacheSingleton.MaterialsByObjectId.Add(kvp.Key, kvp.Value);
+        objectsToConvert = _traverseFunction.Traverse(rootObject).Where(obj => obj.Current is not Collection);
       }
-    }
 
-    var conversionResults = BakeObjects(localToGlobalMaps, onOperationProgressed, cancellationToken);
+      using TransactionGroup transactionGroup =
+        new(_contextStack.Current.Document, $"Received data from {projectName}");
+      transactionGroup.Start();
+      _transactionManager.StartTransaction();
 
-    using (var _ = _activityFactory.Start("Commit"))
-    {
-      _transactionManager.CommitTransaction();
-      transactionGroup.Assimilate();
-    }
+      var conversionResults = BakeObjects(objectsToConvert);
 
-    using TransactionGroup createGroupTransaction = new(_converterSettings.Current.Document, "Creating group");
-    createGroupTransaction.Start();
-    _transactionManager.StartTransaction(true);
-
-    try
-    {
-      _groupBaker.BakeGroups(baseGroupName);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex, "Failed to create group after receiving elements in Revit");
-    }
-
-    using (var _ = _activityFactory.Start("Commit"))
-    {
-      _transactionManager.CommitTransaction();
-      createGroupTransaction.Assimilate();
-    }
-
-    _revitToHostCacheSingleton.MaterialsByObjectId.Clear(); // Massive hack!
-
-    return conversionResults;
-  }
-
-  private HostObjectBuilderResult BakeObjects(
-    List<LocalToGlobalMap> localToGlobalMaps,
-    Action<string, double?>? onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    using var _ = _activityFactory.Start("BakeObjects");
-    var conversionResults = new List<ReceiveConversionResult>();
-    var bakedObjectIds = new List<string>();
-    int count = 0;
-
-    foreach (LocalToGlobalMap localToGlobalMap in localToGlobalMaps)
-    {
-      cancellationToken.ThrowIfCancellationRequested();
-      try
+      using (var _ = SpeckleActivityFactory.Start("Commit"))
       {
-        using var activity = _activityFactory.Start("BakeObject");
-        var atomicObject = _localToGlobalConverterUtils.TransformObjects(
-          localToGlobalMap.AtomicObject,
-          localToGlobalMap.Matrix
-        );
-        var result = _converter.Convert(atomicObject);
-        onOperationProgressed?.Invoke("Converting", (double)++count / localToGlobalMaps.Count);
+        _transactionManager.CommitTransaction();
+        transactionGroup.Assimilate();
+      }
+      return conversionResults;
+    });
 
-        // Note: our current converter always returns a DS for now
-        if (result is DirectShape ds)
+  // POC: Potentially refactor out into an IObjectBaker.
+  private HostObjectBuilderResult BakeObjects(IEnumerable<TraversalContext> objectsGraph)
+  {
+    using (var _ = SpeckleActivityFactory.Start("BakeObjects"))
+    {
+      var conversionResults = new List<ReceiveConversionResult>();
+      var bakedObjectIds = new List<string>();
+
+      foreach (TraversalContext tc in objectsGraph)
+      {
+        try
         {
-          bakedObjectIds.Add(ds.UniqueId.ToString());
-          _groupBaker.AddToGroupMapping(localToGlobalMap.TraversalContext, ds);
+          using var activity = SpeckleActivityFactory.Start("BakeObject");
+          var result = _converter.Convert(tc.Current);
         }
-        else
+        catch (Exception ex) when (!ex.IsFatal())
         {
-          throw new SpeckleConversionException($"Failed to cast {result.GetType()} to Direct Shape.");
+          conversionResults.Add(new(Status.ERROR, tc.Current, null, null, ex));
         }
-        conversionResults.Add(new(Status.SUCCESS, atomicObject, ds.UniqueId, "Direct Shape"));
       }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        conversionResults.Add(new(Status.ERROR, localToGlobalMap.AtomicObject, null, null, ex));
-      }
-    }
-    return new(bakedObjectIds, conversionResults);
-  }
 
-  private void PreReceiveDeepClean(string baseGroupName)
-  {
-    _groupBaker.PurgeGroups(baseGroupName);
-    _materialBaker.PurgeMaterials(baseGroupName);
+      return new(bakedObjectIds, conversionResults);
+    }
   }
 
   public void Dispose()

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Receive/TransactionManager.cs

@@ -1,6 +1,5 @@
 using Autodesk.Revit.DB;
-using Speckle.Converters.Common;
-using Speckle.Converters.RevitShared.Settings;
+using Speckle.Converters.RevitShared.Helpers;
 
 namespace Speckle.Connectors.Revit.Operations.Receive;
 
@@ -10,17 +9,12 @@ namespace Speckle.Connectors.Revit.Operations.Receive;
 /// </summary>
 public sealed class TransactionManager : ITransactionManager
 {
-  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
-  private readonly IFailuresPreprocessor _errorPreprocessingService;
-  private Document Document => _converterSettings.Current.Document;
+  private readonly IRevitConversionContextStack _contextStack;
+  private Document Document => _contextStack.Current.Document;
 
-  public TransactionManager(
-    IConverterSettingsStore<RevitConversionSettings> converterSettings,
-    IFailuresPreprocessor errorPreprocessingService
-  )
+  public TransactionManager(IRevitConversionContextStack contextStack)
   {
-    _converterSettings = converterSettings;
-    _errorPreprocessingService = errorPreprocessingService;
+    _contextStack = contextStack;
   }
 
   // poc : these are being disposed. I'm not sure why I need to supress this warning
@@ -29,21 +23,17 @@ public sealed class TransactionManager : ITransactionManager
   private SubTransaction? _subTransaction;
 #pragma warning restore CA2213 // Disposable fields should be disposed
 
-  // POC find a better way to use IFailuresPreprocessor
-  public void StartTransaction(bool enableFailurePreprocessor = false)
+  public void StartTransaction()
   {
     if (_transaction == null || !_transaction.IsValidObject || _transaction.GetStatus() != TransactionStatus.Started)
     {
       _transaction = new Transaction(Document, "Speckle Transaction");
-
-      if (enableFailurePreprocessor)
-      {
-        var failOpts = _transaction.GetFailureHandlingOptions();
-        failOpts.SetFailuresPreprocessor(_errorPreprocessingService);
-        failOpts.SetClearAfterRollback(true);
-        _transaction.SetFailureHandlingOptions(failOpts);
-      }
-
+      var failOpts = _transaction.GetFailureHandlingOptions();
+      // POC: make sure to implement and add the failure preprocessor
+      // https://spockle.atlassian.net/browse/DUI3-461
+      //failOpts.SetFailuresPreprocessor(_errorPreprocessingService);
+      failOpts.SetClearAfterRollback(true);
+      _transaction.SetFailureHandlingOptions(failOpts);
       _transaction.Start();
     }
   }

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/RevitRootObjectBuilder.cs

@@ -1,17 +1,13 @@
+using System.Diagnostics;
 using Autodesk.Revit.DB;
-using Microsoft.Extensions.Logging;
-using Revit.Async;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.Revit.HostApp;
+using Speckle.Connectors.Utils.Builders;
+using Speckle.Connectors.Utils.Caching;
+using Speckle.Connectors.Utils.Conversion;
+using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Helpers;
-using Speckle.Converters.RevitShared.Settings;
-using Speckle.Converters.RevitShared.ToSpeckle;
 using Speckle.Sdk;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
@@ -22,124 +18,114 @@ public class RevitRootObjectBuilder : IRootObjectBuilder<ElementId>
 {
   // POC: SendSelection and RevitConversionContextStack should be interfaces, former needs interfaces
   private readonly IRootToSpeckleConverter _converter;
-  private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
+  private readonly IRevitConversionContextStack _conversionContextStack;
   private readonly Collection _rootObject;
   private readonly ISendConversionCache _sendConversionCache;
+  private readonly ISyncToThread _syncToThread;
   private readonly ElementUnpacker _elementUnpacker;
   private readonly SendCollectionManager _sendCollectionManager;
-  private readonly RevitToSpeckleCacheSingleton _revitToSpeckleCacheSingleton;
-  private readonly ILogger<RevitRootObjectBuilder> _logger;
-  private readonly ParameterDefinitionHandler _parameterDefinitionHandler;
 
   public RevitRootObjectBuilder(
     IRootToSpeckleConverter converter,
-    IConverterSettingsStore<RevitConversionSettings> converterSettings,
+    IRevitConversionContextStack conversionContextStack,
     ISendConversionCache sendConversionCache,
+    ISyncToThread syncToThread,
     ElementUnpacker elementUnpacker,
-    SendCollectionManager sendCollectionManager,
-    ILogger<RevitRootObjectBuilder> logger,
-    ParameterDefinitionHandler parameterDefinitionHandler,
-    RevitToSpeckleCacheSingleton revitToSpeckleCacheSingleton
+    SendCollectionManager sendCollectionManager
   )
   {
     _converter = converter;
-    _converterSettings = converterSettings;
+    _conversionContextStack = conversionContextStack;
     _sendConversionCache = sendConversionCache;
+    _syncToThread = syncToThread;
     _elementUnpacker = elementUnpacker;
     _sendCollectionManager = sendCollectionManager;
-    _revitToSpeckleCacheSingleton = revitToSpeckleCacheSingleton;
-    _logger = logger;
-    _parameterDefinitionHandler = parameterDefinitionHandler;
 
     _rootObject = new Collection()
     {
-      name = _converterSettings.Current.Document.PathName.Split('\\').Last().Split('.').First()
+      name = _conversionContextStack.Current.Document.PathName.Split('\\').Last().Split('.').First()
     };
-    _rootObject["units"] = _converterSettings.Current.SpeckleUnits;
   }
 
-  public async Task<RootObjectBuilderResult> Build(
+  public Task<RootObjectBuilderResult> Build(
     IReadOnlyList<ElementId> objects,
     SendInfo sendInfo,
     Action<string, double?>? onOperationProgressed = null,
     CancellationToken ct = default
-  )
-  {
-    var doc = _converterSettings.Current.Document;
-
-    if (doc.IsFamilyDocument)
+  ) =>
+    _syncToThread.RunOnThread(() =>
     {
-      throw new SpeckleException("Family Environment documents are not supported.");
-    }
+      var doc = _conversionContextStack.Current.Document;
 
-    var revitElements = new List<Element>();
-
-    // Convert ids to actual revit elements
-    foreach (var id in objects)
-    {
-      var el = _converterSettings.Current.Document.GetElement(id);
-      if (el != null)
+      if (doc.IsFamilyDocument)
       {
-        revitElements.Add(el);
+        throw new SpeckleException("Family Environment documents are not supported.");
       }
-    }
 
-    if (revitElements.Count == 0)
-    {
-      throw new SpeckleSendFilterException("No objects were found. Please update your send filter!");
-    }
+      var revitElements = new List<Element>();
 
-    List<SendConversionResult> results = new(revitElements.Count);
-
-    // Unpack groups (& other complex data structures)
-    var atomicObjects = _elementUnpacker.UnpackSelectionForConversion(revitElements).ToList();
-
-    var countProgress = 0;
-    var cacheHitCount = 0;
-
-    foreach (Element revitElement in atomicObjects)
-    {
-      ct.ThrowIfCancellationRequested();
-      string applicationId = revitElement.UniqueId;
-      string sourceType = revitElement.GetType().Name;
-      try
+      // Convert ids to actual revit elements
+      foreach (var id in objects)
       {
-        Base converted;
-        if (_sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference? value))
+        var el = _conversionContextStack.Current.Document.GetElement(id);
+        if (el != null)
         {
-          converted = value;
-          cacheHitCount++;
+          revitElements.Add(el);
         }
-        else
+      }
+
+      if (revitElements.Count == 0)
+      {
+        throw new SpeckleSendFilterException("No objects were found. Please update your send filter!");
+      }
+
+      // Unpack groups (& other complex data structures)
+      var atomicObjects = _elementUnpacker.UnpackSelectionForConversion(revitElements).ToList();
+
+      var countProgress = 0;
+      var cacheHitCount = 0;
+      List<SendConversionResult> results = new(revitElements.Count);
+
+      foreach (Element revitElement in atomicObjects)
+      {
+        ct.ThrowIfCancellationRequested();
+        var applicationId = revitElement.Id.ToString();
+        try
         {
-          converted = await RevitTask.RunAsync(() => _converter.Convert(revitElement)).ConfigureAwait(false); // Could we run these batched? Is there maybe a performance penalty for running these to speckle conversions individually in revittask.runasync?
-          converted.applicationId = applicationId;
+          Base converted;
+          if (_sendConversionCache.TryGetValue(sendInfo.ProjectId, applicationId, out ObjectReference value))
+          {
+            converted = value;
+            cacheHitCount++;
+          }
+          else
+          {
+            converted = _converter.Convert(revitElement);
+            converted.applicationId = applicationId;
+          }
+
+          var collection = _sendCollectionManager.GetAndCreateObjectHostCollection(revitElement, _rootObject);
+          collection.elements.Add(converted);
+          results.Add(new(Status.SUCCESS, applicationId, revitElement.GetType().Name, converted));
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        {
+          results.Add(new(Status.ERROR, applicationId, revitElement.GetType().Name, null, ex));
         }
 
-        var collection = _sendCollectionManager.GetAndCreateObjectHostCollection(revitElement, _rootObject);
-        collection.elements.Add(converted);
-        results.Add(new(Status.SUCCESS, applicationId, sourceType, converted));
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogSendConversionError(ex, sourceType);
-        results.Add(new(Status.ERROR, applicationId, sourceType, null, ex));
+        onOperationProgressed?.Invoke("Converting", (double)++countProgress / atomicObjects.Count);
       }
 
-      onOperationProgressed?.Invoke("Converting", (double)++countProgress / atomicObjects.Count);
-    }
+      var idsAndSubElementIds = _elementUnpacker.GetElementsAndSubelementIdsFromAtomicObjects(atomicObjects);
+      var materialProxies = _conversionContextStack.RenderMaterialProxyCache.GetRenderMaterialProxyListForObjects(
+        idsAndSubElementIds
+      );
+      _rootObject["renderMaterialProxies"] = materialProxies;
 
-    if (results.All(x => x.Status == Status.ERROR))
-    {
-      throw new SpeckleConversionException("Failed to convert all objects.");
-    }
+      Debug.WriteLine(
+        $"Cache hit count {cacheHitCount} out of {objects.Count} ({(double)cacheHitCount / objects.Count})"
+      );
 
-    var idsAndSubElementIds = _elementUnpacker.GetElementsAndSubelementIdsFromAtomicObjects(atomicObjects);
-    var materialProxies = _revitToSpeckleCacheSingleton.GetRenderMaterialProxyListForObjects(idsAndSubElementIds);
-    _rootObject[ProxyKeys.RENDER_MATERIAL] = materialProxies;
-    // NOTE: these are currently not used anywhere, so we could even skip them (?).
-    _rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions;
-
-    return new RootObjectBuilderResult(_rootObject, results);
-  }
+      return new RootObjectBuilderResult(_rootObject, results);
+    });
 }

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/DetailLevelSetting.cs

@@ -1,18 +0,0 @@
-using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.RevitShared.Settings;
-
-namespace Speckle.Connectors.Revit.Operations.Send.Settings;
-
-public class DetailLevelSetting(DetailLevelType value) : ICardSetting
-{
-  public string? Id { get; set; } = "detailLevel";
-  public string? Title { get; set; } = "Detail Level";
-  public string? Type { get; set; } = "string";
-  public List<string>? Enum { get; set; } = System.Enum.GetNames(typeof(DetailLevelType)).ToList();
-  public object? Value { get; set; } = value.ToString();
-
-  public static readonly Dictionary<string, DetailLevelType> GeometryFidelityMap = System
-    .Enum.GetValues(typeof(DetailLevelType))
-    .Cast<DetailLevelType>()
-    .ToDictionary(v => v.ToString(), v => v);
-}

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ReferencePointSetting.cs

@@ -1,18 +0,0 @@
-using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.RevitShared.Settings;
-
-namespace Speckle.Connectors.Revit.Operations.Send.Settings;
-
-public class ReferencePointSetting(ReferencePointType value) : ICardSetting
-{
-  public string? Id { get; set; } = "referencePoint";
-  public string? Title { get; set; } = "Reference Point";
-  public string? Type { get; set; } = "string";
-  public List<string>? Enum { get; set; } = System.Enum.GetNames(typeof(ReferencePointType)).ToList();
-  public object? Value { get; set; } = value.ToString();
-
-  public static readonly Dictionary<string, ReferencePointType> ReferencePointMap = System
-    .Enum.GetValues(typeof(ReferencePointType))
-    .Cast<ReferencePointType>()
-    .ToDictionary(v => v.ToString(), v => v);
-}

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/SendParameterNullOrEmptyStringsSetting.cs

@@ -1,12 +0,0 @@
-using Speckle.Connectors.DUI.Settings;
-
-namespace Speckle.Connectors.Revit.Operations.Send.Settings;
-
-public class SendParameterNullOrEmptyStringsSetting(bool value) : ICardSetting
-{
-  public string? Id { get; set; } = "nullemptyparams";
-  public string? Title { get; set; } = "Send null/empty parameters";
-  public string? Type { get; set; } = "boolean";
-  public List<string>? Enum { get; set; }
-  public object? Value { get; set; } = value;
-}

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs

@@ -1,170 +0,0 @@
-using Autodesk.Revit.DB;
-using Autodesk.Revit.UI;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.DUI.Models.Card;
-using Speckle.Connectors.Revit.HostApp;
-using Speckle.Converters.RevitShared.Helpers;
-using Speckle.Converters.RevitShared.Settings;
-using Speckle.InterfaceGenerator;
-using Speckle.Sdk.Common;
-
-namespace Speckle.Connectors.Revit.Operations.Send.Settings;
-
-[GenerateAutoInterface]
-public class ToSpeckleSettingsManager : IToSpeckleSettingsManager
-{
-  private readonly RevitContext _revitContext;
-  private readonly ISendConversionCache _sendConversionCache;
-  private readonly ElementUnpacker _elementUnpacker;
-
-  // cache invalidation process run with ModelCardId since the settings are model specific
-  private readonly Dictionary<string, DetailLevelType> _detailLevelCache = new();
-  private readonly Dictionary<string, Transform?> _referencePointCache = new();
-  private readonly Dictionary<string, bool?> _sendNullParamsCache = new();
-
-  public ToSpeckleSettingsManager(
-    RevitContext revitContext,
-    ISendConversionCache sendConversionCache,
-    ElementUnpacker elementUnpacker
-  )
-  {
-    _revitContext = revitContext;
-    _elementUnpacker = elementUnpacker;
-    _sendConversionCache = sendConversionCache;
-  }
-
-  public DetailLevelType GetDetailLevelSetting(SenderModelCard modelCard)
-  {
-    var fidelityString = modelCard.Settings?.First(s => s.Id == "detailLevel").Value as string;
-    if (
-      fidelityString is not null
-      && DetailLevelSetting.GeometryFidelityMap.TryGetValue(fidelityString, out DetailLevelType fidelity)
-    )
-    {
-      if (_detailLevelCache.TryGetValue(modelCard.ModelCardId.NotNull(), out DetailLevelType previousType))
-      {
-        if (previousType != fidelity)
-        {
-          EvictCacheForModelCard(modelCard);
-        }
-      }
-      _detailLevelCache[modelCard.ModelCardId.NotNull()] = fidelity;
-      return fidelity;
-    }
-
-    throw new ArgumentException($"Invalid geometry fidelity value: {fidelityString}");
-  }
-
-  public Transform? GetReferencePointSetting(SenderModelCard modelCard)
-  {
-    var referencePointString = modelCard.Settings?.First(s => s.Id == "referencePoint").Value as string;
-    if (
-      referencePointString is not null
-      && ReferencePointSetting.ReferencePointMap.TryGetValue(
-        referencePointString,
-        out ReferencePointType referencePoint
-      )
-    )
-    {
-      // get the current transform from setting first
-      // we are doing this because we can't track if reference points were changed between send operations.
-      Transform? currentTransform = GetTransform(_revitContext, referencePoint);
-
-      if (_referencePointCache.TryGetValue(modelCard.ModelCardId.NotNull(), out Transform? previousTransform))
-      {
-        // invalidate conversion cache if the transform has changed
-        if (previousTransform != currentTransform)
-        {
-          EvictCacheForModelCard(modelCard);
-        }
-      }
-
-      _referencePointCache[modelCard.ModelCardId.NotNull()] = currentTransform;
-      return currentTransform;
-    }
-
-    throw new ArgumentException($"Invalid reference point value: {referencePointString}");
-  }
-
-  public bool GetSendParameterNullOrEmptyStringsSetting(SenderModelCard modelCard)
-  {
-    var value = modelCard.Settings?.First(s => s.Id == "nullemptyparams").Value as bool?;
-    var returnValue = value != null && value.NotNull();
-    if (_sendNullParamsCache.TryGetValue(modelCard.ModelCardId.NotNull(), out bool? previousValue))
-    {
-      if (previousValue != returnValue)
-      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
-
-    _sendNullParamsCache[modelCard.ModelCardId] = returnValue;
-    return returnValue;
-  }
-
-  private void EvictCacheForModelCard(SenderModelCard modelCard)
-  {
-    var objectIds = modelCard.SendFilter != null ? modelCard.SendFilter.GetObjectIds() : [];
-    var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objectIds);
-    _sendConversionCache.EvictObjects(unpackedObjectIds);
-  }
-
-  private Transform? GetTransform(RevitContext context, ReferencePointType referencePointType)
-  {
-    Transform? referencePointTransform = null;
-
-    if (context.UIApplication is UIApplication uiApplication)
-    {
-      // first get the main doc base points and reference setting transform
-      using FilteredElementCollector filteredElementCollector = new(uiApplication.ActiveUIDocument.Document);
-      var points = filteredElementCollector.OfClass(typeof(BasePoint)).Cast<BasePoint>().ToList();
-      BasePoint? projectPoint = points.FirstOrDefault(o => !o.IsShared);
-      BasePoint? surveyPoint = points.FirstOrDefault(o => o.IsShared);
-
-      switch (referencePointType)
-      {
-        // note that the project base (ui) rotation is registered on the survey pt, not on the base point
-        case ReferencePointType.ProjectBase:
-          if (projectPoint is not null)
-          {
-            referencePointTransform = Transform.CreateTranslation(projectPoint.Position);
-          }
-          else
-          {
-            throw new InvalidOperationException("Couldn't retrieve Project Point from document");
-          }
-          break;
-
-        // note that the project base (ui) rotation is registered on the survey pt, not on the base point
-        case ReferencePointType.Survey:
-          if (surveyPoint is not null && projectPoint is not null)
-          {
-            // POC: should a null angle resolve to 0?
-            // retrieve the survey point rotation from the project point
-            var angle = projectPoint.get_Parameter(BuiltInParameter.BASEPOINT_ANGLETON_PARAM)?.AsDouble() ?? 0;
-
-            // POC: following disposed incorrectly or early or maybe a false negative?
-            using Transform translation = Transform.CreateTranslation(surveyPoint.Position);
-            referencePointTransform = translation.Multiply(Transform.CreateRotation(XYZ.BasisZ, angle));
-          }
-          else
-          {
-            throw new InvalidOperationException("Couldn't retrieve Survey and Project Point from document");
-          }
-          break;
-
-        case ReferencePointType.InternalOrigin:
-          break;
-
-        default:
-          break;
-      }
-
-      return referencePointTransform;
-    }
-
-    throw new InvalidOperationException(
-      "Revit Context UI Application was null when retrieving reference point transform."
-    );
-  }
-}

Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitCefPlugin.cs

@@ -1,3 +1,4 @@
+#if !REVIT2025
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
@@ -6,11 +7,10 @@ using System.Windows.Media.Imaging;
 using Autodesk.Revit.ApplicationServices;
 using Autodesk.Revit.UI;
 using CefSharp;
-using Microsoft.Extensions.DependencyInjection;
 using Revit.Async;
-using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.Utils;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk;
 
@@ -19,27 +19,24 @@ namespace Speckle.Connectors.Revit.Plugin;
 internal sealed class RevitCefPlugin : IRevitPlugin
 {
   private readonly UIControlledApplication _uIControlledApplication;
-  private readonly IServiceProvider _serviceProvider; // should be lazy to ensure the bindings are not created too early
+  private readonly IEnumerable<Lazy<IBinding>> _bindings; // should be lazy to ensure the bindings are not created too early
   private readonly BindingOptions _bindingOptions;
   private readonly RevitContext _revitContext;
   private readonly CefSharpPanel _cefSharpPanel;
-  private readonly ISpeckleApplication _speckleApplication;
 
   public RevitCefPlugin(
     UIControlledApplication uIControlledApplication,
-    IServiceProvider serviceProvider,
+    IEnumerable<Lazy<IBinding>> bindings,
     BindingOptions bindingOptions,
     RevitContext revitContext,
-    CefSharpPanel cefSharpPanel,
-    ISpeckleApplication speckleApplication
+    CefSharpPanel cefSharpPanel
   )
   {
     _uIControlledApplication = uIControlledApplication;
-    _serviceProvider = serviceProvider;
+    _bindings = bindings;
     _bindingOptions = bindingOptions;
     _revitContext = revitContext;
     _cefSharpPanel = cefSharpPanel;
-    _speckleApplication = speckleApplication;
   }
 
   public void Initialise()
@@ -74,7 +71,7 @@ internal sealed class RevitCefPlugin : IRevitPlugin
     var dui3Button = (PushButton)
       specklePanel.AddItem(
         new PushButtonData(
-          _speckleApplication.HostApplication,
+          Connector.Name,
           Connector.TabTitle,
           typeof(RevitExternalApplication).Assembly.Location,
           typeof(SpeckleRevitCommand).FullName
@@ -82,24 +79,21 @@ internal sealed class RevitCefPlugin : IRevitPlugin
       );
 
     string path = typeof(RevitCefPlugin).Assembly.Location;
-    dui3Button.Image = LoadPngImgSource(
-      $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo16.png",
-      path
-    );
+    dui3Button.Image = LoadPngImgSource($"Speckle.Connectors.Revit{Connector.VersionString}.Assets.logo16.png", path);
     dui3Button.LargeImage = LoadPngImgSource(
-      $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo32.png",
+      $"Speckle.Connectors.Revit{Connector.VersionString}.Assets.logo32.png",
       path
     );
     dui3Button.ToolTipImage = LoadPngImgSource(
-      $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo32.png",
+      $"Speckle.Connectors.Revit{Connector.VersionString}.Assets.logo32.png",
       path
     );
-    dui3Button.ToolTip = "Speckle (Beta) for Revit";
+    dui3Button.ToolTip = "Speckle Connector for Revit New UI";
     //dui3Button.AvailabilityClassName = typeof(CmdAvailabilityViews).FullName;
     dui3Button.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
   }
 
-  private void OnApplicationInitialized(object? sender, Autodesk.Revit.DB.Events.ApplicationInitializedEventArgs e)
+  private void OnApplicationInitialized(object sender, Autodesk.Revit.DB.Events.ApplicationInitializedEventArgs e)
   {
     var uiApplication = new UIApplication(sender as Application);
     _revitContext.UIApplication = uiApplication;
@@ -115,9 +109,8 @@ internal sealed class RevitCefPlugin : IRevitPlugin
   /// </summary>
   private void PostApplicationInit()
   {
-    var bindings = _serviceProvider.GetRequiredService<IEnumerable<IBinding>>();
     // binding the bindings to each bridge
-    foreach (IBinding binding in bindings)
+    foreach (IBinding binding in _bindings.Select(x => x.Value))
     {
       Debug.WriteLine(binding.Name);
       binding.Parent.AssociateWithBinding(binding);
@@ -130,23 +123,19 @@ internal sealed class RevitCefPlugin : IRevitPlugin
         return;
       }
 
-#if DEBUG || LOCAL
+#if DEBUG
       _cefSharpPanel.Browser.ShowDevTools();
 #endif
-      foreach (IBinding binding in bindings)
+      foreach (IBinding binding in _bindings.Select(x => x.Value))
       {
-        IBrowserBridge bridge = binding.Parent;
+        IBridge bridge = binding.Parent;
 
-#if REVIT2025_OR_GREATER
-        _cefSharpPanel.Browser.JavascriptObjectRepository.Register(bridge.FrontendBoundName, bridge, _bindingOptions);
-#else
         _cefSharpPanel.Browser.JavascriptObjectRepository.Register(
           bridge.FrontendBoundName,
           bridge,
           true,
           _bindingOptions
         );
-#endif
       }
     };
   }
@@ -159,7 +148,7 @@ internal sealed class RevitCefPlugin : IRevitPlugin
     // Otherwise pane cannot be registered for double-click file open.
     _uIControlledApplication.RegisterDockablePane(
       RevitExternalApplication.DockablePanelId,
-      "Speckle (Beta) for Revit",
+      Connector.Name,
       _cefSharpPanel
     );
   }
@@ -182,3 +171,4 @@ internal sealed class RevitCefPlugin : IRevitPlugin
     return null;
   }
 }
+#endif

Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitExternalApplication.cs

@@ -1,11 +1,11 @@
+using System.IO;
+using System.Reflection;
 using Autodesk.Revit.UI;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common;
-using Speckle.Connectors.DUI;
-using Speckle.Connectors.Revit.DependencyInjection;
-using Speckle.Converters.RevitShared;
+using Speckle.Autofac;
+using Speckle.Autofac.DependencyInjection;
+using Speckle.Connectors.Utils;
 using Speckle.Sdk;
+using Speckle.Sdk.Common;
 using Speckle.Sdk.Host;
 
 namespace Speckle.Connectors.Revit.Plugin;
@@ -14,7 +14,7 @@ internal sealed class RevitExternalApplication : IExternalApplication
 {
   private IRevitPlugin? _revitPlugin;
 
-  private ServiceProvider? _container;
+  private SpeckleContainer? _container;
   private IDisposable? _disposableLogger;
 
   // POC: move to somewhere central?
@@ -41,25 +41,23 @@ internal sealed class RevitExternalApplication : IExternalApplication
     {
       // POC: not sure what this is doing...  could be messing up our Aliasing????
       AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolver.OnAssemblyResolve<RevitExternalApplication>;
-      var services = new ServiceCollection();
       // init DI
-      _disposableLogger = services.Initialize(HostApplications.Revit, GetVersion());
-      services.AddRevit();
-      services.AddRevitConverters();
-      services.AddSingleton(application);
-      _container = services.BuildServiceProvider();
-      _container.UseDUI();
+      _disposableLogger = Connector.Initialize(HostApplications.Revit, GetVersion());
+      _container = SpeckleContainerBuilder
+        .CreateInstance()
+        .LoadAutofacModules(
+          Assembly.GetExecutingAssembly(),
+          [Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location).NotNull()]
+        )
+        .AddSingleton(application) // inject UIControlledApplication application
+        .Build();
 
       // resolve root object
-      _revitPlugin = _container.GetRequiredService<IRevitPlugin>();
+      _revitPlugin = _container.Resolve<IRevitPlugin>();
       _revitPlugin.Initialise();
     }
     catch (Exception e) when (!e.IsFatal())
     {
-      _container
-        .GetRequiredService<ILoggerFactory>()
-        .CreateLogger<RevitExternalApplication>()
-        .LogCritical(e, "Unhandled exception");
       // POC: feedback?
       return Result.Failed;
     }
@@ -76,7 +74,6 @@ internal sealed class RevitExternalApplication : IExternalApplication
       // need to look for commonality
       _revitPlugin?.Shutdown();
       _disposableLogger?.Dispose();
-      _container?.Dispose();
     }
     catch (Exception e) when (!e.IsFatal())
     {

Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitWebViewPlugin.cs

@@ -7,7 +7,7 @@ using Autodesk.Revit.ApplicationServices;
 using Autodesk.Revit.UI;
 using Revit.Async;
 using Speckle.Connectors.DUI.WebView;
-using Speckle.Connectors.Common;
+using Speckle.Connectors.Utils;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk;
 
@@ -18,7 +18,6 @@ internal sealed class RevitWebViewPlugin : IRevitPlugin
   private readonly UIControlledApplication _uIControlledApplication;
   private readonly RevitContext _revitContext;
   private readonly DUI3ControlWebViewDockable _webViewPanel;
-  private readonly ISpeckleApplication _speckleApplication;
 
   [System.Diagnostics.CodeAnalysis.SuppressMessage(
     "Style",
@@ -28,14 +27,12 @@ internal sealed class RevitWebViewPlugin : IRevitPlugin
   public RevitWebViewPlugin(
     UIControlledApplication uIControlledApplication,
     RevitContext revitContext,
-    DUI3ControlWebViewDockable webViewPanel,
-    ISpeckleApplication speckleApplication
+    DUI3ControlWebViewDockable webViewPanel
   )
   {
     _uIControlledApplication = uIControlledApplication;
     _revitContext = revitContext;
     _webViewPanel = webViewPanel;
-    _speckleApplication = speckleApplication;
   }
 
   public void Initialise()
@@ -70,7 +67,7 @@ internal sealed class RevitWebViewPlugin : IRevitPlugin
     var dui3Button = (PushButton)
       specklePanel.AddItem(
         new PushButtonData(
-          "Speckle (Beta) for Revit",
+          Connector.Name,
           Connector.TabTitle,
           typeof(RevitExternalApplication).Assembly.Location,
           typeof(SpeckleRevitCommand).FullName
@@ -78,19 +75,16 @@ internal sealed class RevitWebViewPlugin : IRevitPlugin
       );
 
     string path = typeof(RevitWebViewPlugin).Assembly.Location;
-    dui3Button.Image = LoadPngImgSource(
-      $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo16.png",
-      path
-    );
+    dui3Button.Image = LoadPngImgSource($"Speckle.Connectors.Revit{Connector.VersionString}.Assets.logo16.png", path);
     dui3Button.LargeImage = LoadPngImgSource(
-      $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo32.png",
+      $"Speckle.Connectors.Revit{Connector.VersionString}.Assets.logo32.png",
       path
     );
     dui3Button.ToolTipImage = LoadPngImgSource(
-      $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo32.png",
+      $"Speckle.Connectors.Revit{Connector.VersionString}.Assets.logo32.png",
       path
     );
-    dui3Button.ToolTip = "Speckle (Beta) for Revit";
+    dui3Button.ToolTip = "Speckle Connector for Revit New UI";
     //dui3Button.AvailabilityClassName = typeof(CmdAvailabilityViews).FullName;
     dui3Button.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
   }

Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems

@@ -22,14 +22,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)ElementIdHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\DocumentModelStorageSchema.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Elements.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitMaterialBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\HideWarningsFailuresPreprocessor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\IdStorageSchema.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\IStorageSchema.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitDocumentStore.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\RevitConnectorModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitGroupBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitUtils.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\SendCollectionManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\ElementUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\ITransactionManager.cs" />
@@ -37,10 +33,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\RevitHostObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\TransactionManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\RevitRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\SendParameterNullOrEmptyStringsSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ReferencePointSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\DetailLevelSetting.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\DUI3ControlWebViewDockable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\IRevitPlugin.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCommand.cs" />

Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj

@@ -4,12 +4,6 @@
     <Configurations>Debug;Release;Local</Configurations>
     <RhinoVersion>7</RhinoVersion>
     <DefineConstants>$(DefineConstants);RHINO7;RHINO7_OR_GREATER</DefineConstants>
-    <TargetExt>.rhp</TargetExt>
-    <StartProgram>$(ProgramFiles)\Rhino $(RhinoVersion)\System\Rhino.exe</StartProgram>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <UseWpf>true</UseWpf>
-    <UseWindowsForms>true</UseWindowsForms>
-    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,15 +12,13 @@
   </ItemGroup>
  
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Rhino\Speckle.Converters.Rhino7\Speckle.Converters.Rhino7.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Converters\Rhino\Speckle.Converters.Rhino7.DependencyInjection\Speckle.Converters.Rhino7.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="EmbeddedResources\**\*" />
-    <EmbeddedResource Include="Resources\**\*.ico" />
-  </ItemGroup>
-  
   <Import Project="..\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems" Label="Shared" />
 </Project>

Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -80,6 +71,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -109,57 +108,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -193,6 +196,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -225,22 +233,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -254,8 +262,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -267,8 +275,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -278,21 +310,24 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -303,14 +338,28 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.rhino7": {
@@ -320,32 +369,38 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.rhino7.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Converters.Rhino7": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -355,29 +410,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj

@@ -4,29 +4,21 @@
     <Configurations>Debug;Release;Local</Configurations>
     <RhinoVersion>8</RhinoVersion>
     <DefineConstants>$(DefineConstants);RHINO8;RHINO7_OR_GREATER;RHIN08_OR_GREATER</DefineConstants>
-    <TargetExt>.rhp</TargetExt>
-    <StartProgram>$(ProgramFiles)\Rhino $(RhinoVersion)\System\Rhino.exe</StartProgram>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <UseWpf>true</UseWpf>
-    <UseWindowsForms>true</UseWindowsForms>
-    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" />
-    <PackageReference Include="RhinoWindows" IncludeAssets="compile; build" PrivateAssets="all" />
+    <PackageReference Include="RhinoCommon" NoWarn="NU1701" IncludeAssets="compile; build" PrivateAssets="all" />
+    <PackageReference Include="RhinoWindows" NoWarn="NU1701" IncludeAssets="compile; build" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Rhino\Speckle.Converters.Rhino8\Speckle.Converters.Rhino8.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\..\..\Converters\Rhino\Speckle.Converters.Rhino8.DependencyInjection\Speckle.Converters.Rhino8.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="EmbeddedResources\**\*" />
-    <EmbeddedResource Include="Resources\**\*.ico" />
-  </ItemGroup>
   
   <Import Project="..\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems" Label="Shared" />
   

Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json

@@ -2,15 +2,6 @@
   "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
       "Microsoft.SourceLink.GitHub": {
         "type": "Direct",
         "requested": "[8.0.0, )",
@@ -80,6 +71,14 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -109,57 +108,61 @@
       },
       "Microsoft.Extensions.Configuration": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
+        "resolved": "3.1.0",
+        "contentHash": "Lu41BWNmwhKr6LgyQvcYBOge0pPvmiaK8R5UHXX4//wBhonJyWcT2OK1mqYfEM5G7pTf31fPrpIHOT6sN7EGOA==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
+          "Microsoft.Extensions.Configuration.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
+        "resolved": "3.1.0",
+        "contentHash": "ESz6bVoDQX7sgWdKHF6G9Pq672T8k+19AFb/txDXwdz7MoqaNQj2/in3agm/3qae9V+WvQZH86LLTNVo0it8vQ==",
         "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
+          "Microsoft.Extensions.Primitives": "3.1.0"
         }
       },
       "Microsoft.Extensions.Configuration.Binder": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
+        "resolved": "3.1.0",
+        "contentHash": "o9eELDBfNkR7sUtYysFZ1Q7BQ1mYt27DMkups/3vu7xgPyOpMD+iAfrBZFzUXT2iw0fmFb8s1gfNBZS+IgjKdQ==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
+          "Microsoft.Extensions.Configuration": "3.1.0"
+        }
+      },
+      "Microsoft.Extensions.DependencyInjection": {
+        "type": "Transitive",
+        "resolved": "3.1.0",
+        "contentHash": "KVkv3aF2MQpmGFRh4xRx2CNbc2sjDFk+lH4ySrjWSOS+XoY1Xc+sJphw3N0iYOpoeCCq8976ceVYDH8sdx2qIQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0"
         }
       },
       "Microsoft.Extensions.DependencyInjection.Abstractions": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "resolved": "3.1.0",
+        "contentHash": "44rDtOf1JXXAFpNT2EXMExaDm/4OJ2RXOL9i9lE4bK427nzC7Exphv+beB6IgluyE2GIoo8zezTStMXI7MQ8WA=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
+        "resolved": "3.1.0",
+        "contentHash": "9b6JHY7TAXrSfZ6EEGf+j8XnqKIiMPErfmaNXhJYSCb+BUW2H4RtzkNJvwLJzwgzqBP0wtTjyA6Uw4BPPdmkMw==",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Primitives": "3.1.0",
+          "System.ComponentModel.Annotations": "4.7.0"
         }
       },
       "Microsoft.Extensions.Primitives": {
         "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
+        "resolved": "3.1.0",
+        "contentHash": "LEKAnX7lhUhSoIc2XraCTK3M4IU/LdVUzCe464Sa4+7F4ZJuXHHRzZli2mDbiT4xzAZhgqXbvfnb5+CNDcQFfg==",
         "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
+          "System.Memory": "4.5.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.7.0"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
@@ -193,6 +196,11 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "phWGEyqiZlB5LichJtVA45xFFvxRxlU8rBTEag3llZeNIlSXRW0wzWmAq8gdQftHJyw59iupZwH2Tx+jglzp8w=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -225,22 +233,22 @@
       },
       "System.Buffers": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+        "resolved": "4.5.1",
+        "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
       },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
+        "resolved": "4.7.0",
+        "contentHash": "0YFqjhp/mYkDGpU0Ye1GjE53HMp9UVfGN7seGpAMttAC0C40v5gw598jCgpbBLMmCo0E5YRLBv5Z2doypO49ZQ=="
       },
       "System.Memory": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "resolved": "4.5.4",
+        "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
         "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+          "System.Buffers": "4.5.1",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
       "System.Net.WebSockets.Client.Managed": {
@@ -254,8 +262,8 @@
       },
       "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+        "resolved": "4.5.0",
+        "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
       },
       "System.Reactive": {
         "type": "Transitive",
@@ -267,8 +275,32 @@
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
+        "resolved": "5.0.0",
+        "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
+      },
+      "System.Text.Encodings.Web": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
+        "dependencies": {
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4"
+        }
+      },
+      "System.Text.Json": {
+        "type": "Transitive",
+        "resolved": "5.0.2",
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.4",
+          "System.Numerics.Vectors": "4.5.0",
+          "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+          "System.Text.Encodings.Web": "5.0.1",
+          "System.Threading.Tasks.Extensions": "4.5.4",
+          "System.ValueTuple": "4.5.0"
+        }
       },
       "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
@@ -278,21 +310,24 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.3"
         }
       },
-      "speckle.connectors.common": {
+      "System.ValueTuple": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
+      },
+      "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )"
+          "Autofac": "[5.2.0, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.146, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Connectors.Utils": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -303,14 +338,28 @@
           "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
-      "speckle.connectors.logging": {
-        "type": "Project"
+      "speckle.connectors.utils": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )",
+          "Speckle.Sdk": "[3.1.0-dev.107, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.146, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Objects": "[3.1.0-dev.107, )"
+        }
+      },
+      "speckle.converters.common.dependencyinjection": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Autofac": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
       "speckle.converters.rhino8": {
@@ -320,32 +369,38 @@
           "Speckle.Converters.Common": "[1.0.0, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+      "speckle.converters.rhino8.dependencyinjection": {
+        "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+          "Speckle.Converters.Rhino8": "[1.0.0, )"
+        }
+      },
+      "Autofac": {
+        "type": "CentralTransitive",
+        "requested": "[5.2.0, )",
+        "resolved": "5.2.0",
+        "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==",
+        "dependencies": {
+          "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "P+8sKQ8L4ooL79sxxqwFPxGGC3aBrUDLB/dZqhs4J0XjTyrkeeyJQ4D4nzJB6OnAhy78HIIgQ/RbD6upOXLynw==",
         "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
+          "Microsoft.Extensions.Configuration.Binder": "3.1.0",
+          "Microsoft.Extensions.DependencyInjection": "3.1.0",
+          "Microsoft.Extensions.Logging.Abstractions": "3.1.0",
+          "Microsoft.Extensions.Options": "3.1.0"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+        "requested": "[3.1.0, )",
+        "resolved": "3.1.0",
+        "contentHash": "jjo4YXRx6MIpv6DiRxJjSpl+sPP0+5VW0clMEdLyIAz44PPwrDTFrd5PZckIxIXl1kKZ2KK6IL2nkt0+ug2MQg=="
       },
       "Microsoft.Web.WebView2": {
         "type": "CentralTransitive",
@@ -355,29 +410,29 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "xuv5LaU6j8ODGHyClHbbK78bOJid8LGuwfVcEega1q3sYwmLWOWIDP9lO0QA1tyctE+2CZDH3sOUChleAFC4fg==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "MTXyE6Gs63wEW2kzLAtGCtZU+heohj87piVHSzanPg5qznqw0TXcvYBAg1IfeAg0ya5KMZ2IqT05GtW8bda1pQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.146"
+          "Speckle.Sdk": "3.1.0-dev.107"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.146, )",
-        "resolved": "3.1.0-dev.146",
-        "contentHash": "vNaWJkt7/xcIH/CraOrEumGn8A6gAlyl1RHfRI8B8qAGylSlEhuvuBSatS1gUPI35p9omO63yYQFKaIKEIsa3Q==",
+        "requested": "[3.1.0-dev.107, )",
+        "resolved": "3.1.0-dev.107",
+        "contentHash": "3qaL0N8fIcliOeDszBIYR9q1w/YG7OQod95F5l0Ju1R/RlB2WVaAC4CElPe6jHvZl96cDKOJ6K55827omL7QTQ==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
           "Microsoft.Data.Sqlite": "7.0.7",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
           "Polly": "7.2.3",
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Newtonsoft.Json": "13.0.2"
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.107",
+          "System.Text.Json": "5.0.2"
         }
       },
       "System.Threading.Tasks.Dataflow": {

Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs

@@ -6,7 +6,7 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.Rhino.Extensions;
-using Speckle.Sdk;
+using Speckle.Connectors.Utils.Common;
 using Speckle.Sdk.Common;
 
 namespace Speckle.Connectors.Rhino.Bindings;
@@ -14,21 +14,15 @@ namespace Speckle.Connectors.Rhino.Bindings;
 public class RhinoBasicConnectorBinding : IBasicConnectorBinding
 {
   public string Name => "baseBinding";
-  public IBrowserBridge Parent { get; }
+  public IBridge Parent { get; }
   public BasicConnectorBindingCommands Commands { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly ISpeckleApplication _speckleApplication;
 
-  public RhinoBasicConnectorBinding(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    ISpeckleApplication speckleApplication
-  )
+  public RhinoBasicConnectorBinding(DocumentModelStore store, IBridge parent)
   {
     _store = store;
     Parent = parent;
-    _speckleApplication = speckleApplication;
     Commands = new BasicConnectorBindingCommands(parent);
 
     _store.DocumentChanged += (_, _) =>
@@ -37,11 +31,11 @@ public class RhinoBasicConnectorBinding : IBasicConnectorBinding
     };
   }
 
-  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
+  public string GetConnectorVersion() => typeof(RhinoBasicConnectorBinding).Assembly.GetVersion();
 
-  public string GetSourceApplicationName() => _speckleApplication.Slug;
+  public string GetSourceApplicationName() => Speckle.Connectors.Utils.Connector.Slug;
 
-  public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
+  public string GetSourceApplicationVersion() => "7";
 
   public DocumentInfo? GetDocumentInfo()
   {
@@ -130,7 +124,7 @@ public class RhinoBasicConnectorBinding : IBasicConnectorBinding
     RhinoDoc.ActiveDoc.Objects.UnselectAll();
     List<RhinoObject> rhinoObjectsToSelect = new(rhinoObjects);
 
-    foreach (Group group in groups) // This is not performant if we have many groups. That's why we do not store group ids on baked object ids, to not have a problem later on highlighting all model. Mostly for single group highlight from report item.
+    foreach (Group group in groups)
     {
       int groupIndex = RhinoDoc.ActiveDoc.Groups.Find(group.Name);
       if (groupIndex < 0)