Merge pull request #884 from specklesystems/dev

Update dev into main

.editorconfig

@@ -314,6 +314,9 @@ dotnet_diagnostic.NUnit2037.severity = warning # Consider using Assert.That(coll
 dotnet_diagnostic.NUnit2038.severity = warning # Consider using Assert.That(actual, Is.InstanceOf(expected)) instead of Assert.IsInstanceOf(expected, actual)
 dotnet_diagnostic.NUnit2039.severity = warning # Consider using Assert.That(actual, Is.Not.InstanceOf(expected)) instead of Assert.IsNotInstanceOf(expected, actual)
 
+# note: added to allow the copy paste from rhino inside of the ValueSet component
+dotnet_diagnostic.CA1033.severity = none
+
 [*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}]
 indent_style = space
 indent_size = 2

.github/workflows/pr.yml

@@ -1,13 +1,10 @@
 name: .NET Build
 
-on:
-  pull_request
+on: pull_request
 
-jobs:   
+jobs:
   build:
     runs-on: windows-latest
-    outputs:
-      version: ${{ steps.set-version.outputs.version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -18,8 +15,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
-      
-      - name: Cache Nuget     
+
+      - name: Cache Nuget
         uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
@@ -39,8 +36,8 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
-      
-      - name: Cache Nuget     
+
+      - name: Cache Nuget
         uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
@@ -51,9 +48,9 @@ jobs:
 
       - name: ⚒️ Run tests
         run: ./build.sh test-only
-        
+
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5
         with:
-          file: Converters/**/coverage.xml
+          files: Converters/**/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -3,15 +3,17 @@ name: .NET Build and Publish
 on:
   push:
     branches: ["main", "installer-test/**"]
-    tags: ["v3.*"] # Manual delivery on every 3.x tag
+    tags: ["v3.*.*"] # Manual delivery on every 3.x tag
 
 jobs:
   build-windows:
     runs-on: windows-latest
     env:
-      SPECKLE_VERSION: "unset"
+      SEMVER: "unset"
+      FILE_VERSION: "unset"
     outputs:
-      version: ${{ steps.set-version.outputs.version }}
+      semver: ${{ steps.set-version.outputs.semver }}
+      file_version: ${{ steps.set-version.outputs.file_version }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -35,29 +37,37 @@ jobs:
       - name: ⬆️ Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: output-${{ env.SPECKLE_VERSION }}
+          name: output-${{ env.SEMVER }}
           path: output/*.*
           if-no-files-found: error
           retention-days: 1
-          compression-level: 0 # no compression      
+          compression-level: 0 # no compression
+
       - id: set-version
         name: Set version to output
-        run: echo "version=${{ env.SPECKLE_VERSION }}" >> "$Env:GITHUB_OUTPUT"
+        run: |
+          echo "semver=${{ env.SEMVER }}" >> "$Env:GITHUB_OUTPUT"
+          echo "file_version=${{ env.FILE_VERSION }}" >> "$Env:GITHUB_OUTPUT"
 
   deploy-installers:
     runs-on: ubuntu-latest
     needs: build-windows
     env:
       IS_PUBLIC_RELEASE: ${{ github.ref_type == 'tag' }}
-      IS_TEST_INSTALLER: ${{ github.ref_type != 'tag' }}
     steps:
       - name: 🔫 Trigger Build Installers
-        uses: ALEEF02/workflow-dispatch@v3.0.0
+        uses: the-actions-org/workflow-dispatch@v4.0.0
         with:
           workflow: Build Installers
           repo: specklesystems/connector-installers
           token: ${{ secrets.CONNECTORS_GH_TOKEN }}
-          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build-windows.outputs.version }}", "public_release": ${{ env.IS_PUBLIC_RELEASE }}, "store_artifacts": ${{ env.IS_TEST_INSTALLER }} }'
+          inputs: '{
+            "run_id": "${{ github.run_id }}",
+            "semver": "${{ needs.build-windows.outputs.semver }}",
+            "file_version": "${{ needs.build-windows.outputs.file_version }}",
+            "repo": "${{ github.repository }}",
+            "is_public_release": ${{ env.IS_PUBLIC_RELEASE }}
+            }'
           ref: main
           wait-for-completion: true
           wait-for-completion-interval: 10s

Build/Build.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Bullseye" />
     <PackageReference Include="Glob" />
     <PackageReference Include="Microsoft.Build" />
+    <PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" />
     <PackageReference Include="Semver" />
     <PackageReference Include="SimpleExec" />
   </ItemGroup>

Build/Consts.cs

@@ -6,12 +6,11 @@ public static class Consts
 
   public static readonly ProjectGroup[] ProjectGroups =
   {
-    new("arcgis", [new("Connectors/ArcGIS/Speckle.Connectors.ArcGIS3", "net6.0-windows")]),
     new(
       "rhino",
       [
         new("Connectors/Rhino/Speckle.Connectors.Rhino7", "net48"),
-        new("Connectors/Rhino/Speckle.Connectors.Rhino8", "net48")
+        new("Connectors/Rhino/Speckle.Connectors.Rhino8", "net48"),
       ]
     ),
     new(
@@ -20,7 +19,8 @@ public static class Consts
         new("Connectors/Revit/Speckle.Connectors.Revit2022", "net48"),
         new("Connectors/Revit/Speckle.Connectors.Revit2023", "net48"),
         new("Connectors/Revit/Speckle.Connectors.Revit2024", "net48"),
-        new("Connectors/Revit/Speckle.Connectors.Revit2025", "net8.0-windows")
+        new("Connectors/Revit/Speckle.Connectors.Revit2025", "net8.0-windows"),
+        new("Connectors/Revit/Speckle.Connectors.Revit2026", "net8.0-windows")
       ]
     ),
     new(
@@ -59,7 +59,8 @@ public static class Consts
       "teklastructures",
       [
         new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
-        new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
+        new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48"),
+        new("Connectors/Tekla/Speckle.Connector.Tekla2025", "net48")
       ]
     ),
     new(

Build/Program.cs

@@ -15,6 +15,7 @@ const string ZIP = "zip";
 const string RESTORE_TOOLS = "restore-tools";
 const string CLEAN_LOCKS = "clean-locks";
 const string CHECK_SOLUTIONS = "check-solutions";
+const string GEN_SOLUTIONS = "generate-solutions";
 const string DEEP_CLEAN = "deep-clean";
 const string DEEP_CLEAN_LOCAL = "deep-clean-local";
 const string DETECT_AFFECTED = "detect-affected";
@@ -27,14 +28,7 @@ if (args.Length > 1)
   args = new[] { arguments.First() };
   //arguments = arguments.Skip(1).ToList();
 }*/
-void Build(string solution, string configuration)
-{
-  Console.WriteLine();
-  Console.WriteLine();
-  Console.WriteLine($"Building solution '{solution}' as '{configuration}'");
-  Console.WriteLine();
-  Run("dotnet", $"build \".\\{solution}\" --configuration {configuration} --no-restore");
-}
+
 void Restore(string solution)
 {
   Console.WriteLine();
@@ -71,30 +65,31 @@ void CleanSolution(string solution, string configuration)
   DeleteDirectories("**/obj");
   DeleteFiles("**/*.lock.json");
   Restore(solution);
-  Build(solution, configuration);
 }
 
 Target(
   CLEAN_LOCKS,
-  () =>
+  Consts.Solutions,
+  s =>
   {
     DeleteFiles("**/*.lock.json");
-    Restore("Speckle.Connectors.sln");
+    Restore(s);
   }
 );
 
 Target(
   DEEP_CLEAN,
-  () =>
+  Consts.Solutions,
+  s =>
   {
-    CleanSolution("Speckle.Connectors.sln", "debug");
+    CleanSolution(s, "debug");
   }
 );
 Target(
   DEEP_CLEAN_LOCAL,
   () =>
   {
-    CleanSolution("Local.sln", "local");
+    CleanSolution("Local.sln", "Local");
   }
 );
 
@@ -183,6 +178,7 @@ Target(
 );
 
 Target(CHECK_SOLUTIONS, Solutions.CompareConnectorsToLocal);
+Target(GEN_SOLUTIONS, Solutions.GenerateSolutions);
 
 Target(
   TEST,
@@ -239,6 +235,7 @@ Target(
   async () =>
   {
     var version = await Versions.ComputeVersion();
+    var fileVersion = await Versions.ComputeFileVersion();
     foreach (var group in await Affected.GetAffectedProjectGroups())
     {
       Console.WriteLine($"Zipping: {group.HostAppSlug} as {version}");
@@ -280,7 +277,8 @@ Target(
 
     string githubEnv = Environment.GetEnvironmentVariable("GITHUB_ENV") ?? "Unset";
     Console.WriteLine($"GITHUB_ENV: {githubEnv}");
-    File.AppendAllText(githubEnv, $"SPECKLE_VERSION={version}{Environment.NewLine}");
+    File.AppendAllText(githubEnv, $"SEMVER={version}{Environment.NewLine}");
+    File.AppendAllText(githubEnv, $"FILE_VERSION={fileVersion}{Environment.NewLine}");
   }
 );
 

Build/Solutions.cs

@@ -1,4 +1,6 @@
 using Microsoft.Build.Construction;
+using Microsoft.VisualStudio.SolutionPersistence.Model;
+using Microsoft.VisualStudio.SolutionPersistence.Serializer;
 
 namespace Build;
 
@@ -53,4 +55,53 @@ public static class Solutions
       );
     }
   }
+
+  public static async Task GenerateSolutions()
+  {
+    await GenerateLocalSlnx();
+    foreach (var group in Consts.ProjectGroups)
+    {
+      var path = group.Projects[0].ProjectPath.Split('/');
+      var folder = $"/{path[0]}/{path[1]}/";
+      await GenerateConnector(group.HostAppSlug, folder);
+    }
+  }
+
+  public static async Task GenerateLocalSlnx()
+  {
+    var connectors = await GetFullSlnx();
+    connectors.AddProject("..\\speckle-sharp-sdk\\src\\Speckle.Objects\\Speckle.Objects.csproj");
+    connectors.AddProject("..\\speckle-sharp-sdk\\src\\Speckle.Sdk\\Speckle.Sdk.csproj");
+    connectors.AddProject("..\\speckle-sharp-sdk\\src\\Speckle.Sdk.Dependencies\\Speckle.Sdk.Dependencies.csproj");
+    var sln = Path.Combine("C:\\Users\\adam\\Git\\speckle-sharp-connectors", "Local.slnx");
+    await SolutionSerializers.SlnXml.SaveAsync(sln, connectors, default);
+    sln = Path.Combine(Environment.CurrentDirectory, "Local.sln");
+    await SolutionSerializers.SlnFileV12.SaveAsync(sln, connectors, default);
+  }
+
+  public static async Task GenerateConnector(string slug, string folder)
+  {
+    slug = string.Concat(slug[0].ToString().ToUpper(), slug.AsSpan(1));
+    var connectors = await GetFullSlnx();
+    var foldersToRemove = connectors
+      .SolutionFolders.Where(x =>
+        //need base folder
+        !x.Path.Equals("/Connectors/")
+        //don't grab all
+        && (x.Path.StartsWith("/Connectors/") && !x.Path.StartsWith(folder))
+      )
+      .ToList();
+    foreach (var folderToRemove in foldersToRemove)
+    {
+      connectors.RemoveFolder(folderToRemove);
+    }
+    var sln = Path.Combine(Environment.CurrentDirectory, $"Speckle.{slug}.slnx");
+    await SolutionSerializers.SlnXml.SaveAsync(sln, connectors, default);
+  }
+
+  public static async Task<SolutionModel> GetFullSlnx()
+  {
+    var connectorsSln = Path.Combine(Environment.CurrentDirectory, "Speckle.Connectors.slnx");
+    return await SolutionSerializers.SlnXml.OpenAsync(connectorsSln, default);
+  }
 }

Build/packages.lock.json

@@ -47,6 +47,12 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
+      "Microsoft.VisualStudio.SolutionPersistence": {
+        "type": "Direct",
+        "requested": "[1.0.52, )",
+        "resolved": "1.0.52",
+        "contentHash": "oNv2JtYXhpdJrX63nibx1JT3uCESOBQ1LAk7Dtz/sr0+laW0KRM6eKp4CZ3MHDR2siIkKsY8MmUkeP5DKkQQ5w=="
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",

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

@@ -1,105 +0,0 @@
-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.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.Converters.ArcGIS3;
-using Speckle.Converters.ArcGIS3.Utils;
-using Speckle.Converters.Common;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.ArcGIS.Bindings;
-
-public sealed class ArcGISReceiveBinding : IReceiveBinding
-{
-  public string Name { get; } = "receiveBinding";
-  private readonly ICancellationManager _cancellationManager;
-  private readonly DocumentModelStore _store;
-  private readonly IServiceProvider _serviceProvider;
-  private readonly IOperationProgressManager _operationProgressManager;
-  private readonly ILogger<ArcGISReceiveBinding> _logger;
-  private readonly IArcGISConversionSettingsFactory _arcGISConversionSettingsFactory;
-
-  private ReceiveBindingUICommands Commands { get; }
-  public IBrowserBridge Parent { get; }
-
-  public ArcGISReceiveBinding(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    ICancellationManager cancellationManager,
-    IServiceProvider serviceProvider,
-    IOperationProgressManager operationProgressManager,
-    ILogger<ArcGISReceiveBinding> logger,
-    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory
-  )
-  {
-    _store = store;
-    _cancellationManager = cancellationManager;
-    Parent = parent;
-    Commands = new ReceiveBindingUICommands(parent);
-    _serviceProvider = serviceProvider;
-    _operationProgressManager = operationProgressManager;
-    _logger = logger;
-    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
-  }
-
-  public async Task Receive(string modelCardId)
-  {
-    try
-    {
-      // Get receiver card
-      if (_store.GetModelById(modelCardId) is not ReceiverModelCard modelCard)
-      {
-        // Handle as GLOBAL ERROR at BrowserBridge
-        throw new InvalidOperationException("No download model card was found.");
-      }
-
-      using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId);
-      using var scope = _serviceProvider.CreateScope();
-      scope
-        .ServiceProvider.GetRequiredService<IConverterSettingsStore<ArcGISConversionSettings>>()
-        .Initialize(
-          _arcGISConversionSettingsFactory.Create(
-            Project.Current,
-            MapView.Active.Map,
-            new CRSoffsetRotation(MapView.Active.Map)
-          )
-        );
-      // Receive host objects
-      var receiveOperationResults = await scope
-        .ServiceProvider.GetRequiredService<ReceiveOperation>()
-        .Execute(
-          modelCard.GetReceiveInfo("ArcGIS"), // POC: get host app name from settings? same for GetSendInfo
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
-          cancellationItem.Token
-        );
-
-      modelCard.BakedObjectIds = receiveOperationResults.BakedObjectIds.ToList();
-      await Commands.SetModelReceiveResult(
-        modelCardId,
-        receiveOperationResults.BakedObjectIds,
-        receiveOperationResults.ConversionResults
-      );
-    }
-    catch (OperationCanceledException)
-    {
-      // SWALLOW -> UI handles it immediately, so we do not need to handle anything for now!
-      // Idea for later -> when cancel called, create promise from UI to solve it later with this catch block.
-      // So have 3 state on UI -> Cancellation clicked -> Cancelling -> Cancelled
-      return;
-    }
-    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
-    {
-      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex);
-    }
-  }
-
-  public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
-}

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

@@ -1,71 +0,0 @@
-using ArcGIS.Desktop.Mapping;
-using ArcGIS.Desktop.Mapping.Events;
-using Speckle.Connectors.ArcGIS.Utils;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
-
-namespace Speckle.Connectors.ArcGIS.Bindings;
-
-public class ArcGISSelectionBinding : ISelectionBinding
-{
-  private readonly MapMembersUtils _mapMemberUtils;
-  public string Name => "selectionBinding";
-  public IBrowserBridge Parent { get; }
-
-  public ArcGISSelectionBinding(
-    IBrowserBridge parent,
-    MapMembersUtils mapMemberUtils,
-    ITopLevelExceptionHandler topLevelExceptionHandler
-  )
-  {
-    _mapMemberUtils = mapMemberUtils;
-    Parent = parent;
-
-    // example: https://github.com/Esri/arcgis-pro-sdk-community-samples/blob/master/Map-Authoring/QueryBuilderControl/DefinitionQueryDockPaneViewModel.cs
-    // MapViewEventArgs args = new(MapView.Active);
-    TOCSelectionChangedEvent.Subscribe(_ => topLevelExceptionHandler.CatchUnhandled(OnSelectionChanged), true);
-  }
-
-  private void OnSelectionChanged()
-  {
-    SelectionInfo selInfo = GetSelection();
-    Parent.Send(SelectionBindingEvents.SET_SELECTION, selInfo);
-  }
-
-  private void GetLayersFromGroup(GroupLayer group, List<MapMember> nestedLayers)
-  {
-    nestedLayers.Add(group);
-    foreach (MapMember member in group.Layers)
-    {
-      if (member is GroupLayer subGroup)
-      {
-        GetLayersFromGroup(subGroup, nestedLayers);
-      }
-      else
-      {
-        nestedLayers.Add(member);
-      }
-    }
-  }
-
-  public SelectionInfo GetSelection()
-  {
-    MapView mapView = MapView.Active;
-    List<MapMember> selectedMembers = new();
-    selectedMembers.AddRange(mapView.GetSelectedLayers());
-    selectedMembers.AddRange(mapView.GetSelectedStandaloneTables());
-
-    List<MapMember> allNestedMembers = new();
-    var layerMapMembers = _mapMemberUtils.UnpackMapLayers(selectedMembers);
-    allNestedMembers.AddRange(layerMapMembers);
-
-    List<string> objectTypes = allNestedMembers
-      .Select(o => o.GetType().ToString().Split(".").Last())
-      .Distinct()
-      .ToList();
-    return new SelectionInfo(
-      allNestedMembers.Select(x => x.URI).ToList(),
-      $"{allNestedMembers.Count} layers ({string.Join(", ", objectTypes)})"
-    );
-  }
-}

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

@@ -1,483 +0,0 @@
-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.Connectors.ArcGIS.Filters;
-using Speckle.Connectors.ArcGIS.Utils;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Cancellation;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Common.Threading;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
-using Speckle.Connectors.DUI.Exceptions;
-using Speckle.Connectors.DUI.Logging;
-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.Sdk;
-using Speckle.Sdk.Common;
-
-namespace Speckle.Connectors.ArcGIS.Bindings;
-
-public sealed class ArcGISSendBinding : ISendBinding
-{
-  public string Name => "sendBinding";
-  public SendBindingUICommands Commands { get; }
-  public IBrowserBridge Parent { get; }
-
-  private readonly DocumentModelStore _store;
-  private readonly IServiceProvider _serviceProvider;
-  private readonly List<ISendFilter> _sendFilters;
-  private readonly ICancellationManager _cancellationManager;
-  private readonly ISendConversionCache _sendConversionCache;
-  private readonly IOperationProgressManager _operationProgressManager;
-  private readonly ILogger<ArcGISSendBinding> _logger;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
-  private readonly IArcGISConversionSettingsFactory _arcGISConversionSettingsFactory;
-  private readonly IThreadContext _threadContext;
-  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:
-  /// [CNX-202: Unhandled Exception Occurred when receiving in Rhino](https://linear.app/speckle/issue/CNX-202/unhandled-exception-occurred-when-receiving-in-rhino)
-  /// As to why a concurrent dictionary, it's because it's the cheapest/easiest way to do so.
-  /// https://stackoverflow.com/questions/18922985/concurrent-hashsett-in-net-framework
-  /// </summary>
-  private ConcurrentDictionary<string, byte> ChangedObjectIds { get; set; } = new();
-
-  private List<FeatureLayer> SubscribedLayers { get; set; } = new();
-  private List<StandaloneTable> SubscribedTables { get; set; } = new();
-  private readonly MapMembersUtils _mapMemberUtils;
-
-  public ArcGISSendBinding(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    IEnumerable<ISendFilter> sendFilters,
-    IServiceProvider serviceProvider,
-    ICancellationManager cancellationManager,
-    ISendConversionCache sendConversionCache,
-    IOperationProgressManager operationProgressManager,
-    ILogger<ArcGISSendBinding> logger,
-    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory,
-    MapMembersUtils mapMemberUtils,
-    IThreadContext threadContext,
-    ISpeckleApplication speckleApplication,
-    ITopLevelExceptionHandler topLevelExceptionHandler
-  )
-  {
-    _store = store;
-    _serviceProvider = serviceProvider;
-    _sendFilters = sendFilters.ToList();
-    _cancellationManager = cancellationManager;
-    _sendConversionCache = sendConversionCache;
-    _operationProgressManager = operationProgressManager;
-    _logger = logger;
-    _topLevelExceptionHandler = topLevelExceptionHandler;
-    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
-    _mapMemberUtils = mapMemberUtils;
-    _threadContext = threadContext;
-    _speckleApplication = speckleApplication;
-
-    Parent = parent;
-    Commands = new SendBindingUICommands(parent);
-    SubscribeToArcGISEvents();
-    _store.DocumentChanged += (_, _) =>
-    {
-      _sendConversionCache.ClearCache();
-    };
-  }
-
-  private void OnDocumentStoreChangedEvent(object _) => _sendConversionCache.ClearCache();
-
-  private void SubscribeToArcGISEvents()
-  {
-    LayersRemovedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await QueuedTask.Run(async () => await GetIdsForLayersRemovedEvent(a))
-        ),
-      true
-    );
-
-    StandaloneTablesRemovedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await QueuedTask.Run(async () => await GetIdsForStandaloneTablesRemovedEvent(a))
-        ),
-      true
-    );
-
-    MapPropertyChangedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await QueuedTask.Run(async () => await GetIdsForMapPropertyChangedEvent(a))
-        ),
-      true
-    ); // Map units, CRS etc.
-
-    MapMemberPropertiesChangedEvent.Subscribe(
-      a =>
-        _topLevelExceptionHandler.FireAndForget(
-          async () => await QueuedTask.Run(async () => await GetIdsForMapMemberPropertiesChangedEvent(a))
-        ),
-      true
-    ); // e.g. Layer name
-
-    ActiveMapViewChangedEvent.Subscribe(
-      _ =>
-        _topLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await QueuedTask.Run(SubscribeToMapMembersDataSourceChange);
-        }),
-      true
-    );
-
-    /*
-    LayersAddedEvent.Subscribe(a => _topLevelExceptionHandler.CatchUnhandled(() => GetIdsForLayersAddedEvent(a)), true);
-
-    StandaloneTablesAddedEvent.Subscribe(
-      a => _topLevelExceptionHandler.CatchUnhandled(() => GetIdsForStandaloneTablesAddedEvent(a)),
-      true
-    );
-    */
-  }
-
-  private void SubscribeToMapMembersDataSourceChange()
-  {
-    if (MapView.Active == null)
-    {
-      return;
-    }
-
-    // subscribe to layers
-    foreach (Layer layer in MapView.Active.Map.Layers)
-    {
-      if (layer is FeatureLayer featureLayer)
-      {
-        SubscribeToFeatureLayerDataSourceChange(featureLayer);
-      }
-    }
-    // subscribe to tables
-    foreach (StandaloneTable table in MapView.Active.Map.StandaloneTables)
-    {
-      SubscribeToTableDataSourceChange(table);
-    }
-  }
-
-  private void SubscribeToFeatureLayerDataSourceChange(FeatureLayer layer)
-  {
-    if (SubscribedLayers.Contains(layer))
-    {
-      return;
-    }
-    Table layerTable = layer.GetTable();
-    if (layerTable != null)
-    {
-      SubscribeToAnyDataSourceChange(layerTable);
-      SubscribedLayers.Add(layer);
-    }
-  }
-
-  private void SubscribeToTableDataSourceChange(StandaloneTable table)
-  {
-    if (SubscribedTables.Contains(table))
-    {
-      return;
-    }
-    Table layerTable = table.GetTable();
-    if (layerTable != null)
-    {
-      SubscribeToAnyDataSourceChange(layerTable);
-      SubscribedTables.Add(table);
-    }
-  }
-
-  private void SubscribeToAnyDataSourceChange(Table layerTable)
-  {
-    RowCreatedEvent.Subscribe(
-      (args) =>
-        _topLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await OnRowChanged(args);
-        }),
-      layerTable
-    );
-    RowChangedEvent.Subscribe(
-      (args) =>
-        _topLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await OnRowChanged(args);
-        }),
-      layerTable
-    );
-    RowDeletedEvent.Subscribe(
-      (args) =>
-        _topLevelExceptionHandler.FireAndForget(async () =>
-        {
-          await OnRowChanged(args);
-        }),
-      layerTable
-    );
-  }
-
-  private async Task OnRowChanged(RowChangedEventArgs args)
-  {
-    if (args == null || MapView.Active == null)
-    {
-      return;
-    }
-
-    // get the path of the edited dataset
-    Uri datasetPath = args.Row.GetTable().GetPath();
-
-    foreach (Layer layer in MapView.Active.Map.Layers)
-    {
-      try
-      {
-        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
-      }
-    }
-    foreach (StandaloneTable table in MapView.Active.Map.StandaloneTables)
-    {
-      try
-      {
-        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
-      }
-    }
-
-    await RunExpirationChecks(false);
-  }
-
-  private async Task GetIdsForLayersRemovedEvent(LayerEventsArgs args)
-  {
-    foreach (Layer layer in args.Layers)
-    {
-      ChangedObjectIds[layer.URI] = 1;
-    }
-    await RunExpirationChecks(true);
-  }
-
-  private async Task GetIdsForStandaloneTablesRemovedEvent(StandaloneTableEventArgs args)
-  {
-    foreach (StandaloneTable table in args.Tables)
-    {
-      ChangedObjectIds[table.URI] = 1;
-    }
-    await RunExpirationChecks(true);
-  }
-
-  private async Task GetIdsForMapPropertyChangedEvent(MapPropertyChangedEventArgs args)
-  {
-    foreach (Map map in args.Maps)
-    {
-      List<MapMember> allMapMembers = _mapMemberUtils.GetAllMapMembers(map);
-      foreach (MapMember member in allMapMembers)
-      {
-        ChangedObjectIds[member.URI] = 1;
-      }
-    }
-    await RunExpirationChecks(false);
-  }
-
-  private void GetIdsForLayersAddedEvent(LayerEventsArgs args)
-  {
-    foreach (Layer layer in args.Layers)
-    {
-      if (layer is FeatureLayer featureLayer)
-      {
-        SubscribeToFeatureLayerDataSourceChange(featureLayer);
-      }
-    }
-  }
-
-  private void GetIdsForStandaloneTablesAddedEvent(StandaloneTableEventArgs args)
-  {
-    foreach (StandaloneTable table in args.Tables)
-    {
-      SubscribeToTableDataSourceChange(table);
-    }
-  }
-
-  private async Task GetIdsForMapMemberPropertiesChangedEvent(MapMemberPropertiesChangedEventArgs args)
-  {
-    // don't subscribe to all events (e.g. expanding group, changing visibility etc.)
-    bool validEvent = false;
-    foreach (var hint in args.EventHints)
-    {
-      if (
-        hint == MapMemberEventHint.DataSource
-        || hint == MapMemberEventHint.DefinitionQuery
-        || hint == MapMemberEventHint.LabelClasses
-        || hint == MapMemberEventHint.LabelVisibility
-        || hint == MapMemberEventHint.Name
-        || hint == MapMemberEventHint.Renderer
-        || hint == MapMemberEventHint.SceneLayerType
-        || hint == MapMemberEventHint.URL
-      )
-      {
-        validEvent = true;
-        break;
-      }
-    }
-
-    if (validEvent)
-    {
-      foreach (MapMember member in args.MapMembers)
-      {
-        ChangedObjectIds[member.URI] = 1;
-      }
-      await RunExpirationChecks(false);
-    }
-  }
-
-  public List<ISendFilter> GetSendFilters() => _sendFilters;
-
-  public List<ICardSetting> GetSendSettings() => [];
-
-  [SuppressMessage(
-    "Maintainability",
-    "CA1506:Avoid excessive class coupling",
-    Justification = "Being refactored on in parallel, muting this issue so CI can pass initially."
-  )]
-  public async Task Send(string modelCardId)
-  {
-    //poc: dupe code between connectors
-
-    try
-    {
-      if (_store.GetModelById(modelCardId) is not SenderModelCard modelCard)
-      {
-        // Handle as GLOBAL ERROR at BrowserBridge
-        throw new InvalidOperationException("No publish model card was found.");
-      }
-
-      using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId);
-
-      using var scope = _serviceProvider.CreateScope();
-      List<MapMember> mapMembers = await QueuedTask.Run(() =>
-      {
-        scope
-          .ServiceProvider.GetRequiredService<IConverterSettingsStore<ArcGISConversionSettings>>()
-          .Initialize(
-            _arcGISConversionSettingsFactory.Create(
-              Project.Current,
-              MapView.Active.Map,
-              new CRSoffsetRotation(MapView.Active.Map)
-            )
-          );
-
-        return modelCard
-          .SendFilter.NotNull()
-          .RefreshObjectIds()
-          .Select(id => (MapMember)MapView.Active.Map.FindLayer(id) ?? MapView.Active.Map.FindStandaloneTable(id))
-          .Where(obj => obj != null)
-          .ToList();
-      });
-
-      if (mapMembers.Count == 0)
-      {
-        // Handle as CARD ERROR in this function
-        throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
-      }
-
-      await QueuedTask.Run(() =>
-      {
-        // subscribe to the selected layer events
-        foreach (MapMember mapMember in mapMembers)
-        {
-          if (mapMember is FeatureLayer featureLayer)
-          {
-            SubscribeToFeatureLayerDataSourceChange(featureLayer);
-          }
-          else if (mapMember is StandaloneTable table)
-          {
-            SubscribeToTableDataSourceChange(table);
-          }
-        }
-      });
-
-      var sendResult = await scope
-        .ServiceProvider.GetRequiredService<SendOperation<MapMember>>()
-        .Execute(
-          mapMembers,
-          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
-          cancellationItem.Token
-        );
-
-      await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
-    }
-    catch (OperationCanceledException)
-    {
-      // SWALLOW -> UI handles it immediately, so we do not need to handle anything for now!
-      // Idea for later -> when cancel called, create promise from UI to solve it later with this catch block.
-      // So have 3 state on UI -> Cancellation clicked -> Cancelling -> Cancelled
-      return;
-    }
-    catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
-    {
-      _logger.LogModelCardHandledError(ex);
-      await Commands.SetModelError(modelCardId, ex);
-    }
-  }
-
-  public void CancelSend(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
-
-  /// <summary>
-  /// Checks if any sender model cards contain any of the changed objects. If so, also updates the changed objects hashset for each model card - this last part is important for on send change detection.
-  /// </summary>
-  private async Task RunExpirationChecks(bool idsDeleted)
-  {
-    var senders = _store.GetSenders();
-    List<string> expiredSenderIds = new();
-    string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
-
-    _sendConversionCache.EvictObjects(objectIdsList);
-
-    foreach (SenderModelCard sender in senders)
-    {
-      var objIds = sender.SendFilter.NotNull().RefreshObjectIds();
-      var intersection = objIds.Intersect(objectIdsList).ToList();
-      bool isExpired = intersection.Count != 0;
-      if (isExpired)
-      {
-        expiredSenderIds.Add(sender.ModelCardId.NotNull());
-
-        // Update the model card object Ids
-        if (idsDeleted && sender.SendFilter is ArcGISSelectionFilter filter)
-        {
-          List<string> remainingObjIds = objIds.SkipWhile(x => intersection.Contains(x)).ToList();
-          filter.SelectedObjectIds = remainingObjIds;
-        }
-      }
-    }
-
-    await Commands.SetModelsExpired(expiredSenderIds);
-    ChangedObjectIds = new();
-  }
-}

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

@@ -1,216 +0,0 @@
-using ArcGIS.Core.Data;
-using ArcGIS.Desktop.Framework.Threading.Tasks;
-using ArcGIS.Desktop.Mapping;
-using Speckle.Connectors.ArcGIS.Utils;
-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.Sdk.Common;
-using ArcProject = ArcGIS.Desktop.Core.Project;
-
-namespace Speckle.Connectors.ArcGIS.Bindings;
-
-//poc: dupe code between connectors
-public class BasicConnectorBinding : IBasicConnectorBinding
-{
-  public string Name => "baseBinding";
-  public IBrowserBridge Parent { get; }
-
-  public BasicConnectorBindingCommands Commands { get; }
-  private readonly DocumentModelStore _store;
-  private readonly ISpeckleApplication _speckleApplication;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
-
-  public BasicConnectorBinding(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    ISpeckleApplication speckleApplication,
-    ITopLevelExceptionHandler topLevelExceptionHandler
-  )
-  {
-    _store = store;
-    _speckleApplication = speckleApplication;
-    _topLevelExceptionHandler = topLevelExceptionHandler;
-    Parent = parent;
-    Commands = new BasicConnectorBindingCommands(parent);
-
-    _store.DocumentChanged += (_, _) =>
-      _topLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-      });
-  }
-
-  public string GetSourceApplicationName() => _speckleApplication.Slug;
-
-  public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
-
-  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
-
-  public DocumentInfo? GetDocumentInfo()
-  {
-    if (MapView.Active is null)
-    {
-      return null;
-    }
-
-    return new DocumentInfo(ArcProject.Current.URI, MapView.Active.Map.Name, MapView.Active.Map.URI);
-  }
-
-  public DocumentModelStore GetDocumentState() => _store;
-
-  public void AddModel(ModelCard model) => _store.AddModel(model);
-
-  public void UpdateModel(ModelCard model) => _store.UpdateModel(model);
-
-  public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
-
-  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
-
-  public async Task HighlightObjects(IReadOnlyList<string> objectIds)
-  {
-    await HighlightObjectsOnView(objectIds.Select(x => new ObjectID(x)).ToList());
-  }
-
-  public async Task HighlightModel(string modelCardId)
-  {
-    var model = _store.GetModelById(modelCardId);
-
-    if (model is null)
-    {
-      return;
-    }
-
-    var objectIds = new List<ObjectID>();
-
-    if (model is SenderModelCard senderModelCard)
-    {
-      objectIds = senderModelCard.SendFilter.NotNull().RefreshObjectIds().Select(x => new ObjectID(x)).ToList();
-    }
-
-    if (model is ReceiverModelCard receiverModelCard)
-    {
-      objectIds = receiverModelCard.BakedObjectIds.NotNull().Select(x => new ObjectID(x)).ToList();
-    }
-
-    if (objectIds is null)
-    {
-      return;
-    }
-    await HighlightObjectsOnView(objectIds);
-  }
-
-  private async Task HighlightObjectsOnView(IReadOnlyList<ObjectID> objectIds)
-  {
-    await QueuedTask.Run(() =>
-    {
-      MapView mapView = MapView.Active;
-
-      List<MapMemberFeature> mapMembersFeatures = GetMapMembers(objectIds, mapView);
-      ClearSelectionInTOC();
-      ClearSelection();
-      SelectMapMembersInTOC(mapMembersFeatures);
-      SelectMapMembersAndFeatures(mapMembersFeatures);
-      mapView.ZoomToSelected();
-    });
-  }
-
-  private List<MapMemberFeature> GetMapMembers(IReadOnlyList<ObjectID> objectIds, MapView mapView)
-  {
-    // find the layer on the map (from the objectID) and add the featureID is available
-    List<MapMemberFeature> mapMembersFeatures = new();
-
-    foreach (ObjectID objectId in objectIds)
-    {
-      MapMember mapMember = mapView.Map.FindLayer(objectId.MappedLayerURI, true);
-      if (mapMember is null)
-      {
-        mapMember = mapView.Map.FindStandaloneTable(objectId.MappedLayerURI);
-      }
-      if (mapMember is not null)
-      {
-        MapMemberFeature mapMembersFeat = new(mapMember, objectId.FeatureId);
-        mapMembersFeatures.Add(mapMembersFeat);
-      }
-    }
-    return mapMembersFeatures;
-  }
-
-  private void ClearSelection()
-  {
-    List<Layer> mapMembers = MapView.Active.Map.GetLayersAsFlattenedList().ToList();
-    foreach (var member in mapMembers)
-    {
-      if (member is FeatureLayer featureLayer)
-      {
-        featureLayer.ClearSelection();
-      }
-    }
-  }
-
-  private void ClearSelectionInTOC()
-  {
-    MapView.Active.ClearTOCSelection();
-  }
-
-  private void SelectMapMembersAndFeatures(IReadOnlyList<MapMemberFeature> mapMembersFeatures)
-  {
-    foreach (MapMemberFeature mapMemberFeat in mapMembersFeatures)
-    {
-      MapMember member = mapMemberFeat.MapMember;
-      if (member is FeatureLayer layer)
-      {
-        if (mapMemberFeat.FeatureId == null)
-        {
-          // select full layer if featureID not specified
-          layer.Select();
-        }
-        else
-        {
-          // query features by ID
-          var objectIDfield = layer.GetFeatureClass().GetDefinition().GetObjectIDField();
-
-          // FeatureID range starts from 0, but auto-assigned IDs in the layer start from 1
-          QueryFilter anotherQueryFilter = new() { WhereClause = $"{objectIDfield} = {mapMemberFeat.FeatureId + 1}" };
-          using (Selection onlyOneSelection = layer.Select(anotherQueryFilter, SelectionCombinationMethod.New)) { }
-        }
-      }
-    }
-  }
-
-  private void SelectMapMembersInTOC(IReadOnlyList<MapMemberFeature> mapMembersFeatures)
-  {
-    List<Layer> layers = new();
-    List<StandaloneTable> tables = new();
-
-    foreach (MapMemberFeature mapMemberFeat in mapMembersFeatures)
-    {
-      MapMember member = mapMemberFeat.MapMember;
-      if (member is Layer layer)
-      {
-        if (member is not GroupLayer) // group layer selection clears other layers selection
-        {
-          layers.Add(layer);
-        }
-        else
-        {
-          layer.SetExpanded(true);
-        }
-      }
-      else if (member is StandaloneTable table)
-      {
-        tables.Add(table);
-      }
-    }
-    MapView.Active.SelectLayers(layers);
-
-    // this step clears previous selection, not clear how to ADD selection instead
-    // this is why, activating it only if no layers are selected
-    if (layers.Count == 0)
-    {
-      MapView.Active.SelectStandaloneTables(tables);
-    }
-  }
-}

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

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-
-   Copyright 2022 Esri
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       https://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
--->
-<ArcGIS defaultAssembly="Speckle.Connectors.ArcGIS3.dll" defaultNamespace="Speckle.Connectors.ArcGIS" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
-	<AddInInfo id="{6CB1D25C-B8BF-4A33-9099-C1F8D1B32EFC}" version="1.0" desktopVersion="3.0.34047">
-		<Name>Speckle</Name>
-		<Description>Next Gen Speckle Connector (Beta) for ArcGIS</Description>
-		<Image>Images\AddinDesktop32.png</Image>
-		<Author>Speckle Systems</Author>
-		<Company>Speckle Systems</Company>
-		<Date>8/5/2021 12:24:21 PM</Date>
-		<Subject>Framework</Subject>
-		<!-- Note subject can be one or more of these topics:
-                    Content, Framework, Editing, Geodatabase, Geometry, Geoprocessing, Layouts, Map Authoring, Map Exploration -->
-	</AddInInfo>
-	<modules>
-		<insertModule id="ConnectorArcGIS_Module" className="SpeckleModule" autoLoad="false" caption="SpeckleModule">
-			<!-- uncomment to have the control hosted on a separate tab-->
-			<tabs>
-				<tab id="Speckle_Tab1" caption="Speckle">
-          <group refID="Speckle_Group1"/>
-        </tab>
-			</tabs>
-			<groups>
-				<!-- comment this out if you have no controls on the Addin tab to avoid
-              an empty group. change appearsOnAddinTab to "True" if control is to be in the addin tab-->
-				<group id="Speckle_Group1" caption="Speckle" appearsOnAddInTab="false" keytip="G1">
-					<!-- host controls within groups -->
-					<button refID="SpeckleDUI3_SpeckleDUI3OpenButton" size="large" />
-				</group>
-			</groups>
-			<controls>
-				<!-- add your controls here -->
-				<button id="SpeckleDUI3_SpeckleDUI3OpenButton" caption="Speckle (Beta)"
-						className="SpeckleDUI3OpenButton" loadOnClick="true"
-						keytip="B1"
-						smallImage="Images/s2logo_16.png"
-						largeImage="Images/s2logo_32.png">
-					<tooltip heading="Speckle Connector for ArcGIS">
-                        <disabledText />
-					</tooltip>
-				</button>
-			</controls>
-
-            <dockPanes>
-                <dockPane id="SpeckleDUI3_SpeckleDUI3" caption="Speckle (Beta)" className="SpeckleDUI3ViewModel" keytip="DockPane" initiallyVisible="true" dock="group" dockWith="esri_core_projectDockPane">
-                    <content className="SpeckleDUI3Wrapper" />
-                </dockPane>
-            </dockPanes>
-            
-		</insertModule>
-	</modules>
-</ArcGIS>

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

@@ -1,66 +0,0 @@
-using ArcGIS.Desktop.Mapping;
-using Microsoft.Extensions.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.Common.Threading;
-using Speckle.Connectors.DUI;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Models.Card.SendFilter;
-using Speckle.Connectors.DUI.WebView;
-using Speckle.Converters.Common;
-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.
-// This should go whenever it is aligned.
-
-namespace Speckle.Connectors.ArcGIS.DependencyInjection;
-
-public static class ArcGISConnectorModule
-{
-  public static void AddArcGIS(this IServiceCollection serviceCollection)
-  {
-    serviceCollection.AddConnectors();
-    serviceCollection.AddDUI<DefaultThreadContext, ArcGISDocumentStore>();
-    serviceCollection.AddDUIView();
-
-    // Register bindings
-    serviceCollection.AddSingleton<IBinding, TestBinding>();
-    serviceCollection.AddSingleton<IBinding, ConfigBinding>();
-    serviceCollection.AddSingleton<IBinding, AccountBinding>();
-    serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
-    serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBinding>();
-
-    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
-
-    // register send operation and dependencies
-    serviceCollection.AddSingleton<IBinding, ArcGISSendBinding>();
-    serviceCollection.AddScoped<SendOperation<MapMember>>();
-    serviceCollection.AddSingleton<IBinding, ArcGISSelectionBinding>();
-    serviceCollection.AddTransient<ISendFilter, ArcGISSelectionFilter>();
-    serviceCollection.AddScoped<ArcGISRootObjectBuilder>();
-    serviceCollection.AddScoped<IRootObjectBuilder<MapMember>, ArcGISRootObjectBuilder>();
-    serviceCollection.AddScoped<ArcGISLayerUnpacker>();
-    serviceCollection.AddScoped<ArcGISColorUnpacker>();
-    // register send conversion cache
-    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();
-
-    // register receive operation and dependencies
-    // serviceCollection.AddSingleton<IBinding, ArcGISReceiveBinding>(); // POC: disabled until receive code is refactored
-    serviceCollection.AddScoped<LocalToGlobalConverterUtils>();
-    serviceCollection.AddScoped<ArcGISColorManager>();
-    serviceCollection.AddScoped<IHostObjectBuilder, ArcGISHostObjectBuilder>();
-
-    serviceCollection.AddScoped<MapMembersUtils>();
-
-    // operation progress manager
-    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
-  }
-}

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

@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Project>
-  <!-- Code to zip up the files-->
-
-  <UsingTask TaskName="PackageAddIn" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-    <ParameterGroup>
-      <ZipIntermediatePath ParameterType="System.String" Required="true" />
-      <PackageType ParameterType="System.String" Required="true" />
-      <TargetFolder ParameterType="System.String" Required="true" />
-      <TargetFileName ParameterType="System.String" Required="true" />
-      <RootNamespace ParameterType="System.String" Required="true" />
-      <PackageOutputPath ParameterType="System.String" Output="true"/>
-    </ParameterGroup>
-    <Task>
-      <!--      <Reference Include="System.IO.Compression.FileSystem"/>-->
-      <!--      <Reference Include="System.Xml.Linq"/>-->
-      <!--      <Reference Include="System.Xml"/>-->
-      <Using Namespace="System"/>
-      <Using Namespace="System.IO"/>
-      <Using Namespace="System.Xml.Linq"/>
-      <Using Namespace="System.Linq"/>
-      <Using Namespace="System.IO.Compression"/>
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-      Success = false;
-      string ConfigNotFound = "{0} was not found. File must be present in the root of the project and its build action set to AddInContent.";
-	  string ZipIntermediatePathNotFound = "{0} was not found.";
-      string DefaultAssemblyDoesNotMatch = "Your value of '{0}' for the '{1}' attribute in the {2} does not match the assembly name '{3}' set for your project.";
-      string DefaultNSDoesNotMatch = "Your value of '{0}' for the '{1}' attribute in the {2} does not match the default namespace '{3}' set for your project.";
-      //Create the name of the Config File and extension
-      string extension = "";
-      string config = "";
-      string attrib_asm = "";
-      string attrib_ns = "";
-      var assemblyValMissing = "";
-      var nsValMissing = "";
-      if (PackageType.ToLower() == "plugin")
-      {
-        Log.LogMessage(MessageImportance.Low, "This is an plugin");
-        config = "Config.xml";
-        extension = ".esriPlugin";
-        attrib_asm = "library";
-        attrib_ns = "namespace";
-        assemblyValMissing = "AddIn element 'library' attribute not found";
-        nsValMissing = "AddIn element 'namespace' attribute not found";
-      }
-      else if (PackageType.ToLower() == "configuration")
-      {
-        Log.LogMessage(MessageImportance.Low, "This is an configuration");
-        config = "Config.daml";
-        extension = ".proConfigX";
-        attrib_asm = "defaultAssembly";
-        attrib_ns = "defaultNamespace";
-        assemblyValMissing = "ArcGIS element 'defaultAssembly' attribute not found";
-        nsValMissing = "ArcGIS element 'defaultNamespace' attribute not found";
-      }
-      else
-      {
-        Log.LogMessage(MessageImportance.Low, "This is an addin");
-		config = "Config.daml";
-		bool proSDKProject = File.Exists(Path.Combine(ZipIntermediatePath, config));	
-		if (!proSDKProject) //This might be a class library that uses the Pro references only
-		      return true; 
-        extension = ".esriAddinX";
-        attrib_asm = "defaultAssembly";
-        attrib_ns = "defaultNamespace";
-        assemblyValMissing = "ArcGIS element 'defaultAssembly' attribute not found";
-        nsValMissing = "ArcGIS element 'defaultNamespace' attribute not found";
-      }
-      // Check if Config.daml exists in ZipFolder
-      ZipIntermediatePath = Path.GetFullPath(ZipIntermediatePath);
-      if (!Directory.Exists(ZipIntermediatePath))
-	  {
-	    Log.LogError(ZipIntermediatePathNotFound, ZipIntermediatePath);
-		return false;
-	  }       
-      var addInXML = Path.Combine(ZipIntermediatePath, config);
-      Log.LogMessage(MessageImportance.Low, "addInXML: " + addInXML);
-      Log.LogMessage(MessageImportance.High, "PackageType: " + PackageType);
-      if (!File.Exists(addInXML))
-      {
-        Log.LogError(ConfigNotFound, config);
-        return false;
-      }
-      //Verfiy that an assembly with the name defined in the Config.daml
-      //matches the default assembly set in the project. Ditto for the
-      //namespace
-      string DefaultAssembly = "";
-      string DefaultNamespace = "";
-      XDocument xdoc = XDocument.Load(addInXML);
-      XNamespace DefaultNS = "http://schemas.esri.com/DADF/Registry";
-      if (PackageType.ToLower() == "plugin")
-      {
-        var addin = xdoc.Root.Element(DefaultNS + "AddIn");
-        if (addin != null)
-        {
-          var val = addin.Attribute("library");
-          if (val != null)
-            DefaultAssembly = val.Value;
-          val = addin.Attribute("namespace");
-          if (val != null)
-            DefaultNamespace = val.Value;
-        }
-      }
-      else
-      {
-        var val = xdoc.Root.Attribute("defaultAssembly");
-        if (val != null)
-          DefaultAssembly = val.Value;
-        val = xdoc.Root.Attribute("defaultNamespace");
-        if (val != null)
-          DefaultNamespace = val.Value;
-      }
-      if (string.IsNullOrEmpty(DefaultAssembly))
-      {
-        Log.LogError(assemblyValMissing);
-        return false;
-      }
-      if (string.IsNullOrEmpty(DefaultNamespace))
-      {
-        Log.LogError(nsValMissing);
-        return false;
-      }
-
-      //check that the addin assembly and default assembly names match
-      if (DefaultAssembly.ToLower() != TargetFileName.ToLower())
-      {
-        Log.LogWarning(DefaultAssemblyDoesNotMatch, DefaultAssembly, attrib_asm, config, TargetFileName);
-      }
-      //Ditto for namespace
-      if (DefaultNamespace.ToLower() != RootNamespace.ToLower())
-      {
-        Log.LogWarning(DefaultNSDoesNotMatch, DefaultNamespace, attrib_ns, config, RootNamespace);
-      }
-
-      if (!Directory.Exists(TargetFolder))
-      {
-        Directory.CreateDirectory(TargetFolder);
-      }
-
-      string addInAssembly = System.IO.Path.GetFileNameWithoutExtension(DefaultAssembly);
-      string archiveName = addInAssembly + extension;
-      try
-      {
-        string file = Path.Combine(TargetFolder, archiveName);
-        if (File.Exists(file))
-          File.Delete(file);
-        System.IO.Compression.ZipFile.CreateFromDirectory(ZipIntermediatePath, file);
-        PackageOutputPath = Path.GetFullPath(file);
-        Success = true;
-      }
-      catch (Exception ex)
-      {
-        Log.LogErrorFromException(ex);
-        return false;
-      }
-    ]]>
-      </Code>
-    </Task>
-  </UsingTask>
-  <!-- Code to find relative path-->
-  <UsingTask TaskName="ConvertToRelativePath" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-    <ParameterGroup>
-      <RelativeTo ParameterType="System.String" Required="true"/>
-      <Paths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-      <RelativePaths ParameterType="Microsoft.Build.Framework.ITaskItem[]" Output="true"/>
-    </ParameterGroup>
-    <Task>
-      <Using Namespace="System"/>
-      <Using Namespace="System.IO"/>
-      <Using Namespace="System.Linq"/>
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-			var result = new List<ITaskItem>();
-            System.Uri relativeTo = new Uri(this.RelativeTo);
-            foreach (var i in Paths) {
-                try {
-                    System.Uri itemFullPath = new Uri(i.GetMetadata("FullPath"));
-                    var relativeUri = relativeTo.MakeRelativeUri(itemFullPath);
-
-                    result.Add(new TaskItem(Uri.UnescapeDataString(relativeUri.ToString())));
-                }
-                catch {
-                    return false;
-                }
-            }
-            RelativePaths = result.ToArray();
-			foreach (var i in RelativePaths)
-            {
-                Log.LogMessage(MessageImportance.Low, "RelativePaths: " + i.ToString());
-            }
-            Success = true;
-			 ]]>
-      </Code>
-    </Task>
-  </UsingTask>
-  <UsingTask TaskName="CleanAddIn" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-    <ParameterGroup>
-      <ProjectDir ParameterType="System.String" Required="true"/>
-      <AssemblyName ParameterType="System.String" Required="true"/>
-      <PackageType ParameterType="System.String" Required="true"/>
-      <!--<ArcGISFolder ParameterType="System.String" Output="true" /> -->
-      <CleanInfo ParameterType="System.String" Output="true"/>
-    </ParameterGroup>
-    <Task>
-<!--      <Reference Include="System.Xml.Linq"/>-->
-<!--      <Reference Include="System.Xml"/>-->
-      <Using Namespace="System"/>
-      <Using Namespace="System.IO"/>
-      <Using Namespace="System.Xml.Linq"/>
-      <Using Namespace="System.Linq"/>
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
-	  Success = false;
-      string ConfigNotFound = "{0} was not found. File must be present in the root of the project and its build action set to AddInContent.";
-
-      //Create the name of the Config File and extension
-      string extension = "";
-      string config = "";
-
-      if (PackageType.ToLower() == "plugin")
-      {
-        config = "Config.xml";
-        extension = ".esriPlugin";
-      }
-      else if (PackageType.ToLower() == "configuration")
-      {
-        config = "Config.daml";
-        extension = ".proConfigX";
-      }
-      else
-      {
-        config = "Config.daml";
-		    bool proSDKProject = File.Exists(Path.Combine(ProjectDir, config));
-		    if (!proSDKProject) //This might be a class library that uses the Pro references only
-		       return true;
-        extension = ".esriAddinX";
-      }
-
-      var addInXML = Path.Combine(ProjectDir, config);
-      if (!File.Exists(addInXML))
-      {
-        Log.LogError(ConfigNotFound, config);
-        return false;
-      }
-
-      //Get the add-in id
-      XDocument xdoc = XDocument.Load(addInXML);
-      XNamespace DefaultNS = "http://schemas.esri.com/DADF/Registry";
-      if (PackageType.ToLower() == "plugin")
-      {
-        Log.LogMessage("process plugin");
-        var addInID = xdoc.Root.Element(DefaultNS + "AddInID");
-        CleanInfo = addInID.Value;//let it error if it's missing
-      }
-      else if (PackageType.ToLower() == "addin")
-      {
-        Log.LogMessage("process addin");
-        var addinInfo = xdoc.Root.Element(DefaultNS + "AddInInfo");
-        CleanInfo = addinInfo.Attribute("id").Value;//let it error if it's missing
-      }
-      else
-      {
-        Log.LogMessage("process configuration");
-        CleanInfo = AssemblyName + extension;
-      }
-      Success = true;
-	]]>
-      </Code>
-    </Task>
-  </UsingTask>
-  <!-- Define additional BuildAction option -->
-  <!-- Set up default zip properties -->
-  <PropertyGroup>
-    <PackageType Condition="'$(PackageType)' == ''">Addin</PackageType>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ArcGISFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\ESRI\ArcGISPro', 'InstallDir', null, RegistryView.Registry64))\bin</ArcGISFolder>
-    <ArcGISFolder Condition="'$(ArcGISFolder)' == ''">$(registry:HKEY_CURRENT_USER\SOFTWARE\ESRI\ArcGISPro@InstallDir)\bin</ArcGISFolder>
-    <ArcGISFolder Condition="'$(ArcGISFolder)' == '' Or !Exists('$(ArcGISFolder)\RegisterAddIn.exe')">$(ProgramData)\EsriProCommon\</ArcGISFolder>
-  </PropertyGroup>
-  <Target Name="ArcGISInstallOutput" AfterTargets="Build">
-    <Message Text="IntermediateOutputPath Name: $(IntermediateOutputPath)..." Importance="High"/>
-    <Message Text="CleanFile Name: $(CleanFile)..." Importance="High"/>
-    <Message Text="ProjectDir Name: $(ProjectDir)..." Importance="High"/>
-    <Message Text="AssemblyName Name: $(AssemblyName)..." Importance="High"/>
-    <Message Text="TargetFileName Name: $(TargetFileName)..." Importance="High"/>
-    <Message Text="RootNamespace: $(RootNamespace)..." Importance="High"/>
-    <Message Text="TargetFolder Name: $(OutDir)..." Importance="High"/>
-    <Message Text="PackageType Name: $(PackageType)..." Importance="High"/>
-    <Message Text="Install dir: $(ArcGISFolder)" Importance="High"/>
-    <!-- Get a list of project outputs from the cache file and FileWritesXXX item, 
-         excluding those in intermediate output directory  -->
-    <!-- Note clean file may miss listing CopyLocal reference -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)$(CleanFile)">
-      <Output TaskParameter="Lines" ItemName="CacheOutputFiles" />
-    </ReadLinesFromFile>
-    <FindUnderPath Files="@(CacheOutputFiles)" Path="$(OutDir)">
-      <Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
-    </FindUnderPath>
-    <FindUnderPath Files="@(FileWrites->'%(FullPath)')" Path="$(OutDir)">
-      <Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
-    </FindUnderPath>
-    <FindUnderPath Files="@(FileWritesShareable->'%(FullPath)')" Path="$(OutDir)">
-      <Output TaskParameter="InPath" ItemName="PackageOutputFiles" />
-    </FindUnderPath>
-    <RemoveDuplicates Inputs="@(PackageOutputFiles)">
-      <Output TaskParameter="Filtered" ItemName="FilteredPackageOutputFiles" />
-    </RemoveDuplicates>
-    <ConvertToRelativePath Paths="@(FilteredPackageOutputFiles)" RelativeTo="$(TargetDir)">
-      <Output TaskParameter="RelativePaths" ItemName="ConfigBinaries" />
-    </ConvertToRelativePath>
-    <Message Text="ConvertToRelativePath Task, TargetDir: $(TargetDir) " Importance="High"/>
-  </Target>
-  <Target Name="PackageArcGISContents" AfterTargets="ArcGISInstallOutput">
-    <Message Text="Running PackageArcGISContents..." Importance="High"/>
-    <RemoveDir Condition="Exists('$(ZipIntermediatePath)')" Directories="$(ZipIntermediatePath)" />
-    <Message Text="ZipIntermediatePath: $(ZipIntermediatePath)Install..." Importance="High"/>
-    <!-- Copy project output files, preserving folder structure -->
-    <Copy SourceFiles="@(ConfigBinaries->'$(OutDir)%(Identity)')" ContinueOnError="true" DestinationFolder="$(IntermediateOutputPath)temp_archive\Install\%(RelativeDir)" />
-    <!-- Copy items marked with Content as BuildAction, preserving folder structure & handling linked items -->
-    <!-- Only include items that have CopyToOutputDirectory as Never -->
-    <Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' == '' And ('%(Content.CopyToOutputDirectory)' == 'Never' Or '%(Content.CopyToOutputDirectory)' == '')" DestinationFolder="$(IntermediateOutputPath)temp_archive\%(RelativeDir)" ContinueOnError="true" />
-    <Copy SourceFiles="@(Content)" Condition="'%(Content.Link)' != '' And ('%(Content.CopyToOutputDirectory)' == 'Never' Or '%(Content.CopyToOutputDirectory)' == '')" DestinationFiles="$(IntermediateOutputPath)temp_archive\%(Content.Link)" ContinueOnError="true"/>
-    <!-- Zipping up add-in resources -->
-    <PackageAddIn ZipIntermediatePath="$(IntermediateOutputPath)temp_archive\"
-                  PackageType="$(PackageType)"
-                  TargetFolder="$(OutDir)"
-                  TargetFileName="$(TargetFileName)"
-                  RootNamespace="$(RootNamespace)">
-      <Output TaskParameter="PackageOutputPath" PropertyName="PackageFile" />
-    </PackageAddIn>
-    <!-- Shell out to RegisterAddIn.exe to install the package -->
-    <Message Text="Deploying $(PackageType)..." Importance="High"/>
-    <Message Text="ArcGISFolder Name: $(ArcGISFolder)..." Importance="High"/>
-    <Message Text="Unable to execute RegisterAddIn.exe. ArcGIS Pro is not installed." Importance="High" Condition="!Exists('$(ArcGISFolder)')"/>
-    <Message Text="Execute RegisterAddIn.exe &quot;$(PackageFile)&quot; /s..." Importance="High" Condition="Exists('$(ArcGISFolder)')"/>
-    <Exec IgnoreExitCode="true" WorkingDirectory="$(ArcGISFolder)" Command="RegisterAddIn.exe &quot;$(PackageFile)&quot; /s" Condition="Exists('$(ArcGISFolder)') AND $(PackageFile) != '' ">
-      <Output TaskParameter="ExitCode" PropertyName="ESRIRegAddinExitCode" />
-    </Exec>
-    <RemoveDir Condition="Exists('$(ZipIntermediatePath)')" Directories="$(ZipIntermediatePath)" />
-  </Target>
-  <Target Name="CleanArcGISContents" AfterTargets="Clean">
-    <CleanAddIn ProjectDir="$(ProjectDir)"
-                AssemblyName="$(AssemblyName)"
-                PackageType="$(PackageType)">
-      <Output TaskParameter="CleanInfo" PropertyName="CleanInfo" />
-    </CleanAddIn>
-    <Message Text="Clean $(PackageType).$(ArcGISFolder).." Importance="High"/>
-    <Message Text="Execute RegisterAddIn.exe &quot;$(CleanInfo)&quot; /u..." Importance="High" Condition="Exists('$(ArcGISFolder)')"/>
-    <Message Text="Unable to execute RegisterAddIn.exe. ArcGIS Pro is not installed." Importance="High" Condition="!Exists('$(ArcGISFolder)')"/>
-    <Exec IgnoreExitCode="true" WorkingDirectory="$(ArcGISFolder)" Command="RegisterAddIn.exe &quot;$(CleanInfo)&quot; /u /s" Condition="Exists('$(ArcGISFolder)') AND $(CleanInfo) != ''">
-      <Output TaskParameter="ExitCode" PropertyName="ESRIRegAddinExitCode" />
-    </Exec>
-  </Target>
-</Project>

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Filters/ArcGISSelectionFilter.cs

@@ -1,13 +0,0 @@
-using Speckle.Connectors.DUI.Models.Card.SendFilter;
-
-namespace Speckle.Connectors.ArcGIS.Filters;
-
-public class ArcGISSelectionFilter : DirectSelectionSendFilter
-{
-  public ArcGISSelectionFilter()
-  {
-    IsDefault = true;
-  }
-
-  public override List<string> RefreshObjectIds() => SelectedObjectIds;
-}

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/GlobalUsing.cs

@@ -1,3 +0,0 @@
-global using AC = ArcGIS.Core;
-global using ACD = ArcGIS.Core.Data;
-global using ADM = ArcGIS.Desktop.Mapping;

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

@@ -1,265 +0,0 @@
-using System.Drawing;
-using ArcGIS.Core.CIM;
-using ArcGIS.Desktop.Mapping;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.ArcGIS3.Utils;
-using Speckle.Objects;
-using Speckle.Objects.Other;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Extensions;
-using Speckle.Sdk.Models.GraphTraversal;
-using Speckle.Sdk.Models.Proxies;
-
-namespace Speckle.Connectors.ArcGIS.HostApp;
-
-/// <summary>
-/// TODO: definitely need to refactor this, probably will collect colors during layer iteration in the root object builder.
-/// </summary>
-public class ArcGISColorManager
-{
-  public Dictionary<string, Color> ObjectColorsIdMap { get; set; } = new();
-  public Dictionary<string, Color> ObjectMaterialsIdMap { get; set; } = new();
-
-  /// <summary>
-  /// Parse Color Proxies and stores in ObjectColorsIdMap the relationship between object ids and colors
-  /// </summary>
-  /// <param name="colorProxies"></param>
-  /// <param name="onOperationProgressed"></param>
-  public void ParseColors(List<ColorProxy> colorProxies, IProgress<CardProgress> onOperationProgressed)
-  {
-    // injected as Singleton, so we need to clean existing proxies first
-    ObjectColorsIdMap = new();
-    var count = 0;
-    foreach (ColorProxy colorProxy in colorProxies)
-    {
-      onOperationProgressed.Report(new("Converting colors", (double)++count / colorProxies.Count));
-      foreach (string objectId in colorProxy.objects)
-      {
-        Color convertedColor = Color.FromArgb(colorProxy.value);
-        ObjectColorsIdMap.TryAdd(objectId, convertedColor);
-      }
-    }
-  }
-
-  /// <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, IProgress<CardProgress> onOperationProgressed)
-  {
-    // injected as Singleton, so we need to clean existing proxies first
-    ObjectMaterialsIdMap = new();
-    var count = 0;
-    foreach (RenderMaterialProxy colorProxy in materialProxies)
-    {
-      onOperationProgressed.Report(new("Converting materials", (double)++count / materialProxies.Count));
-      foreach (string objectId in colorProxy.objects)
-      {
-        Color convertedColor = Color.FromArgb(colorProxy.value.diffuse);
-        ObjectMaterialsIdMap.TryAdd(objectId, convertedColor);
-      }
-    }
-  }
-
-  public int CIMColorToInt(CIMColor color)
-  {
-    return (255 << 24)
-      | ((int)Math.Round(color.Values[0]) << 16)
-      | ((int)Math.Round(color.Values[1]) << 8)
-      | (int)Math.Round(color.Values[2]);
-  }
-
-  /// <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
-  )
-  {
-    // declare default white color
-    Color color = Color.FromArgb(255, 255, 255, 255);
-    bool colorFound = false;
-
-    // get color moving upwards from the object
-    foreach (var parent in tc.GetAscendants())
-    {
-      if (parent.applicationId is string appId)
-      {
-        if (ObjectMaterialsIdMap.TryGetValue(appId, out Color objColorMaterial))
-        {
-          color = objColorMaterial;
-          colorFound = true;
-          break;
-        }
-        if (ObjectColorsIdMap.TryGetValue(appId, out Color objColor))
-        {
-          color = objColor;
-          colorFound = true;
-          break;
-        }
-      }
-    }
-
-    // handling Revit case, where child objects have separate colors/materials
-    if (!colorFound && tc.Current is IDataObject)
-    {
-      var displayable = tc.Current.TryGetDisplayValue();
-      if (displayable != null)
-      {
-        foreach (var childObj in displayable)
-        {
-          if (childObj.applicationId is string appId)
-          {
-            if (ObjectMaterialsIdMap.TryGetValue(appId, out Color objColorMaterial))
-            {
-              color = objColorMaterial;
-              break;
-            }
-            if (ObjectColorsIdMap.TryGetValue(appId, out Color objColor))
-            {
-              color = objColor;
-              break;
-            }
-          }
-        }
-      }
-    }
-
-    CIMSymbolReference symbol = CreateSymbol(speckleGeometryType, color);
-
-    // First create a "CIMUniqueValueClass"
-    List<CIMUniqueValue> listUniqueValues = new() { new CIMUniqueValue { FieldValues = new string[] { uniqueLabel } } };
-
-    CIMUniqueValueClass newUniqueValueClass =
-      new()
-      {
-        Editable = true,
-        Label = uniqueLabel,
-        Patch = PatchShape.Default,
-        Symbol = symbol,
-        Visible = true,
-        Values = listUniqueValues.ToArray()
-      };
-    return newUniqueValueClass;
-  }
-
-  /// <summary>
-  /// Create a Symbol from GeometryType and Color
-  /// </summary>
-  /// <param name="speckleGeometryType"></param>
-  /// <param name="color"></param>
-  private CIMSymbolReference CreateSymbol(esriGeometryType speckleGeometryType, Color color)
-  {
-    var symbol = SymbolFactory
-      .Instance.ConstructPointSymbol(ColorFactory.Instance.CreateColor(color))
-      .MakeSymbolReference();
-
-    switch (speckleGeometryType)
-    {
-      case esriGeometryType.esriGeometryLine:
-      case esriGeometryType.esriGeometryPolyline:
-        symbol = SymbolFactory
-          .Instance.ConstructLineSymbol(ColorFactory.Instance.CreateColor(color))
-          .MakeSymbolReference();
-        break;
-      case esriGeometryType.esriGeometryPolygon:
-      case esriGeometryType.esriGeometryMultiPatch:
-        symbol = SymbolFactory
-          .Instance.ConstructPolygonSymbol(ColorFactory.Instance.CreateColor(color))
-          .MakeSymbolReference();
-        break;
-    }
-
-    return symbol;
-  }
-
-  /// <summary>
-  /// Add CIMUniqueValueClass to Layer Renderer (if exists); apply Renderer to Layer (again)
-  /// </summary>
-  /// <param name="tc"></param>
-  /// <param name="trackerItem"></param>
-  public CIMUniqueValueRenderer? CreateOrEditLayerRenderer(
-    TraversalContext tc,
-    ObjectConversionTracker trackerItem,
-    CIMRenderer? existingRenderer
-  )
-  {
-    if (trackerItem.HostAppMapMember is not FeatureLayer fLayer)
-    {
-      // do nothing with non-feature layers
-      return null;
-    }
-
-    // declare default grey color, create default symbol for the given layer geometry type
-    var color = Color.FromArgb(CIMColorToInt(ColorFactory.Instance.GreyRGB));
-    CIMSymbolReference defaultSymbol = CreateSymbol(fLayer.ShapeType, color);
-
-    // get existing renderer classes
-    List<CIMUniqueValueClass> listUniqueValueClasses = new() { };
-    if (existingRenderer is CIMUniqueValueRenderer uniqueRenderer)
-    {
-      if (uniqueRenderer.Groups[0].Classes != null)
-      {
-        listUniqueValueClasses.AddRange(uniqueRenderer.Groups[0].Classes.ToList());
-      }
-    }
-
-    // Add new CIMUniqueValueClass (or multiple, if it's a Collection with elements, e.g. VectorLayer)
-    List<TraversalContext> traversalContexts = new();
-    if (tc.Current is Collection collection)
-    {
-      foreach (var element in collection.elements)
-      {
-        TraversalContext newTc = new(element, "elements", tc);
-        traversalContexts.Add(newTc);
-      }
-    }
-    else
-    {
-      traversalContexts.Add(tc);
-    }
-
-    foreach (var tContext in traversalContexts)
-    {
-      // get unique label
-      string? uniqueLabel = tContext.Current?.id;
-
-      // remove any GIS-specific classes for now
-      /*
-      if (tContext.Current is IGisFeature gisFeat)
-      {
-        var existingLabel = gisFeat.attributes["Speckle_ID"];
-        if (existingLabel is string stringLabel)
-        {
-          uniqueLabel = stringLabel;
-        }
-      }*/
-
-      if (uniqueLabel is not null && !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" };
-    List<CIMUniqueValueGroup> listUniqueValueGroups = new() { uvg };
-    // Create the CIMUniqueValueRenderer
-    CIMUniqueValueRenderer uvr =
-      new()
-      {
-        UseDefaultSymbol = true,
-        DefaultLabel = "all other values",
-        DefaultSymbol = defaultSymbol,
-        Groups = listUniqueValueGroups.ToArray(),
-        Fields = new string[] { "Speckle_ID" }
-      };
-    return uvr;
-  }
-}

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

@@ -1,461 +0,0 @@
-using ArcGIS.Desktop.Mapping;
-using Speckle.Sdk.Models.Proxies;
-
-namespace Speckle.Connectors.ArcGIS.HostApp;
-
-public class ArcGISColorUnpacker
-{
-  /// <summary>
-  /// Cache of all color proxies for converted features. Key is the Color proxy argb value.
-  /// </summary>
-  public Dictionary<int, ColorProxy> ColorProxyCache { get; } = new();
-
-  /// <summary>
-  /// Stores the current renderer (determined by mapMember)
-  /// </summary>
-  private AC.CIM.CIMRenderer? StoredRenderer { get; set; }
-
-  /// <summary>
-  /// Stores the current renderer (determined by tin mapmember)
-  /// </summary>
-  private AC.CIM.CIMTinRenderer? StoredTinRenderer { get; set; }
-
-  /// <summary>
-  /// Stores the used renderer fields from the layer
-  /// </summary>
-  private List<string> StoredRendererFields { get; set; }
-
-  /// <summary>
-  /// Stores an already processed color for current mapMember, to dbe used by all mapMember objects. Only applies to simple type renderers
-  /// </summary>
-  private int? StoredColor { get; set; }
-
-  /// <summary>
-  /// Stores a feature layer renderer to be used by <see cref="ProcessFeatureLayerColor"/> in <see cref="StoredRenderer"/>, any fields used by the renderer from the layer, and resets the <see cref="StoredColor"/> and <see cref="StoredRendererFields"/>
-  /// </summary>
-  /// <param name="featureLayer"></param>
-  /// <exception cref="AC.CalledOnWrongThreadException">Must be called on MCT.</exception>
-  public void StoreRendererAndFields(ADM.FeatureLayer featureLayer)
-  {
-    // field names are unique, but often their alias is used instead by renderer headings
-    // so we are storing both names and alias in this dictionary for fast lookup
-    // POC: adding aliases are not optimal, because they do not need to be unique && they can be the same as the name of another field
-    Dictionary<string, string> layerFieldDictionary = new();
-    foreach (ADM.FieldDescription field in featureLayer.GetFieldDescriptions())
-    {
-      layerFieldDictionary.TryAdd(field.Name, field.Name);
-      layerFieldDictionary.TryAdd(field.Alias, field.Name);
-    }
-
-    // clear stored values
-    StoredRendererFields = new();
-    StoredColor = null;
-    StoredRenderer = null;
-
-    AC.CIM.CIMRenderer layerRenderer = featureLayer.GetRenderer();
-    List<string> fields = new();
-    bool isSupported = false;
-    switch (layerRenderer)
-    {
-      case AC.CIM.CIMSimpleRenderer:
-        isSupported = true;
-        break;
-      case AC.CIM.CIMUniqueValueRenderer uniqueValueRenderer:
-        isSupported = true;
-        fields = uniqueValueRenderer.Fields.ToList();
-        break;
-      case AC.CIM.CIMClassBreaksRenderer classBreaksRenderer:
-        isSupported = true;
-        fields.Add(classBreaksRenderer.Field);
-        break;
-      default:
-        // TODO: log error here that a renderer is unsupported
-        break;
-    }
-
-    if (isSupported)
-    {
-      StoredRenderer = layerRenderer;
-      foreach (string field in fields)
-      {
-        if (layerFieldDictionary.TryGetValue(field, out string? fieldName))
-        {
-          StoredRendererFields.Add(fieldName);
-        }
-      }
-    }
-  }
-
-  /// <summary>
-  /// Stores a las layer renderer to be used by <see cref="ProcessLasLayerColor"/> in <see cref="StoredTinRenderer"/>
-  /// </summary>
-  /// <param name="lasLayer"></param>
-  /// <exception cref="AC.CalledOnWrongThreadException">Must be called on MCT.</exception>
-  public void StoreRenderer(ADM.LasDatasetLayer lasLayer)
-  {
-    // clear stored values
-    StoredTinRenderer = null;
-
-    // POC: not sure why we are only using the first renderer here
-    AC.CIM.CIMTinRenderer layerRenderer = lasLayer.GetRenderers()[0];
-    bool isSupported = false;
-    switch (layerRenderer)
-    {
-      case AC.CIM.CIMTinUniqueValueRenderer:
-        isSupported = true;
-        break;
-      default:
-        // TODO: log error here that a renderer is unsupported
-        break;
-    }
-
-    if (isSupported)
-    {
-      StoredTinRenderer = layerRenderer;
-    }
-  }
-
-  /// <summary>
-  /// Processes a las layer's point color by the stored <see cref="StoredRenderer"/>, and stores the point's id and color proxy to the <see cref="ColorProxyCache"/>.
-  /// POC: logic probably can be combined with ProcessFeatureLayerColor.
-  /// </summary>
-  /// <param name="point"></param>
-  public void ProcessLasLayerColor(ACD.Analyst3D.LasPoint point, string pointApplicationId)
-  {
-    // get the color from the renderer and point
-    AC.CIM.CIMColor? color;
-    switch (StoredTinRenderer)
-    {
-      case AC.CIM.CIMTinUniqueValueRenderer uniqueValueRenderer:
-        color = GetPointColorByUniqueValueRenderer(uniqueValueRenderer, point);
-        break;
-
-      default:
-        return;
-    }
-
-    // get or create the color proxy for the point
-    int argb = CIMColorToInt(color ?? point.RGBColor);
-    AddObjectIdToColorProxyCache(pointApplicationId, argb);
-  }
-
-  // Retrieves the las point color from a unique value renderer
-  // unique renderers have groups of conditions that may affect the color of a feature
-  // resulting in a different color than the default renderer symbol color
-  private AC.CIM.CIMColor? GetPointColorByUniqueValueRenderer(
-    AC.CIM.CIMTinUniqueValueRenderer renderer,
-    ACD.Analyst3D.LasPoint point
-  )
-  {
-    foreach (AC.CIM.CIMUniqueValueGroup group in renderer.Groups)
-    {
-      foreach (AC.CIM.CIMUniqueValueClass groupClass in group.Classes)
-      {
-        foreach (AC.CIM.CIMUniqueValue value in groupClass.Values)
-        {
-          // all field values have to match the row values
-          for (int i = 0; i < value.FieldValues.Length; i++)
-          {
-            string groupValue = value.FieldValues[i].Replace("<Null>", "");
-            object? pointValue = point.ClassCode;
-
-            if (ValuesAreEqual(groupValue, pointValue))
-            {
-              return groupClass.Symbol.Symbol.GetColor();
-            }
-          }
-        }
-      }
-    }
-
-    return null;
-  }
-
-  /// <summary>
-  /// Processes a feature layer's row color by the stored <see cref="StoredRenderer"/>, and stores the row's id and color proxy to the <see cref="ColorProxyCache"/>.
-  /// </summary>
-  /// <param name="row"></param>
-  /// <returns></returns>
-  /// <exception cref="ACD.Exceptions.GeodatabaseException"></exception>
-  public void ProcessFeatureLayerColor(ACD.Row row, string rowApplicationId)
-  {
-    // if stored color is not null, this means the renderer was a simple renderer that applies to the entire layer, and was already created.
-    // just add the row application id to the color proxy.
-    if (StoredColor is int existingColorProxyId)
-    {
-      AddObjectIdToColorProxyCache(rowApplicationId, existingColorProxyId);
-      return;
-    }
-
-    // get the color from the renderer and row
-    AC.CIM.CIMColor? color = null;
-    switch (StoredRenderer)
-    {
-      // simple renderers do not rely on fields, so the color can be retrieved from the renderer directly
-      case AC.CIM.CIMSimpleRenderer simpleRenderer:
-        color = simpleRenderer.Symbol.Symbol.GetColor();
-        break;
-
-      case AC.CIM.CIMUniqueValueRenderer uniqueValueRenderer:
-        color = GetRowColorByUniqueValueRenderer(uniqueValueRenderer, row);
-        break;
-
-      case AC.CIM.CIMClassBreaksRenderer classBreaksRenderer:
-        color = GetRowColorByClassBreaksRenderer(classBreaksRenderer, row);
-        break;
-    }
-
-    if (color is null)
-    {
-      // TODO: log error or throw exception that color could not be retrieved
-      return;
-    }
-
-    // get or create the color proxy for the row
-    int argb = CIMColorToInt(color);
-    AddObjectIdToColorProxyCache(rowApplicationId, argb);
-
-    // store color if from simple renderer
-    if (StoredRenderer is AC.CIM.CIMSimpleRenderer)
-    {
-      StoredColor = argb;
-    }
-  }
-
-  // Retrieves the row color from a class breaks renderer
-  // unique renderers have groups of conditions that may affect the color of a feature
-  // resulting in a different color than the default renderer symbol color
-  private AC.CIM.CIMColor? GetRowColorByClassBreaksRenderer(AC.CIM.CIMClassBreaksRenderer renderer, ACD.Row row)
-  {
-    AC.CIM.CIMColor? color = null;
-
-    // get the default symbol color
-    if (renderer.DefaultSymbol?.Symbol.GetColor() is AC.CIM.CIMColor defaultColor)
-    {
-      color = defaultColor;
-    }
-
-    // get the first stored field, since this renderer should only have 1 field
-    double storedFieldValue = Convert.ToDouble(row[StoredRendererFields.First()]);
-
-    List<AC.CIM.CIMClassBreak> reversedBreaks = new(renderer.Breaks);
-    reversedBreaks.Reverse();
-    foreach (var rBreak in reversedBreaks)
-    {
-      // keep looping until the last matching condition
-      if (storedFieldValue <= rBreak.UpperBound)
-      {
-        if (rBreak.Symbol.Symbol.GetColor() is AC.CIM.CIMColor breakColor)
-        {
-          color = breakColor;
-        }
-        else
-        {
-          // TODO: log error here, could not retrieve break color from symbol
-        }
-      }
-    }
-
-    return color;
-  }
-
-  // Retrieves the row color from a unique value renderer
-  // unique renderers have groups of conditions that may affect the color of a feature
-  // resulting in a different color than the default renderer symbol color
-  private AC.CIM.CIMColor? GetRowColorByUniqueValueRenderer(AC.CIM.CIMUniqueValueRenderer renderer, ACD.Row row)
-  {
-    AC.CIM.CIMColor? color = null;
-
-    // get the default symbol color
-    if (renderer.DefaultSymbol?.Symbol.GetColor() is AC.CIM.CIMColor defaultColor)
-    {
-      color = defaultColor;
-    }
-
-    // note: usually there is only 1 group
-    foreach (AC.CIM.CIMUniqueValueGroup group in renderer.Groups)
-    {
-      // loop through all values in groups to see if any have met conditions that result in a different color
-      foreach (AC.CIM.CIMUniqueValueClass groupClass in group.Classes)
-      {
-        bool groupConditionsMet = true;
-        foreach (AC.CIM.CIMUniqueValue value in groupClass.Values)
-        {
-          // all field values have to match the row values
-          for (int i = 0; i < StoredRendererFields.Count; i++)
-          {
-            string groupValue = value.FieldValues[i];
-            object? rowValue = row[StoredRendererFields[i]];
-
-            if (!ValuesAreEqual(groupValue, rowValue))
-            {
-              groupConditionsMet = false;
-              break;
-            }
-          }
-        }
-
-        // set the group color to class symbol color if conditions are met
-        if (groupConditionsMet)
-        {
-          if (groupClass.Symbol.Symbol.GetColor() is AC.CIM.CIMColor groupColor)
-          {
-            color = groupColor;
-          }
-          else
-          {
-            // TODO: log error here, could not retrieve group color from symbol
-          }
-        }
-      }
-    }
-
-    return color;
-  }
-
-  /// <summary>
-  /// Compares the label string of a UniqueValueRenderer (groupValue), and an object value (row, las point), to determine if they are equal
-  /// </summary>
-  /// <param name="objectValue"></param>
-  /// <param name="groupValue"></param>
-  private bool ValuesAreEqual(string groupValue, object? objectValue)
-  {
-    switch (objectValue)
-    {
-      case int:
-      case short:
-      case long:
-      case byte:
-        string objectValueString = Convert.ToString(objectValue) ?? "";
-        return groupValue.Equals(objectValueString);
-
-      case string:
-        return groupValue.Equals(objectValue);
-
-      // POC: these are tricky to compare with the label strings accurately, so will trim both values to 5 decimal places.
-      case double d:
-        return double.TryParse(groupValue, out double groupDouble) && groupDouble - d < 0.000001;
-      case float f:
-        return float.TryParse(groupValue, out float groupFloat) && groupFloat - f < 0.000001;
-
-      default:
-        return false;
-    }
-  }
-
-  private void AddObjectIdToColorProxyCache(string objectId, int argb)
-  {
-    if (ColorProxyCache.TryGetValue(argb, out ColorProxy? colorProxy))
-    {
-      colorProxy.objects.Add(objectId);
-    }
-    else
-    {
-      ColorProxy newColorProxy =
-        new()
-        {
-          name = argb.ToString(),
-          objects = new() { objectId },
-          value = argb,
-          applicationId = argb.ToString()
-        };
-
-      ColorProxyCache.Add(argb, newColorProxy);
-    }
-  }
-
-  private int ArgbToInt(int a, int r, int g, int b)
-  {
-    return (a << 24) | (r << 16) | (g << 8) | b;
-  }
-
-  // Gets the argb int from a CIMColor
-  // Defaults to assuming CIMColor.Values represent the red, green, and blue channels.
-  private int CIMColorToInt(AC.CIM.CIMColor color)
-  {
-    switch (color)
-    {
-      case AC.CIM.CIMHSVColor hsv:
-        (float hsvR, float hsvG, float hsvB) = RgbFromHsv(hsv.H, hsv.S, hsv.V);
-        return ArgbToInt(
-          (int)Math.Round(hsv.Alpha),
-          (int)Math.Round(hsvR * 255),
-          (int)Math.Round(hsvG * 255),
-          (int)Math.Round(hsvB * 255)
-        );
-
-      case AC.CIM.CIMCMYKColor cmyk:
-        float k = cmyk.K;
-        int cmykR = Convert.ToInt32(255 * (1 - cmyk.C) * (1 - k));
-        int cmykG = Convert.ToInt32(255 * (1 - cmyk.M) * (1 - k));
-        int cmykB = Convert.ToInt32(255 * (1 - cmyk.Y) * (1 - k));
-        return ArgbToInt((int)Math.Round(cmyk.Alpha), cmykR, cmykG, cmykB);
-
-      default:
-        return ArgbToInt(
-          (int)Math.Round(color.Alpha),
-          (int)Math.Round(color.Values[0]),
-          (int)Math.Round(color.Values[1]),
-          (int)Math.Round(color.Values[2])
-        );
-    }
-  }
-
-  private (float, float, float) RgbFromHsv(float hue, float saturation, float value)
-  {
-    // Translates HSV color to RGB color
-    // H: 0.0 - 360.0, S: 0.0 - 100.0, V: 0.0 - 100.0
-    // R, G, B: 0.0 - 1.0
-
-    float c = (value / 100) * (saturation / 100);
-    float x = c * (1 - Math.Abs(((hue / 60) % 2) - 1));
-    float m = (value / 100) - c;
-
-    float r = 0;
-    float g = 0;
-    float b = 0;
-
-    if (hue >= 0 && hue < 60)
-    {
-      r = c;
-      g = x;
-      b = 0;
-    }
-    else if (hue >= 60 && hue < 120)
-    {
-      r = x;
-      g = c;
-      b = 0;
-    }
-    else if (hue >= 120 && hue < 180)
-    {
-      r = 0;
-      g = c;
-      b = x;
-    }
-    else if (hue >= 180 && hue < 240)
-    {
-      r = 0;
-      g = x;
-      b = c;
-    }
-    else if (hue >= 240 && hue < 300)
-    {
-      r = x;
-      g = 0;
-      b = c;
-    }
-    else if (hue >= 300 && hue < 360)
-    {
-      r = c;
-      g = 0;
-      b = x;
-    }
-
-    r += m;
-    g += m;
-    b += m;
-
-    return (r, g, b);
-  }
-}

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

@@ -1,97 +0,0 @@
-using Speckle.Connectors.ArcGIS.HostApp.Extensions;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.ArcGIS.HostApp;
-
-public class ArcGISLayerUnpacker
-{
-  /// <summary>
-  /// Cache of all collections created by unpacked Layer MapMembers. Key is the Speckle applicationId (Layer URI).
-  /// </summary>
-  public Dictionary<string, Collection> CollectionCache { get; } = new();
-
-  /// <summary>
-  /// Mapmembers can be layers containing objects, or LayerContainers containing other layers.
-  /// Unpacks selected mapMembers and creates their corresponding collection on the root collection.
-  /// </summary>
-  /// <param name="mapMembers"></param>
-  /// <param name="parentCollection"></param>
-  /// <returns>List of layers containing objects.</returns>
-  /// <exception cref="AC.CalledOnWrongThreadException">Thrown when this method is *not* called on the MCT, because this method accesses mapmember fields</exception>
-  public List<ADM.MapMember> UnpackSelection(
-    IEnumerable<ADM.MapMember> mapMembers,
-    Collection parentCollection,
-    List<ADM.MapMember>? objects = null
-  )
-  {
-    if (objects is null)
-    {
-      objects = new();
-    }
-
-    foreach (ADM.MapMember mapMember in mapMembers)
-    {
-      switch (mapMember)
-      {
-        case ADM.ILayerContainer container:
-          Collection containerCollection = CreateAndCacheMapMemberCollection(mapMember, true);
-          parentCollection.elements.Add(containerCollection);
-
-          UnpackSelection(container.Layers, containerCollection, objects);
-          break;
-
-        default:
-          if (!(objects.Contains(mapMember)))
-          {
-            Collection collection = CreateAndCacheMapMemberCollection(mapMember);
-            parentCollection.elements.Add(collection);
-            objects.Add(mapMember);
-          }
-          break;
-      }
-    }
-
-    return objects;
-  }
-
-  private Collection CreateAndCacheMapMemberCollection(ADM.MapMember mapMember, bool isLayerContainer = false)
-  {
-    string mapMemberApplicationId = mapMember.GetSpeckleApplicationId();
-    Collection collection =
-      new()
-      {
-        name = mapMember.Name,
-        applicationId = mapMemberApplicationId,
-        ["type"] = mapMember.GetType().Name
-      };
-
-    switch (mapMember)
-    {
-      case ADM.IDisplayTable displayTable: // get fields from layers that implement IDisplayTable, eg FeatureLayer or StandaloneTable
-        Dictionary<string, string>? fields = displayTable
-          .GetFieldDescriptions()
-          .ToDictionary(field => field.Name, field => field.Type.ToString());
-        collection["fields"] = fields;
-        if (mapMember is ADM.BasicFeatureLayer basicFeatureLayer)
-        {
-          collection["shapeType"] = basicFeatureLayer.ShapeType.ToString();
-        }
-        break;
-
-      case ADM.Layer layer:
-        collection["mapLayerType"] = layer.MapLayerType.ToString();
-        break;
-
-      case ADM.ILayerContainer:
-      default:
-        break;
-    }
-
-    if (!isLayerContainer) // do not cache layer containers, since these won't contain any objects
-    {
-      CollectionCache.Add(mapMemberApplicationId, collection);
-    }
-
-    return collection;
-  }
-}

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/HostApp/Extensions/SpeckleApplicationIdExtensions.cs

@@ -1,31 +0,0 @@
-using ArcGIS.Core.Data.Raster;
-
-namespace Speckle.Connectors.ArcGIS.HostApp.Extensions;
-
-public static class SpeckleApplicationIdExtensions
-{
-  /// <summary>
-  /// Retrieves the Speckle application id for map members
-  /// </summary>
-  public static string GetSpeckleApplicationId(this ADM.MapMember mapMember) => mapMember.URI;
-
-  /// <summary>
-  /// Constructs the Speckle application id for Features as a concatenation of the layer URI (applicationId)
-  /// and the row OID (index of row in layer).
-  /// </summary>
-  /// <exception cref="ACD.Exceptions.GeodatabaseException">Throws when this is *not* called on MCT. Use QueuedTask.Run.</exception>
-  public static string GetSpeckleApplicationId(this ACD.Row row, string layerApplicationId) =>
-    $"{layerApplicationId}_{row.GetObjectID()}";
-
-  /// <summary>
-  /// Constructs the Speckle application id for Raster as a concatenation of the layer URI (applicationId) and 0-index
-  /// </summary>
-  public static string GetSpeckleApplicationId(this Raster _, string layerApplicationId) => $"{layerApplicationId}_0";
-
-  /// <summary>
-  /// Constructs the Speckle application id for LasDatasets as a concatenation of the layer URI (applicationId)
-  /// and point OID.
-  /// </summary>
-  public static string GetSpeckleApplicationId(this ACD.Analyst3D.LasPoint point, string layerApplicationId) =>
-    $"{layerApplicationId}_{point.PointID}";
-}

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

@@ -1,411 +0,0 @@
-using System.Diagnostics.Contracts;
-using ArcGIS.Core.CIM;
-using ArcGIS.Core.Geometry;
-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.Converters.ArcGIS3;
-using Speckle.Converters.ArcGIS3.Utils;
-using Speckle.Converters.Common;
-using Speckle.Objects.Data;
-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;
-
-namespace Speckle.Connectors.ArcGIS.Operations.Receive;
-
-public class ArcGISHostObjectBuilder : IHostObjectBuilder
-{
-  private readonly IRootToHostConverter _converter;
-  private readonly IFeatureClassUtils _featureClassUtils;
-  private readonly ILocalToGlobalUnpacker _localToGlobalUnpacker;
-  private readonly LocalToGlobalConverterUtils _localToGlobalConverterUtils;
-
-  // POC: figure out the correct scope to only initialize on Receive
-  private readonly IConverterSettingsStore<ArcGISConversionSettings> _settingsStore;
-  private readonly GraphTraversal _traverseFunction;
-  private readonly ArcGISColorManager _colorManager;
-
-  public ArcGISHostObjectBuilder(
-    IRootToHostConverter converter,
-    IConverterSettingsStore<ArcGISConversionSettings> settingsStore,
-    IFeatureClassUtils featureClassUtils,
-    ILocalToGlobalUnpacker localToGlobalUnpacker,
-    LocalToGlobalConverterUtils localToGlobalConverterUtils,
-    GraphTraversal traverseFunction,
-    ArcGISColorManager colorManager
-  )
-  {
-    _converter = converter;
-    _settingsStore = settingsStore;
-    _featureClassUtils = featureClassUtils;
-    _localToGlobalUnpacker = localToGlobalUnpacker;
-    _localToGlobalConverterUtils = localToGlobalConverterUtils;
-    _traverseFunction = traverseFunction;
-    _colorManager = colorManager;
-  }
-
-  public Task<HostObjectBuilderResult> Build(
-    Base rootObject,
-    string projectName,
-    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    return QueuedTask.Run(
-      () => BuildInternal(rootObject, projectName, modelName, onOperationProgressed, cancellationToken)
-    );
-  }
-
-  private HostObjectBuilderResult BuildInternal(
-    Base rootObject,
-    string projectName,
-    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    // TODO get spatialRef and offsets & rotation from ProjectInfo in CommitObject
-    // ATM, GIS commit CRS is stored per layer (in FeatureClass converter), but should be moved to the Root level too
-
-    // Prompt the UI conversion started. Progress bar will swoosh.
-    onOperationProgressed.Report(new("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();
-    if (colors != null)
-    {
-      _colorManager.ParseColors(colors, onOperationProgressed);
-    }
-
-    int count = 0;
-    IReadOnlyCollection<LocalToGlobalMap> objectsToConvert = GetObjectsToConvert(rootObject);
-    Dictionary<TraversalContext, ObjectConversionTracker> conversionTracker = new();
-
-    // 1. convert everything
-    List<ReceiveConversionResult> results = new(objectsToConvert.Count);
-    List<string> bakedObjectIds = new();
-    foreach (LocalToGlobalMap objectToConvert in objectsToConvert)
-    {
-      string[] path = GetLayerPath(objectToConvert.TraversalContext);
-      Base obj = objectToConvert.AtomicObject;
-
-      cancellationToken.ThrowIfCancellationRequested();
-      try
-      {
-        obj = _localToGlobalConverterUtils.TransformObjects(objectToConvert.AtomicObject, objectToConvert.Matrix);
-        object conversionResult = _converter.Convert(obj);
-
-        string nestedLayerPath = $"{string.Join("\\", path)}";
-
-        if (obj is ArcgisObject gisObj)
-        {
-          nestedLayerPath += $"\\{gisObj.name}";
-        }
-        else
-        {
-          nestedLayerPath += $"\\{obj.speckle_type.Split(".")[^1]}"; // add sub-layer by speckleType, for non-GIS objects
-        }
-
-        conversionTracker[objectToConvert.TraversalContext] = new ObjectConversionTracker(
-          obj,
-          (Geometry?)conversionResult,
-          nestedLayerPath
-        );
-      }
-      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.Report(new("Converting", (double)++count / objectsToConvert.Count));
-    }
-
-    // 2.1. Group conversionTrackers (to write into datasets)
-    onOperationProgressed.Report(new("Grouping features into layers", null));
-    Dictionary<string, List<(TraversalContext, ObjectConversionTracker)>> convertedGroups =
-      _featureClassUtils.GroupConversionTrackers(
-        conversionTracker,
-        (s, progres) => onOperationProgressed.Report(new(s, progres))
-      );
-
-    // 2.2. Write groups of objects to Datasets
-    onOperationProgressed.Report(new("Writing to Database", null));
-
-    _featureClassUtils.CreateDatasets(
-      conversionTracker,
-      convertedGroups,
-      (s, progres) => onOperationProgressed.Report(new(s, progres))
-    );
-
-    // 3. add layer and tables to the Map and Table Of Content
-
-    // Create placeholder for GroupLayers
-    Dictionary<string, GroupLayer> createdLayerGroups = new();
-
-    int bakeCount = 0;
-    Dictionary<string, (MapMember, CIMUniqueValueRenderer?)> bakedMapMembers = new();
-    onOperationProgressed.Report(new("Adding to Map", bakeCount));
-
-    foreach (var item in conversionTracker)
-    {
-      cancellationToken.ThrowIfCancellationRequested();
-      var trackerItem = conversionTracker[item.Key]; // updated tracker object
-
-      // BAKE OBJECTS HERE
-      if (trackerItem.Exception != null)
-      {
-        results.Add(new(Status.ERROR, trackerItem.Base, null, null, trackerItem.Exception));
-      }
-      else if (trackerItem.DatasetId == null)
-      {
-        results.Add(
-          new(
-            Status.ERROR,
-            trackerItem.Base,
-            null,
-            null,
-            new ArgumentException($"Unknown error: Dataset not created for {trackerItem.Base.speckle_type}")
-          )
-        );
-      }
-      else if (bakedMapMembers.TryGetValue(trackerItem.DatasetId, out var 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);
-        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);
-      }
-      else
-      {
-        // no layer yet, create and add layer to Map
-        MapMember mapMember = AddDatasetsToMap(trackerItem, createdLayerGroups, projectName, modelName);
-
-        // add layer and layer URI to tracker
-        trackerItem.AddConvertedMapMember(mapMember);
-        trackerItem.AddLayerURI(mapMember.URI);
-        conversionTracker[item.Key] = trackerItem; // not necessary atm, but needed if we use conversionTracker further
-
-        // 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);
-
-        // add report item
-        AddResultsFromTracker(trackerItem, results);
-      }
-
-      onOperationProgressed.Report(new("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.
-        fLayer.SetRenderer(bakedMember.Value.Item2);
-      }
-    }
-    bakedObjectIds.AddRange(createdLayerGroups.Values.Select(x => x.URI));
-
-    // TODO: validated a correct set regarding bakedobject ids
-    return new HostObjectBuilderResult(bakedObjectIds, results);
-  }
-
-  private IReadOnlyCollection<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();
-
-    // 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
-    {
-      results.Add(
-        new(
-          Status.ERROR,
-          trackerItem.Base,
-          null,
-          null,
-          new ArgumentException($"Created Layer URI not found for {trackerItem.Base.speckle_type}")
-        )
-      );
-    }
-    else
-    {
-      // encode layer ID and ID of its feature in 1 object represented as string
-      ObjectID objectId = new(trackerItem.MappedLayerURI, trackerItem.DatasetRow);
-      if (trackerItem.HostAppGeom != null) // individual hostAppGeometry
-      {
-        results.Add(
-          new(
-            Status.SUCCESS,
-            trackerItem.Base,
-            objectId.ObjectIdToString(),
-            trackerItem.HostAppGeom.GetType().ToString()
-          )
-        );
-      }
-      else // hostApp Layers
-      {
-        results.Add(
-          new(
-            Status.SUCCESS,
-            trackerItem.Base,
-            objectId.ObjectIdToString(),
-            trackerItem.HostAppMapMember?.GetType().ToString()
-          )
-        );
-      }
-    }
-  }
-
-  private MapMember AddDatasetsToMap(
-    ObjectConversionTracker trackerItem,
-    Dictionary<string, GroupLayer> createdLayerGroups,
-    string projectName,
-    string modelName
-  )
-  {
-    // get layer details
-    string? datasetId = trackerItem.DatasetId; // should not be null here
-    Uri uri = new($"{_settingsStore.Current.SpeckleDatabasePath.AbsolutePath.Replace('/', '\\')}\\{datasetId}");
-    string nestedLayerName = trackerItem.NestedLayerName;
-
-    // add group for the current layer
-    string shortName = nestedLayerName.Split("\\")[^1];
-    string nestedLayerPath = string.Join("\\", nestedLayerName.Split("\\").SkipLast(1));
-
-    // if no general group layer found
-    if (createdLayerGroups.Count == 0)
-    {
-      Map map = _settingsStore.Current.Map;
-      GroupLayer mainGroupLayer = LayerFactory.Instance.CreateGroupLayer(map, 0, $"{projectName}: {modelName}");
-      mainGroupLayer.SetExpanded(true);
-      createdLayerGroups["Basic Speckle Group"] = mainGroupLayer; // key doesn't really matter here
-    }
-
-    var groupLayer = CreateNestedGroupLayer(nestedLayerPath, createdLayerGroups);
-
-    // Most of the Speckle-written datasets will be containing geometry and added as Layers
-    // although, some datasets might be just tables (e.g. native GIS Tables, in the future maybe Revit schedules etc.
-    // We can create a connection to the dataset in advance and determine its type, but this will be more
-    // expensive, than assuming by default that it's a layer with geometry (which in most cases it's expected to be)
-    try
-    {
-      var layer = LayerFactory.Instance.CreateLayer(uri, groupLayer, layerName: shortName);
-      if (layer == null)
-      {
-        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)
-      {
-        var groundSurfaceLayer = _settingsStore.Current.Map.GetGroundElevationSurfaceLayer();
-        var layerElevationSurface = new CIMLayerElevationSurface { ElevationSurfaceLayerURI = groundSurfaceLayer.URI, };
-
-        // for Feature Layers
-        if (layer.GetDefinition() is CIMFeatureLayer cimLyr)
-        {
-          cimLyr.LayerElevation = layerElevationSurface;
-          layer.SetDefinition(cimLyr);
-        }
-      }
-
-      return layer;
-    }
-    catch (ArgumentException)
-    {
-      StandaloneTable table = StandaloneTableFactory.Instance.CreateStandaloneTable(
-        uri,
-        groupLayer,
-        tableName: shortName
-      );
-      return table;
-    }
-  }
-
-  private GroupLayer CreateNestedGroupLayer(string nestedLayerPath, Dictionary<string, GroupLayer> createdLayerGroups)
-  {
-    GroupLayer lastGroup = createdLayerGroups.FirstOrDefault().Value;
-    if (lastGroup == null) // if layer not found
-    {
-      throw new InvalidOperationException("Speckle Layer Group not found");
-    }
-
-    // iterate through each nested level
-    string createdGroupPath = "";
-    var allPathElements = nestedLayerPath.Split("\\").Where(x => !string.IsNullOrEmpty(x));
-    foreach (string pathElement in allPathElements)
-    {
-      createdGroupPath += "\\" + pathElement;
-      if (createdLayerGroups.TryGetValue(createdGroupPath, out var existingGroupLayer))
-      {
-        lastGroup = existingGroupLayer;
-      }
-      else
-      {
-        // create new GroupLayer under last found Group, named with last pathElement
-        lastGroup = LayerFactory.Instance.CreateGroupLayer(lastGroup, 0, pathElement);
-        lastGroup.SetExpanded(true);
-      }
-      createdLayerGroups[createdGroupPath] = lastGroup;
-    }
-    return lastGroup;
-  }
-
-  [Pure]
-  private static string[] GetLayerPath(TraversalContext context)
-  {
-    string[] collectionBasedPath = context.GetAscendantOfType<Collection>().Select(c => c.name).ToArray();
-    string[] reverseOrderPath =
-      collectionBasedPath.Length != 0 ? collectionBasedPath : context.GetPropertyPath().ToArray();
-
-    var originalPath = reverseOrderPath.Reverse().ToArray();
-    return originalPath.Where(x => !string.IsNullOrEmpty(x)).ToArray();
-  }
-}

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

@@ -1,362 +0,0 @@
-using ArcGIS.Core.Data.Raster;
-using ArcGIS.Core.Geometry;
-using ArcGIS.Desktop.Framework.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.ArcGIS.HostApp;
-using Speckle.Connectors.ArcGIS.HostApp.Extensions;
-using Speckle.Connectors.ArcGIS.Utils;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.ArcGIS3;
-using Speckle.Converters.Common;
-using Speckle.Sdk;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.ArcGis.Operations.Send;
-
-/// <summary>
-/// Stateless builder object to turn an ISendFilter into a <see cref="Base"/> object
-/// </summary>
-public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
-{
-  private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
-  private readonly ArcGISLayerUnpacker _layerUnpacker;
-  private readonly ArcGISColorUnpacker _colorUnpacker;
-  private readonly IConverterSettingsStore<ArcGISConversionSettings> _converterSettings;
-  private readonly ILogger<ArcGISRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
-  private readonly MapMembersUtils _mapMemberUtils;
-
-  public ArcGISRootObjectBuilder(
-    ArcGISLayerUnpacker layerUnpacker,
-    ArcGISColorUnpacker colorUnpacker,
-    IConverterSettingsStore<ArcGISConversionSettings> converterSettings,
-    IRootToSpeckleConverter rootToSpeckleConverter,
-    ILogger<ArcGISRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory,
-    MapMembersUtils mapMemberUtils
-  )
-  {
-    _layerUnpacker = layerUnpacker;
-    _colorUnpacker = colorUnpacker;
-    _converterSettings = converterSettings;
-    _rootToSpeckleConverter = rootToSpeckleConverter;
-    _logger = logger;
-    _activityFactory = activityFactory;
-    _mapMemberUtils = mapMemberUtils;
-  }
-
-  public Task<RootObjectBuilderResult> Build(
-    IReadOnlyList<ADM.MapMember> layers,
-    SendInfo __,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  ) => QueuedTask.Run(() => BuildInternal(layers, __, onOperationProgressed, cancellationToken));
-
-  private async Task<RootObjectBuilderResult> BuildInternal(
-    IReadOnlyList<ADM.MapMember> layers,
-    SendInfo __,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    // TODO: add a warning if Geographic CRS is set
-    // "Data has been sent in the units 'degrees'. It is advisable to set the project CRS to Projected type (e.g. EPSG:32631) to be able to receive geometry correctly in CAD/BIM software"
-
-
-    // 0 - Create Root collection and attach CRS properties
-    // CRS properties are useful for data based workflows coming out of gis applications
-    SpatialReference sr = _converterSettings.Current.ActiveCRSoffsetRotation.SpatialReference;
-    Dictionary<string, object?> spatialReference =
-      new()
-      {
-        ["name"] = sr.Name,
-        ["unit"] = sr.Unit.Name,
-        ["wkid"] = sr.Wkid,
-        ["wkt"] = sr.Wkt,
-      };
-
-    Dictionary<string, object?> crs =
-      new()
-      {
-        ["trueNorthRadians"] = _converterSettings.Current.ActiveCRSoffsetRotation.TrueNorthRadians,
-        ["latOffset"] = _converterSettings.Current.ActiveCRSoffsetRotation.LatOffset,
-        ["lonOffset"] = _converterSettings.Current.ActiveCRSoffsetRotation.LonOffset,
-        ["spatialReference"] = spatialReference
-      };
-
-    Collection rootCollection =
-      new()
-      {
-        name = ADM.MapView.Active.Map.Name,
-        ["units"] = _converterSettings.Current.SpeckleUnits,
-        ["crs"] = crs
-      };
-
-    // 1 - Unpack the selected mapmembers
-    // In Arcgis, mapmembers are collections of other mapmember or objects.
-    // We need to unpack the selected mapmembers into all leaf-level mapmembers (containing just objects) and build the root collection structure during unpacking.
-    // Mapmember dynamically attached properties are also added at this step.
-    List<ADM.MapMember> unpackedLayers;
-    Dictionary<ADM.MapMember, long> layersWithFeatureCount;
-    long allFeaturesCount;
-    ADM.Map map = ADM.MapView.Active.Map;
-    IEnumerable<ADM.MapMember> layersOrdered = _mapMemberUtils.GetMapMembersInOrder(map, layers);
-    using (var _ = _activityFactory.Start("Unpacking selection"))
-    {
-      unpackedLayers = _layerUnpacker.UnpackSelection(layersOrdered, rootCollection);
-
-      // count number of features to convert. Raster layers are counter as 1 feature for now (not ideal)
-      layersWithFeatureCount = CountAllFeaturesInLayers(unpackedLayers);
-      allFeaturesCount = layersWithFeatureCount.Values.Sum();
-    }
-
-    List<SendConversionResult> results = new(unpackedLayers.Count);
-    onOperationProgressed.Report(new("Converting", null));
-    using (var convertingActivity = _activityFactory.Start("Converting objects"))
-    {
-      long count = 0;
-
-      foreach (var (layer, layerFeatureCount) in layersWithFeatureCount)
-      {
-        cancellationToken.ThrowIfCancellationRequested();
-        string layerApplicationId = layer.GetSpeckleApplicationId();
-
-        try
-        {
-          // get the corresponding collection for this layer - we'll add all converted objects to the collection
-          if (_layerUnpacker.CollectionCache.TryGetValue(layerApplicationId, out Collection? layerCollection))
-          {
-            var status = Status.SUCCESS;
-            var sdkStatus = SdkActivityStatusCode.Ok;
-
-            // TODO: check cache first to see if this layer was previously converted
-            /*
-            if (_sendConversionCache.TryGetValue(
-              sendInfo.ProjectId,
-              layerApplicationId,
-              out ObjectReference? value
-            ))
-            {
-
-            }
-            */
-
-            switch (layer)
-            {
-              case ADM.FeatureLayer featureLayer:
-                List<Base> convertedFeatureLayerObjects = ConvertFeatureLayerObjects(
-                  featureLayer,
-                  count,
-                  allFeaturesCount,
-                  onOperationProgressed,
-                  cancellationToken
-                );
-                layerCollection.elements.AddRange(convertedFeatureLayerObjects);
-                break;
-              case ADM.RasterLayer rasterLayer:
-                List<Base> convertedRasterLayerObjects = ConvertRasterLayerObjects(
-                  rasterLayer,
-                  count,
-                  allFeaturesCount,
-                  onOperationProgressed,
-                  cancellationToken
-                );
-                layerCollection.elements.AddRange(convertedRasterLayerObjects);
-                break;
-              case ADM.LasDatasetLayer lasDatasetLayer:
-                List<Base> convertedLasDatasetObjects = ConvertLasDatasetLayerObjects(
-                  lasDatasetLayer,
-                  count,
-                  allFeaturesCount,
-                  onOperationProgressed,
-                  cancellationToken
-                );
-                layerCollection.elements.AddRange(convertedLasDatasetObjects);
-                break;
-              default:
-                status = Status.ERROR;
-                sdkStatus = SdkActivityStatusCode.Error;
-                break;
-            }
-
-            count += layerFeatureCount;
-            results.Add(new(status, layerApplicationId, layer.GetType().Name, layerCollection));
-            convertingActivity?.SetStatus(sdkStatus);
-          }
-          else
-          {
-            throw new SpeckleException($"No converted Collection found for layer {layerApplicationId}.");
-          }
-        }
-        catch (Exception ex) when (!ex.IsFatal())
-        {
-          _logger.LogSendConversionError(ex, layer.GetType().Name);
-          results.Add(new(Status.ERROR, layerApplicationId, layer.GetType().Name, null, ex));
-          convertingActivity?.SetStatus(SdkActivityStatusCode.Error);
-          convertingActivity?.RecordException(ex);
-        }
-
-        await Task.Yield();
-      }
-    }
-
-    if (results.All(x => x.Status == Status.ERROR))
-    {
-      throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
-    }
-
-    // 3 -  Add Color Proxies
-    rootCollection[ProxyKeys.COLOR] = _colorUnpacker.ColorProxyCache.Values.ToList();
-
-    return new RootObjectBuilderResult(rootCollection, results);
-  }
-
-  private Dictionary<ADM.MapMember, long> CountAllFeaturesInLayers(List<ADM.MapMember> unpackedLayers)
-  {
-    Dictionary<ADM.MapMember, long> layersFeatureCount = new();
-
-    foreach (ADM.MapMember layer in unpackedLayers)
-    {
-      switch (layer)
-      {
-        case ADM.FeatureLayer featureLayer:
-          layersFeatureCount.Add(featureLayer, featureLayer.GetFeatureClass().GetCount());
-          break;
-        case ADM.RasterLayer rasterLayer:
-          // count Raster layer as 1 feature: not optimal but this is the approach for now
-          layersFeatureCount.Add(rasterLayer, 1);
-          break;
-        case ADM.LasDatasetLayer lasDatasetLayer:
-          var dataset = lasDatasetLayer.GetLasDataset();
-          // simple dataset.GetPointCount() keeps returning null, so switched to EstimatePointCount
-          layersFeatureCount.Add(
-            lasDatasetLayer,
-            (long)dataset.EstimatePointCount(dataset.GetDefinition().GetExtent())
-          );
-          break;
-      }
-    }
-    return layersFeatureCount;
-  }
-
-  private List<Base> ConvertFeatureLayerObjects(
-    ADM.FeatureLayer featureLayer,
-    long count,
-    long allFeaturesCount,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    string layerApplicationId = featureLayer.GetSpeckleApplicationId();
-    List<Base> convertedObjects = new();
-    // store the layer renderer for color unpacking
-    _colorUnpacker.StoreRendererAndFields(featureLayer);
-
-    // search the rows of the layer, where each row is treated like an object
-    // RowCursor is IDisposable but is not being correctly picked up by IDE warnings.
-    // This means we need to be carefully adding using statements based on the API documentation coming from each method/class
-    using (ACD.RowCursor rowCursor = featureLayer.Search())
-    {
-      while (rowCursor.MoveNext())
-      {
-        // allow cancellation before every feature
-        cancellationToken.ThrowIfCancellationRequested();
-
-        // Same IDisposable issue appears to happen on Row class too. Docs say it should always be disposed of manually by the caller.
-        using (ACD.Row row = rowCursor.Current)
-        {
-          // get application id. test for subtypes before defaulting to base type.
-          Base converted = _rootToSpeckleConverter.Convert(row);
-          string applicationId = row.GetSpeckleApplicationId(layerApplicationId);
-          converted.applicationId = applicationId;
-
-          convertedObjects.Add(converted);
-
-          // process the object color
-          _colorUnpacker.ProcessFeatureLayerColor(row, applicationId);
-        }
-        // update report
-        onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
-      }
-    }
-
-    return convertedObjects;
-  }
-
-  // POC: raster colors are stored as mesh vertex colors in RasterToSpeckleConverter. Should probably move to color unpacker.
-  private List<Base> ConvertRasterLayerObjects(
-    ADM.RasterLayer rasterLayer,
-    long count,
-    long allFeaturesCount,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    string layerApplicationId = rasterLayer.GetSpeckleApplicationId();
-    List<Base> convertedObjects = new();
-    Raster raster = rasterLayer.GetRaster();
-
-    // check cancellation token before conversion
-    cancellationToken.ThrowIfCancellationRequested();
-    Base converted = _rootToSpeckleConverter.Convert(raster);
-    string applicationId = raster.GetSpeckleApplicationId(layerApplicationId);
-    converted.applicationId = applicationId;
-    convertedObjects.Add(converted);
-
-    // update report
-    onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
-
-    return convertedObjects;
-  }
-
-  private List<Base> ConvertLasDatasetLayerObjects(
-    ADM.LasDatasetLayer lasDatasetLayer,
-    long count,
-    long allFeaturesCount,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    string layerApplicationId = lasDatasetLayer.GetSpeckleApplicationId();
-    List<Base> convertedObjects = new();
-
-    try
-    {
-      // store the layer renderer for color unpacking
-      _colorUnpacker.StoreRenderer(lasDatasetLayer);
-
-      using (ACD.Analyst3D.LasPointCursor ptCursor = lasDatasetLayer.SearchPoints(new ACD.Analyst3D.LasPointFilter()))
-      {
-        while (ptCursor.MoveNext())
-        {
-          // allow cancellation before every point
-          cancellationToken.ThrowIfCancellationRequested();
-
-          using (ACD.Analyst3D.LasPoint pt = ptCursor.Current)
-          {
-            Base converted = _rootToSpeckleConverter.Convert(pt);
-            string applicationId = pt.GetSpeckleApplicationId(layerApplicationId);
-            converted.applicationId = applicationId;
-            convertedObjects.Add(converted);
-
-            // process the object color
-            _colorUnpacker.ProcessLasLayerColor(pt, applicationId);
-          }
-          // update report
-          onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
-        }
-      }
-    }
-    catch (ACD.Exceptions.TinException ex)
-    {
-      throw new SpeckleException("3D analyst extension is not enabled for .las layer operations", ex);
-    }
-
-    return convertedObjects;
-  }
-}

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Properties/launchSettings.json

@@ -1,14 +0,0 @@
-{
-  "profiles": {
-    "Speckle.Connectors.ArcGIS3_all_users": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\ArcGIS\\Pro\\bin\\ArcGISPro.exe",
-      "commandLineArgs": ""
-    },
-    "Speckle.Connectors.ArcGIS3_user": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Users\\%USERNAME%\\AppData\\Local\\Programs\\ArcGIS\\Pro\\bin\\ArcGISPro.exe",
-      "commandLineArgs": ""
-    }
-  }
-}

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

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <PlatformTarget>x64</PlatformTarget>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <RootNameSpace>Speckle.Connectors.ArcGIS</RootNameSpace>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <EnableWindowsTargeting>true</EnableWindowsTargeting>
-    <DefineConstants>$(DefineConstants);ARCGIS3</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="Config.daml" />
-    <Content Include="Images\s2logo_16.png" />
-    <Content Include="Images\s2logo_32.png" />
-    <Content Include="DarkImages\s2logo_16.png" />
-    <Content Include="DarkImages\s2logo_32.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Esri.ArcGISPro.Extensions30" IncludeAssets="compile" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\ArcGIS\Speckle.Converters.ArcGIS3\Speckle.Converters.ArcGIS3.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
-  </ItemGroup>
-
-  <Import Project="Esri.ArcGISPro.Extensions30.Speckle.targets" />
-</Project>

Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleDUI3ViewModel.cs

@@ -1,42 +0,0 @@
-using ArcGIS.Desktop.Framework;
-using ArcGIS.Desktop.Framework.Contracts;
-
-namespace Speckle.Connectors.ArcGIS;
-
-internal sealed class SpeckleDUI3ViewModel : DockPane
-{
-  private const string DOCKPANE_ID = "SpeckleDUI3_SpeckleDUI3";
-
-  internal static void Create()
-  {
-    var pane = FrameworkApplication.DockPaneManager.Find(DOCKPANE_ID);
-    pane?.Activate();
-  }
-
-  /// <summary>
-  /// Called when the pane is initialized.
-  /// </summary>
-  protected override async Task InitializeAsync()
-  {
-    await base.InitializeAsync();
-  }
-
-  /// <summary>
-  /// Called when the pane is uninitialized.
-  /// </summary>
-  protected override async Task UninitializeAsync()
-  {
-    await base.UninitializeAsync();
-  }
-}
-
-/// <summary>
-/// Button implementation to create a new instance of the pane and activate it.
-/// </summary>
-internal sealed class SpeckleDUI3OpenButton : Button
-{
-  protected override void OnClick()
-  {
-    SpeckleDUI3ViewModel.Create();
-  }
-}

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

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

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

@@ -1,61 +0,0 @@
-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 Module = ArcGIS.Desktop.Framework.Contracts.Module;
-
-namespace Speckle.Connectors.ArcGIS;
-
-/// <summary>
-/// This sample shows how to implement pane that contains an Edge WebView2 control using the built-in ArcGIS Pro SDK's WebBrowser control.  For details on how to utilize the WebBrowser control in an add-in see here: https://github.com/Esri/arcgis-pro-sdk/wiki/ProConcepts-Framework#webbrowser  For details on how to utilize the Microsoft Edge web browser control in an add-in see here: https://github.com/Esri/arcgis-pro-sdk/wiki/ProConcepts-Framework#webbrowser-control
-/// </summary>
-internal sealed class SpeckleModule : Module
-{
-  private static SpeckleModule? s_this;
-  private readonly IDisposable? _disposableLogger;
-
-  /// <summary>
-  /// Retrieve the singleton instance to this module here
-  /// </summary>
-  public static SpeckleModule Current =>
-    s_this ??= (SpeckleModule)FrameworkApplication.FindModule("ConnectorArcGIS_Module");
-
-  public ServiceProvider Container { get; }
-
-  public SpeckleModule()
-  {
-    AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolver.OnAssemblyResolve<SpeckleModule>;
-
-    var services = new ServiceCollection();
-    // init DI
-    _disposableLogger = services.Initialize(HostApplications.ArcGIS, GetVersion());
-    services.AddArcGIS();
-    services.AddArcGISConverters();
-    Container = services.BuildServiceProvider();
-    Container.UseDUI();
-  }
-
-  private HostAppVersion GetVersion()
-  {
-#if ARCGIS3
-    return HostAppVersion.v3;
-#else
-    throw new NotImplementedException();
-#endif
-  }
-
-  /// <summary>
-  /// Called by Framework when ArcGIS Pro is closing
-  /// </summary>
-  /// <returns>False to prevent Pro from closing, otherwise True</returns>
-  protected override bool CanUnload()
-  {
-    //TODO - add your business logic
-    //return false to ~cancel~ Application close
-    _disposableLogger?.Dispose();
-    Container.Dispose();
-    return true;
-  }
-}

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

@@ -1,133 +0,0 @@
-using System.Xml.Linq;
-using ArcGIS.Desktop.Core.Events;
-using ArcGIS.Desktop.Framework.Threading.Tasks;
-using ArcGIS.Desktop.Mapping;
-using ArcGIS.Desktop.Mapping.Events;
-using Speckle.Connectors.Common.Threading;
-using Speckle.Connectors.DUI.Bridge;
-using Speckle.Connectors.DUI.Models;
-using Speckle.Connectors.DUI.Utils;
-
-namespace Speckle.Connectors.ArcGIS.Utils;
-
-public class ArcGISDocumentStore : DocumentModelStore
-{
-  private readonly IThreadContext _threadContext;
-
-  public ArcGISDocumentStore(
-    IJsonSerializer jsonSerializer,
-    ITopLevelExceptionHandler topLevelExceptionHandler,
-    IThreadContext threadContext
-  )
-    : base(jsonSerializer)
-  {
-    _threadContext = threadContext;
-    ActiveMapViewChangedEvent.Subscribe(a => topLevelExceptionHandler.CatchUnhandled(() => OnMapViewChanged(a)), true);
-    ProjectSavingEvent.Subscribe(
-      _ =>
-      {
-        topLevelExceptionHandler.CatchUnhandled(OnProjectSaving);
-        return Task.CompletedTask;
-      },
-      true
-    );
-    ProjectClosingEvent.Subscribe(
-      _ =>
-      {
-        topLevelExceptionHandler.CatchUnhandled(OnProjectClosing);
-        return Task.CompletedTask;
-      },
-      true
-    );
-
-    // in case plugin was loaded into already opened Map, read metadata from the current Map
-    if (!IsDocumentInit && MapView.Active != null)
-    {
-      IsDocumentInit = true;
-      LoadState();
-      OnDocumentChanged();
-    }
-  }
-
-  private void OnProjectClosing()
-  {
-    if (MapView.Active is null)
-    {
-      return;
-    }
-
-    SaveState();
-  }
-
-  private void OnProjectSaving()
-  {
-    if (MapView.Active is not null)
-    {
-      SaveState();
-    }
-  }
-
-  /// <summary>
-  /// On map view switch, this event trigger twice, first for outgoing view, second for incoming view.
-  /// </summary>
-  private void OnMapViewChanged(ActiveMapViewChangedEventArgs args)
-  {
-    if (args.IncomingView is null)
-    {
-      return;
-    }
-
-    IsDocumentInit = true;
-    LoadState();
-    OnDocumentChanged();
-  }
-
-  protected override void HostAppSaveState(string modelCardState) =>
-    QueuedTask
-      .Run(() =>
-      {
-        Map map = MapView.Active.Map;
-        // Read existing metadata - To prevent messing existing metadata. 🤞 Hope other add-in developers will do same :D
-        var existingMetadata = map.GetMetadata();
-
-        // Parse existing metadata
-        XDocument existingXmlDocument = !string.IsNullOrEmpty(existingMetadata)
-          ? XDocument.Parse(existingMetadata)
-          : new XDocument(new XElement("metadata"));
-
-        XElement xmlModelCards = new("SpeckleModelCards", modelCardState);
-
-        // Check if SpeckleModelCards element already exists at root and update it
-        var speckleModelCardsElement = existingXmlDocument.Root?.Element("SpeckleModelCards");
-        if (speckleModelCardsElement != null)
-        {
-          speckleModelCardsElement.ReplaceWith(xmlModelCards);
-        }
-        else
-        {
-          existingXmlDocument.Root?.Add(xmlModelCards);
-        }
-
-        map.SetMetadata(existingXmlDocument.ToString());
-      })
-      .FireAndForget();
-
-  protected override void LoadState() =>
-    QueuedTask
-      .Run(() =>
-      {
-        Map map = MapView.Active.Map;
-        var metadata = map.GetMetadata();
-        var root = XDocument.Parse(metadata).Root;
-        var element = root?.Element("SpeckleModelCards");
-        if (element is null)
-        {
-          ClearAndSave();
-          return;
-        }
-
-        string modelsString = element.Value;
-        LoadFromString(modelsString);
-      })
-      .FireAndForget();
-}

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

@@ -1,16 +0,0 @@
-using ArcGIS.Desktop.Mapping;
-
-namespace Speckle.Connectors.ArcGIS.Utils;
-
-// bind together a layer object on the map, and auto-assigned ID if the specific feature
-public readonly struct MapMemberFeature
-{
-  public int? FeatureId { get; } // unique feature id (start from 0) of a feature in the layer
-  public MapMember MapMember { get; } // layer object on the Map
-
-  public MapMemberFeature(MapMember mapMember, int? featureId)
-  {
-    MapMember = mapMember;
-    FeatureId = featureId;
-  }
-}

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

@@ -1,61 +0,0 @@
-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)
-    {
-      mapMembers.Add(layer);
-      switch (layer)
-      {
-        case ILayerContainer subGroup:
-          var subLayerMapMembers = UnpackMapLayers(subGroup.Layers);
-          mapMembers.AddRange(subLayerMapMembers);
-          break;
-      }
-    }
-
-    return mapMembers;
-  }
-
-  /// <summary>
-  /// Sorts the selected mapmembers into the same order as they appear in the Table of Contents (TOC) bar in the file.
-  /// This is a required step before unpacking layers, because depending on the user selection order, some children layers may appear before their container layer if both the container and children layers are selected.
-  /// </summary>
-  public IEnumerable<MapMember> GetMapMembersInOrder(Map map, IReadOnlyList<MapMember> selectedMapMembers)
-  {
-    // first get all map layers
-    List<MapMember> allMapMembers = GetAllMapMembers(map);
-
-    // recalculate selected layer priority from all map layers
-    foreach (MapMember mapMember in allMapMembers)
-    {
-      if (selectedMapMembers.Contains(mapMember))
-      {
-        yield return mapMember;
-      }
-    }
-  }
-}

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

@@ -1,38 +0,0 @@
-namespace Speckle.Connectors.ArcGIS.Utils;
-
-// this struct is needed to be able to parse single-string value into IDs of both a layer, and it's individual feature
-public struct ObjectID
-{
-  private const string FEATURE_ID_SEPARATOR = "__speckleFeatureId__";
-  public string MappedLayerURI { get; } // unique ID of the layer on the map
-  public int? FeatureId { get; } // unique feature id (start from 0) of a feature in the layer
-
-  public ObjectID(string encodedId)
-  {
-    List<string> stringParts = encodedId.Split(FEATURE_ID_SEPARATOR).ToList();
-    MappedLayerURI = stringParts[0];
-    FeatureId = null;
-    if (stringParts.Count > 1)
-    {
-      FeatureId = Convert.ToInt32(stringParts[1]);
-    }
-  }
-
-  public ObjectID(string layerId, int? featureId)
-  {
-    MappedLayerURI = layerId;
-    FeatureId = featureId;
-  }
-
-  public readonly string ObjectIdToString()
-  {
-    if (FeatureId == null)
-    {
-      return $"{MappedLayerURI}";
-    }
-    else
-    {
-      return $"{MappedLayerURI}{FEATURE_ID_SEPARATOR}{FeatureId}";
-    }
-  }
-}

Connectors/Autocad/Directory.Build.targets

@@ -25,12 +25,10 @@
   </Target>
 
   <PropertyGroup Condition="'$(AutoCADVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <StartAction>Program</StartAction>
     <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Civil3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <StartAction>Program</StartAction>
     <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
     <StartArguments>/product C3D</StartArguments>

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

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -294,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -338,18 +336,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -359,14 +357,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -294,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -338,18 +336,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -359,14 +357,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -295,7 +293,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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

@@ -4,7 +4,13 @@
     <AutoCADVersion>2025</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2025;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER;AUTOCAD2025_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <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 -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- .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 -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -215,18 +215,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -251,7 +249,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -295,18 +293,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -315,14 +313,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     "net8.0-windows7.0/win-x64": {

Connectors/Autocad/Speckle.Connectors.Autocad2026/Speckle.Connectors.Autocad2026.csproj

@@ -3,8 +3,14 @@
     <TargetFramework>net8.0-windows</TargetFramework>
     <AutoCADVersion>2026</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2026;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER;AUTOCAD2025_OR_GREATER;AUTOCAD2026_OR_GREATER</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>   
-    <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 -->
+    <Configurations>Debug;Release;Local</Configurations>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- .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 -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -215,18 +215,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -251,7 +249,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -295,18 +293,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -315,14 +313,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -89,6 +89,17 @@ public class AutocadSelectionBinding : ISelectionBinding
 
           objectTypes.Add(dbObject.GetType().Name);
           objs.Add(dbObject.GetSpeckleApplicationId());
+
+          // do the same also for each AttributeReference inside the BlockReference (attribute change is not affecting the block otherwise)
+          if (dbObject is BlockReference blockReference)
+          {
+            foreach (ObjectId id in blockReference.AttributeCollection)
+            {
+              var attr = (AttributeReference)tr.GetObject(id, OpenMode.ForRead);
+              objectTypes.Add(attr.GetType().Name);
+              objs.Add(attr.GetSpeckleApplicationId());
+            }
+          }
         }
 
         tr.Commit();

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

@@ -188,7 +188,7 @@ public abstract class AutocadSendBaseBinding : ISendBinding
           cancellationItem.Token
         );
 
-      await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
+      await Commands.SetModelSendResult(modelCardId, sendResult.VersionId, sendResult.ConversionResults);
     }
     catch (OperationCanceledException)
     {

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

@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Logging;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
@@ -9,17 +10,16 @@ public class AutocadDocumentStore : DocumentModelStore
   private const string NULL_DOCUMENT_NAME = "Null Doc";
   private string _previousDocName;
   private readonly AutocadDocumentManager _autocadDocumentManager;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
 
   public AutocadDocumentStore(
+    ILogger<DocumentModelStore> logger,
     IJsonSerializer jsonSerializer,
     AutocadDocumentManager autocadDocumentManager,
     ITopLevelExceptionHandler topLevelExceptionHandler
   )
-    : base(jsonSerializer)
+    : base(logger, jsonSerializer)
   {
     _autocadDocumentManager = autocadDocumentManager;
-    _topLevelExceptionHandler = topLevelExceptionHandler;
     _previousDocName = NULL_DOCUMENT_NAME;
 
     // POC: Will be addressed to move it into AutocadContext!

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

@@ -101,6 +101,23 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
 
       instanceProxiesWithSameDefinition.Add(_instanceObjectsManager.GetInstanceProxy(instanceId));
 
+      // Add text attributes from Instances as separate atomic objects:
+      // AttributeReferences found on Instances are just a text, not a part of the Instance
+      // They are not actually references and are not linked to AttributeDefinition (as one would expect),
+      // and already have the correct position (no need for transforms).
+      // We don't want to create a new BlockDefinition for every changed text for now, because AutoCAD API doesn't provide one,
+      // e.g. AnonymousBlockTableRecord is provided for each dynamic blocks with geometry changes, but not for Attribute changes.
+      // Docs on AttributeReference usage (used totally independent of AttributeDefinition): https://help.autodesk.com/view/OARX/2025/ENU/?guid=GUID-BA69D85A-2AED-43C2-B5B7-73022B5F28F8
+      // Case of trying to match AttributeDefinition with AttributeReference via Tag value (which is not unique): https://forums.autodesk.com/t5/net-forum/get-the-value-of-an-attribute-in-c/td-p/9060940
+
+      foreach (ObjectId id in instance.AttributeCollection)
+      {
+        var reference = (AttributeReference)transaction.GetObject(id, OpenMode.ForRead);
+        string refAppId = reference.GetSpeckleApplicationId();
+        _instanceObjectsManager.AddAtomicObject(refAppId, new(reference, refAppId));
+      }
+
+      // rely on already converted Definition
       if (
         _instanceObjectsManager.TryGetInstanceDefinitionProxy(
           definitionId.ToString(),
@@ -131,12 +148,12 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
       {
         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)
+        // In the case of dynamic blocks, this prevents sending objects that are not visible in its current state.
+        // Also skipping AttributeDefinition because it only contains default text values. We convert AttributeReference above instead, as a separate object.
+        if (!obj.Visible || obj is AttributeDefinition)
         {
           continue;
         }
-
         string appId = obj.GetSpeckleApplicationId();
         definitionProxy.objects.Add(appId);
 

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

@@ -20,7 +20,7 @@ public class AutocadCommand
   private static readonly Guid s_id = new("3223E594-1B09-4E54-B3DD-8EA0BECE7BA5");
   public ServiceProvider? Container { get; private set; }
   private IDisposable? _disposableLogger;
-  public const string COMMAND_STRING = "SpeckleBeta";
+  public const string COMMAND_STRING = "Speckle";
 
   [CommandMethod(COMMAND_STRING)]
   public void Command()
@@ -31,7 +31,7 @@ public class AutocadCommand
       return;
     }
 
-    PaletteSet = new PaletteSet($"Speckle (Beta)", s_id)
+    PaletteSet = new PaletteSet($"Speckle", s_id)
     {
       Size = new Size(400, 500),
       DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
@@ -52,7 +52,7 @@ public class AutocadCommand
 
     var panelWebView = Container.GetRequiredService<DUI3ControlWebView>();
 
-    PaletteSet.AddVisual("Speckle (Beta)", panelWebView);
+    PaletteSet.AddVisual("Speckle", panelWebView);
 
     FocusPalette();
   }

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

@@ -49,19 +49,19 @@ public class AutocadRibbon
   private void Create()
   {
     RibbonTab tab = FindOrMakeTab("Speckle");
-    RibbonPanelSource source = new() { Title = "Speckle (Beta)" };
+    RibbonPanelSource source = new() { Title = "Speckle" };
     RibbonPanel panel = new() { Source = source };
     tab.Panels.Add(panel);
 
     RibbonToolTip speckleToolTip =
       new()
       {
-        Title = "Speckle (Beta)",
-        Content = $"Next Gen Speckle Connector (Beta) for {AppUtils.App.Name}",
+        Title = "Speckle",
+        Content = $"Next Gen Speckle Connector for {AppUtils.App.Name}",
         IsHelpEnabled = true // Without this "Press F1 for help" does not appear in the tooltip
       };
 
-    _ = CreateSpeckleButton("Speckle (Beta)", source, null, speckleToolTip, "logo");
+    _ = CreateSpeckleButton("Speckle", source, null, speckleToolTip, "logo");
   }
 
   private void ComponentManager_ItemInitialized(object? sender, RibbonItemEventArgs e)

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

@@ -268,18 +268,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -304,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -348,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -369,14 +367,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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

@@ -268,18 +268,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -304,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -348,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -369,14 +367,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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

@@ -268,18 +268,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -304,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -348,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -369,14 +367,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

Connectors/Autocad/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.csproj

@@ -4,7 +4,13 @@
     <Civil3DVersion>2025</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D2025;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <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 -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- .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 -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -224,18 +224,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -261,7 +259,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -305,18 +303,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -325,14 +323,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     "net8.0-windows7.0/win-x64": {

Connectors/Autocad/Speckle.Connectors.Civil3d2026/Speckle.Connectors.Civil3d2026.csproj

@@ -4,7 +4,13 @@
     <Civil3DVersion>2026</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D2026;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER;CIVIL3D2026_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <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 -->
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- .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 -->
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -224,18 +224,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -261,7 +259,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -305,18 +303,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -325,14 +323,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     "net8.0-windows7.0/win-x64": {

Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs

@@ -106,7 +106,7 @@ public sealed class CsiSharedSendBinding : ISendBinding
           cancellationItem.Token
         );
 
-      await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
+      await Commands.SetModelSendResult(modelCardId, sendResult.VersionId, sendResult.ConversionResults);
     }
     catch (OperationCanceledException)
     {

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs

@@ -26,6 +26,7 @@ public class CsiDocumentModelStore : DocumentModelStore, IDisposable
   private string ModelPathHash { get; set; }
 
   public CsiDocumentModelStore(
+    ILogger<DocumentModelStore> baseLogger,
     IJsonSerializer jsonSerializer,
     ISpeckleApplication speckleApplication,
     ILogger<CsiDocumentModelStore> logger,
@@ -33,7 +34,7 @@ public class CsiDocumentModelStore : DocumentModelStore, IDisposable
     ITopLevelExceptionHandler topLevelExceptionHandler,
     IThreadContext threadContext
   )
-    : base(jsonSerializer)
+    : base(baseLogger, jsonSerializer)
   {
     _threadContext = threadContext;
     _speckleApplication = speckleApplication;

Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/SpeckleFormBase.cs

@@ -22,7 +22,7 @@ public abstract class SpeckleFormBase : Form, ICsiApplicationService
 
   protected SpeckleFormBase()
   {
-    Text = "Speckle (Beta)";
+    Text = "Speckle";
     Size = new System.Drawing.Size(400, 600);
   }
 

Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.etabs21": {
@@ -337,18 +335,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +356,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json

@@ -215,18 +215,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -243,7 +241,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.etabs22": {
@@ -293,18 +291,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -313,14 +311,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2020": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2021": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2022": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2023": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json

@@ -259,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2024": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json

@@ -265,18 +265,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -293,7 +291,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2025": {
@@ -339,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2026/packages.lock.json

@@ -266,18 +266,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -294,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.navisworks2026": {
@@ -341,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -362,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSendBinding.cs

@@ -122,7 +122,7 @@ public class NavisworksSendBinding : ISendBinding
         cancellationItem.Token
       );
 
-      await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
+      await Commands.SetModelSendResult(modelCardId, sendResult.VersionId, sendResult.ConversionResults);
     }
     catch (OperationCanceledException)
     {

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksDocumentModelStore.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using Microsoft.Extensions.Logging;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
@@ -19,10 +20,11 @@ public sealed class NavisworksDocumentModelStore : DocumentModelStore
   private string _lastSavedState = string.Empty;
 
   public NavisworksDocumentModelStore(
+    ILogger<DocumentModelStore> logger,
     IJsonSerializer jsonSerializer,
     ITopLevelExceptionHandler topLevelExceptionHandler
   )
-    : base(jsonSerializer)
+    : base(logger, jsonSerializer)
   {
     _topLevelExceptionHandler = topLevelExceptionHandler;
     LoadState();

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/DockableConnectorPane.cs

@@ -20,7 +20,7 @@ namespace Speckle.Connector.Navisworks.Plugin;
     DisplayName = SpeckleV3Tool.DISPLAY_NAME,
     Options = NAV.Plugins.PluginOptions.None,
     ToolTip = "Speckle Connector for Navisworks",
-    ExtendedToolTip = "Next Gen Speckle Connector (Beta) for Navisworks"
+    ExtendedToolTip = "Next Gen Speckle Connector for Navisworks"
   )
 ]
 [SuppressMessage(

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.name

@@ -4,7 +4,7 @@ $utf8
 
 DisplayName=Speckle
 Speckle.DisplayName=Speckle
-SpeckleV3.Title=Speckle (Beta)
-SpeckleV2.Title=Speckle
-Speckle_Launch.DisplayName=Speckle (Beta)
-Speckle_Launch_V2.DisplayName=Speckle
+SpeckleV3.Title=Speckle
+SpeckleV2.Title=Speckle (Legacy)
+Speckle_Launch.DisplayName=Speckle
+Speckle_Launch_V2.DisplayName=Speckle (Legacy)

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV3Tool.cs

@@ -8,7 +8,7 @@ public static class SpeckleV3Tool
   public const string COMMAND = "Speckle_Launch";
   public const string PLUGIN = "SpeckleUI3";
   public const string PLUGIN_ID = "SpeckleNavisworksNextGen";
-  public const string DISPLAY_NAME = "Speckle (Beta)";
+  public const string DISPLAY_NAME = "Speckle";
   public const string RIBBON_TAB_ID = "Speckle";
   public const string RIBBON_TAB_DISPLAY_NAME = "Speckle";
   public const string RIBBON_STRINGS = "NavisworksRibbon.name";

Connectors/Revit/Speckle.Connectors.Revit.Common/RevitAsync.cs

@@ -0,0 +1,21 @@
+using Autodesk.Revit.UI;
+
+namespace Speckle.Connectors.Revit.Common;
+
+public static class RevitAsync
+{
+  public static Task<TResult> RunAsync<TResult>(Func<TResult> function) =>
+    global::Revit.Async.RevitTask.RunAsync(function);
+
+  public static Task<TResult> RunAsync<TResult>(Func<Task<TResult>> function) =>
+    global::Revit.Async.RevitTask.RunAsync(function);
+
+  public static Task RunAsync(Action action) => global::Revit.Async.RevitTask.RunAsync(action);
+
+  public static Task RunAsync(Func<Task> handler) => global::Revit.Async.RevitTask.RunAsync(handler);
+
+  public static void Initialize(UIControlledApplication application) =>
+    global::Revit.Async.RevitTask.Initialize(application);
+
+  public static void Initialize(UIApplication application) => global::Revit.Async.RevitTask.Initialize(application);
+}

Connectors/Revit/Speckle.Connectors.Revit.Common/Speckle.Connectors.Revit.Common.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
+    <Configurations>Debug;Release;Local</Configurations>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PolySharpExcludeGeneratedTypes>System.Range;System.Index</PolySharpExcludeGeneratedTypes>
+    <ILRepackTargetConfigurations>Debug;Release;Local</ILRepackTargetConfigurations>
+    <ILRepackRenameInternalized>true</ILRepackRenameInternalized>
+  </PropertyGroup>
+  <!--
+  It doesn't matter that these API references are perfectly aligned, because these are specifiying min versions
+  The revit projects will resolve their correct ones
+  -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+    <PackageReference Include="Speckle.Revit.API" VersionOverride="2022.0.2.1" ExcludeAssets="runtime"/>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Speckle.Revit.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ILRepack.FullAuto">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Revit.Async" PrivateAssets="all"/>
+  </ItemGroup>
+</Project>

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

@@ -0,0 +1,153 @@
+{
+  "version": 2,
+  "dependencies": {
+    ".NETFramework,Version=v4.8": {
+      "ILRepack.FullAuto": {
+        "type": "Direct",
+        "requested": "[1.6.0, )",
+        "resolved": "1.6.0",
+        "contentHash": "34qp/HQ0XRIWCjtNGUOslJ6p9eNWqHXZQ+xx1iBCvXy3mj8tEiqIwRG+LubFyKCJITqMh5cpFvFl20/6+Dmy+g==",
+        "dependencies": {
+          "ILRepack": "2.0.33"
+        }
+      },
+      "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, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "PolySharp": {
+        "type": "Direct",
+        "requested": "[1.14.1, )",
+        "resolved": "1.14.1",
+        "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
+      },
+      "Revit.Async": {
+        "type": "Direct",
+        "requested": "[2.1.1, )",
+        "resolved": "2.1.1",
+        "contentHash": "aK6R/fxrn3jpiKc8LYqfWZ+OfEKNnwgkiln1uyuvaPnTWBOvfiisnOfe7+Sgogr4iEuMmuMDsmBRMCycMlUpnw=="
+      },
+      "Speckle.InterfaceGenerator": {
+        "type": "Direct",
+        "requested": "[0.9.6, )",
+        "resolved": "0.9.6",
+        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
+      },
+      "Speckle.Revit.API": {
+        "type": "Direct",
+        "requested": "[2022.0.2.1, )",
+        "resolved": "2022.0.2.1",
+        "contentHash": "IrLN4WyI2ix+g3zCpo7sX8zNB3FrtrdQ3E2RpceGVPNG00v8OfD+Kei7o1bn1u/ML46iBYRAr/JcsLbwfUQsBw=="
+      },
+      "ILRepack": {
+        "type": "Transitive",
+        "resolved": "2.0.33",
+        "contentHash": "xb2h1CsOepoYwdXEPui9VcQglwABQwNf9cccZbf+acarEzF5PUp8Xx71nFXIhOgEdm6wrxAoF6xAxK4m/XFRUQ=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      }
+    },
+    "net8.0": {
+      "ILRepack.FullAuto": {
+        "type": "Direct",
+        "requested": "[1.6.0, )",
+        "resolved": "1.6.0",
+        "contentHash": "34qp/HQ0XRIWCjtNGUOslJ6p9eNWqHXZQ+xx1iBCvXy3mj8tEiqIwRG+LubFyKCJITqMh5cpFvFl20/6+Dmy+g==",
+        "dependencies": {
+          "ILRepack": "2.0.33"
+        }
+      },
+      "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, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "PolySharp": {
+        "type": "Direct",
+        "requested": "[1.14.1, )",
+        "resolved": "1.14.1",
+        "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
+      },
+      "Revit.Async": {
+        "type": "Direct",
+        "requested": "[2.1.1, )",
+        "resolved": "2.1.1",
+        "contentHash": "aK6R/fxrn3jpiKc8LYqfWZ+OfEKNnwgkiln1uyuvaPnTWBOvfiisnOfe7+Sgogr4iEuMmuMDsmBRMCycMlUpnw=="
+      },
+      "Speckle.InterfaceGenerator": {
+        "type": "Direct",
+        "requested": "[0.9.6, )",
+        "resolved": "0.9.6",
+        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
+      },
+      "Speckle.Revit.API": {
+        "type": "Direct",
+        "requested": "[2025.0.0, )",
+        "resolved": "2025.0.0",
+        "contentHash": "Hwf/3Ydc7KxvjgD9pSZKLSJRsFTsxYg95YyTm6f43hcsGjmk49GsLFQt921Z9OcvUVewOggQHcmBgti+P2EPHw=="
+      },
+      "ILRepack": {
+        "type": "Transitive",
+        "resolved": "2.0.33",
+        "contentHash": "xb2h1CsOepoYwdXEPui9VcQglwABQwNf9cccZbf+acarEzF5PUp8Xx71nFXIhOgEdm6wrxAoF6xAxK4m/XFRUQ=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      }
+    }
+  }
+}

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 for Revit</Name>
+    <Description>Speckle for Revit</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

@@ -4,11 +4,19 @@
     <UseWpf>true</UseWpf>
     <RevitVersion>2022</RevitVersion>
     <DefineConstants>$(DefineConstants);REVIT2022;REVIT2022_OR_GREATER</DefineConstants>
-    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
-    <Prefer32bit>false</Prefer32bit>
     <Configurations>Debug;Release;Local</Configurations>
   </PropertyGroup>
 
+  <PropertyGroup Label="Things needed to get ancient cef buildling with modern msbuild">
+    <!--There is a weird bug or misconfiguration in cef 65.0.1 nuget that makes it pick x86 dlls if asked to build x64.-->
+    <!--Asking it to build AnyCPU appaers to work, but generates MSB3270 warnings, which we are ignoring here-->
+    <!--Official docs suggest setting the entire solution to x64, which we can't do, and we don't want to create a new SLN just for Revit 2022-->
+    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
+    <Prefer32bit>false</Prefer32bit>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+  
+
   <Import Project="..\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems" Label="Shared" />
 
   <Import Project="..\Speckle.Connectors.RevitShared.Cef\Speckle.Connectors.RevitShared.Cef.projitems" Label="Shared" />
@@ -27,12 +35,11 @@
   <ItemGroup>
     <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="..\Speckle.Connectors.Revit.Common\Speckle.Connectors.Revit.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="CefSharp.Wpf" NoWarn="NU1903, NU1902" VersionOverride="65.0.1" />
-    <PackageReference Include="Revit.Async" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -36,12 +36,6 @@
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
-      "Revit.Async": {
-        "type": "Direct",
-        "requested": "[2.1.1, )",
-        "resolved": "2.1.1",
-        "contentHash": "aK6R/fxrn3jpiKc8LYqfWZ+OfEKNnwgkiln1uyuvaPnTWBOvfiisnOfe7+Sgogr4iEuMmuMDsmBRMCycMlUpnw=="
-      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.6, )",
@@ -287,28 +281,32 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
         "type": "Project"
       },
+      "speckle.connectors.revit.common": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Revit.API": "[2022.0.2.1, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.revit2022": {
@@ -353,11 +351,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Revit.API": {
@@ -368,9 +366,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -380,14 +378,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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 for Revit</Name>
+    <Description>Speckle for Revit</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

@@ -26,12 +26,11 @@
   <ItemGroup>
     <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="..\Speckle.Connectors.Revit.Common\Speckle.Connectors.Revit.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="CefSharp.Wpf" IncludeAssets="compile" NoWarn="NU1903" />
-    <PackageReference Include="Revit.Async" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -36,12 +36,6 @@
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
-      "Revit.Async": {
-        "type": "Direct",
-        "requested": "[2.1.1, )",
-        "resolved": "2.1.1",
-        "contentHash": "aK6R/fxrn3jpiKc8LYqfWZ+OfEKNnwgkiln1uyuvaPnTWBOvfiisnOfe7+Sgogr4iEuMmuMDsmBRMCycMlUpnw=="
-      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.6, )",
@@ -287,28 +281,32 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
         "type": "Project"
       },
+      "speckle.connectors.revit.common": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Revit.API": "[2022.0.2.1, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.revit2023": {
@@ -353,11 +351,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Revit.API": {
@@ -368,9 +366,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -380,14 +378,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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 for Revit</Name>
+    <Description>Speckle for Revit</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

@@ -26,12 +26,11 @@
   <ItemGroup>
     <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="..\Speckle.Connectors.Revit.Common\Speckle.Connectors.Revit.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="CefSharp.Wpf" IncludeAssets="compile" NoWarn="NU1903" VersionOverride="105.03.390.0" />
-    <PackageReference Include="Revit.Async" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -36,12 +36,6 @@
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
-      "Revit.Async": {
-        "type": "Direct",
-        "requested": "[2.1.1, )",
-        "resolved": "2.1.1",
-        "contentHash": "aK6R/fxrn3jpiKc8LYqfWZ+OfEKNnwgkiln1uyuvaPnTWBOvfiisnOfe7+Sgogr4iEuMmuMDsmBRMCycMlUpnw=="
-      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.6, )",
@@ -287,28 +281,32 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
         "type": "Project"
       },
+      "speckle.connectors.revit.common": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Revit.API": "[2022.0.2.1, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.revit2024": {
@@ -353,11 +351,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Revit.API": {
@@ -368,9 +366,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -380,14 +378,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     }
   }

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 for Revit</Name>
+    <Description>Speckle for Revit</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

@@ -19,12 +19,11 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Converters\Revit\Speckle.Converters.Revit2025\Speckle.Converters.Revit2025.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI\Speckle.Connectors.DUI.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    <ProjectReference Include="..\Speckle.Connectors.Revit.Common\Speckle.Connectors.Revit.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="CefSharp.Wpf.NETCore" NoWarn="NU1903" IncludeAssets="compile" VersionOverride="119.4.30.0" />
-    <PackageReference Include="Revit.Async" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -36,12 +36,6 @@
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
-      "Revit.Async": {
-        "type": "Direct",
-        "requested": "[2.1.1, )",
-        "resolved": "2.1.1",
-        "contentHash": "aK6R/fxrn3jpiKc8LYqfWZ+OfEKNnwgkiln1uyuvaPnTWBOvfiisnOfe7+Sgogr4iEuMmuMDsmBRMCycMlUpnw=="
-      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.6, )",
@@ -237,28 +231,32 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.2.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )",
+          "Speckle.Sdk": "[3.3.6, )",
+          "Speckle.Sdk.Dependencies": "[3.3.6, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.2.0, )",
-          "Speckle.Sdk.Dependencies": "[3.2.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
         "type": "Project"
       },
+      "speckle.connectors.revit.common": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.Revit.API": "[2025.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.2.0, )"
+          "Speckle.Objects": "[3.3.6, )"
         }
       },
       "speckle.converters.revit2025": {
@@ -303,11 +301,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "ZgsbDz31Rq87Gtej2soLjTTBaRnnERKvs0QCT2AjGD4Vn5QwqnagPDqFTndWz+w6vG4t2hZH56QfqAmyIiuPag==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "zSNOgVwTXu/27oG2OLfJbgi3Myhx23KWFdnVHF+feFEHlnE6PstpnEZRqduoZDQL0FJyEva+nmiBnpZSRe5LSw==",
         "dependencies": {
-          "Speckle.Sdk": "3.2.0"
+          "Speckle.Sdk": "3.3.6"
         }
       },
       "Speckle.Revit.API": {
@@ -318,9 +316,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "DI3ljov8FMIAIosm3quAXlgYKWS+AJriaFC9dGBJh4y1xg4jvD8Tpx4h7Wd3Bib9BsH6Bhe5BUwACLv7dJKxIg==",
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "VHSah5DYRv6OIHPr7ztArgiZNKEs/SRCz0JfLnK+otVZb1awWj4xW2DA2Bb6I466IdUd24fOEJdFRaTHA/X+mw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -329,14 +327,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.2.0"
+          "Speckle.Sdk.Dependencies": "3.3.6"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.2.0, )",
-        "resolved": "3.2.0",
-        "contentHash": "wgUjHJN8lPF47tAht+2gm8yF2dIQXxTXhoJttzb+89o2ej1jrdwxTUQP1EtfjnixK6QApJ809QQqTbJm5sdaqA=="
+        "requested": "[3.3.6, )",
+        "resolved": "3.3.6",
+        "contentHash": "qwbk9BAR1QZIAwphhwMXz5ftCUYXy2oOm9/Jg57MNeaxLZ8MFooygVwX/ETG4avR8bO+VLqoteBJjWl/yYlRLQ=="
       }
     },
     "net8.0-windows7.0/win-x64": {