Merge pull request #684 from specklesystems/dev

Merge dev into main

.config/dotnet-tools.json

@@ -9,10 +9,10 @@
       ],
       "rollForward": false
     },
-    "gitversion.tool": {
-      "version": "6.0.2",
+    "dotnet-affected": {
+      "version": "5.0.0",
       "commands": [
-        "dotnet-gitversion"
+        "dotnet-affected"
       ],
       "rollForward": false
     }

.github/workflows/pr.yml

@@ -34,6 +34,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v4

.github/workflows/release.yml

@@ -2,12 +2,14 @@ name: .NET Build and Publish
 
 on:
   push:
-    branches: ["main", "dev", "release/*"] # Continuous delivery on every long-lived branch
+    branches: ["main", "installer-test/**"]
     tags: ["v3.*"] # Manual delivery on every 3.x tag
 
 jobs:
   build-windows:
     runs-on: windows-latest
+    env:
+      SPECKLE_VERSION: "unset"
     outputs:
       version: ${{ steps.set-version.outputs.version }}
     steps:
@@ -27,38 +29,35 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name: ⚒️ Run GitVersion on Windows
-        run: ./build.ps1 build-server-version
-
       - name: ⚒️ Run build on Windows
-        run: ./build.ps1
+        run: ./build.ps1 zip
 
       - name: ⬆️ Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: output-${{ env.GitVersion_FullSemVer }}
+          name: output-${{ env.SPECKLE_VERSION }}
           path: output/*.*
-          compression-level: 0 # no compression
-
+          if-no-files-found: error
+          retention-days: 1
+          compression-level: 0 # no compression      
       - id: set-version
         name: Set version to output
-        run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$Env:GITHUB_OUTPUT"
+        run: echo "version=${{ env.SPECKLE_VERSION }}" >> "$Env:GITHUB_OUTPUT"
 
   deploy-installers:
     runs-on: ubuntu-latest
     needs: build-windows
     env:
-      IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
-      IS_RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release/') || github.ref_name == 'main'}}
+      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
-        continue-on-error: true
         with:
           workflow: Build Installers
           repo: specklesystems/connector-installers
           token: ${{ secrets.CONNECTORS_GH_TOKEN }}
-          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build-windows.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }}, "store_artifacts": ${{ env.IS_RELEASE_BRANCH }} }'
+          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build-windows.outputs.version }}", "public_release": ${{ env.IS_PUBLIC_RELEASE }}, "store_artifacts": ${{ env.IS_TEST_INSTALLER }} }'
           ref: main
           wait-for-completion: true
           wait-for-completion-interval: 10s
@@ -89,9 +88,6 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name: ⚒️ Run GitVersion on Linux
-        run: ./build.sh build-server-version
-
       - name: ⚒️ Run tests on Linux
         run: ./build.sh test-only
 
@@ -105,4 +101,5 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Push to nuget.org
+        if: (github.ref_type == 'tag')
         run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{secrets.CONNECTORS_NUGET_TOKEN }} --skip-duplicate

Build/Affected.cs

@@ -0,0 +1,119 @@
+using GlobExpressions;
+using Microsoft.Build.Construction;
+using static SimpleExec.Command;
+
+namespace Build;
+
+public static class Affected
+{
+  public static readonly string Root = Environment.CurrentDirectory;
+  public const string AFFECTED_PROJECT = "affected.proj";
+
+  private static IEnumerable<string> GetAffectedProjects()
+  {
+    var projFile = Path.Combine(Root, AFFECTED_PROJECT);
+    Console.WriteLine("Affected project file: " + projFile);
+    var project = ProjectRootElement.Open(projFile) ?? throw new InvalidOperationException();
+    var references = project.ItemGroups.SelectMany(x => x.Items).Where(x => x.ItemType == "ProjectReference");
+
+    foreach (var refe in references)
+    {
+      var referencePath = refe.Include[(Root.Length + 1)..];
+      referencePath = Path.GetDirectoryName(referencePath) ?? throw new InvalidOperationException();
+      if (Path.DirectorySeparatorChar != '/')
+      {
+        referencePath = referencePath.Replace(Path.DirectorySeparatorChar, '/');
+      }
+
+      yield return referencePath;
+    }
+  }
+
+  public static async Task<IEnumerable<string>> GetTestProjects()
+  {
+    await ComputeAffected();
+    var projFile = Path.Combine(Root, AFFECTED_PROJECT);
+    if (File.Exists(projFile))
+    {
+      var references = GetAffectedProjects();
+      return references.Where(x => x.Contains("Tests"));
+    }
+    return Glob.Files(Root, "**/*.Tests.csproj");
+  }
+
+  public static async Task<ProjectGroup[]> GetAffectedProjectGroups()
+  {
+    await ComputeAffected();
+    var projFile = Path.Combine(Root, AFFECTED_PROJECT);
+    if (File.Exists(projFile))
+    {
+      var references = GetAffectedProjects().ToList();
+      var groups = new List<ProjectGroup>();
+      foreach (var projectGroup in Consts.ProjectGroups)
+      {
+        foreach (var referencePath in references)
+        {
+          if (projectGroup.Projects.Any(x => x.ProjectPath.Contains(referencePath)))
+          {
+            groups.Add(projectGroup);
+            break;
+          }
+        }
+      }
+
+      foreach (var group in groups)
+      {
+        Console.WriteLine("Affected project group being built: " + group.HostAppSlug);
+      }
+
+      if (groups.Count > 0)
+      {
+        return groups.ToArray();
+      }
+    }
+
+    Console.WriteLine("Using all project groups: " + string.Join(',', Consts.ProjectGroups));
+    return Consts.ProjectGroups;
+  }
+
+  private static bool s_affectedComputed;
+
+  public static async Task ComputeAffected()
+  {
+    if (s_affectedComputed)
+    {
+      return;
+    }
+
+    var currentTag = await Versions.GetCurrentTag();
+    var currentVersion = await Versions.ComputeVersion();
+    var lastTag = await Versions.GetPreviousTag(currentTag);
+    var lastVersion = await Versions.ComputePreviousVersion(currentTag);
+
+    Console.WriteLine($"Last tag: {lastTag}, Current tag: {currentTag}");
+    Console.WriteLine($"Last parsed version: {lastVersion}, Current parsed version: {currentVersion}");
+
+    var sort = currentVersion.CompareSortOrderTo(lastVersion);
+    if (sort == -1)
+    {
+      Console.WriteLine($"Current version {currentVersion} is less than: {lastVersion}");
+      s_affectedComputed = true;
+      return;
+    }
+
+    var majorEquals = currentVersion.Major == lastVersion.Major;
+    if (!majorEquals)
+    {
+      Console.WriteLine($"Current version {currentVersion} is not matching major version: {lastVersion}");
+      s_affectedComputed = true;
+      return;
+    }
+
+    //use tags no matter the version if major versions match
+    var (currentCommit, _) = await ReadAsync("git", $"rev-list -n 1 {currentTag}");
+    var (lastCommit, _) = await ReadAsync("git", $"rev-list -n 1 {lastTag}");
+    await RunAsync("dotnet", $"affected -v --from {currentCommit.Trim()} --to {lastCommit.Trim()}", Root);
+
+    s_affectedComputed = true;
+  }
+}

Build/Build.csproj

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

Build/Consts.cs

@@ -4,7 +4,7 @@ public static class Consts
 {
   public static readonly string[] Solutions = ["Speckle.Connectors.sln"];
 
-  public static readonly InstallerProject[] InstallerManifests =
+  public static readonly ProjectGroup[] ProjectGroups =
   {
     new("arcgis", [new("Connectors/ArcGIS/Speckle.Connectors.ArcGIS3", "net6.0-windows")]),
     new(
@@ -53,7 +53,7 @@ public static class Consts
       ]
     ),
     new(
-      "tekla-structures",
+      "teklastructures",
       [
         new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
         new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
@@ -69,7 +69,7 @@ public static class Consts
   };
 }
 
-public readonly record struct InstallerProject(string HostAppSlug, IReadOnlyList<InstallerAsset> Projects)
+public readonly record struct ProjectGroup(string HostAppSlug, IReadOnlyList<InstallerAsset> Projects)
 {
   public override string ToString() => $"{HostAppSlug}";
 }

Build/Program.cs

@@ -12,13 +12,12 @@ const string TEST = "test";
 const string TEST_ONLY = "test-only";
 const string FORMAT = "format";
 const string ZIP = "zip";
-const string VERSION = "version";
 const string RESTORE_TOOLS = "restore-tools";
-const string BUILD_SERVER_VERSION = "build-server-version";
 const string CLEAN_LOCKS = "clean-locks";
 const string CHECK_SOLUTIONS = "check-solutions";
 const string DEEP_CLEAN = "deep-clean";
 const string DEEP_CLEAN_LOCAL = "deep-clean-local";
+const string DETECT_AFFECTED = "detect-affected";
 
 //need to pass arguments
 /*var arguments = new List<string>();
@@ -34,14 +33,14 @@ void Build(string solution, string configuration)
   Console.WriteLine();
   Console.WriteLine($"Building solution '{solution}' as '{configuration}'");
   Console.WriteLine();
-  Run("dotnet", $"build .\\{solution} --configuration {configuration} --no-restore");
+  Run("dotnet", $"build \".\\{solution}\" --configuration {configuration} --no-restore");
 }
 void Restore(string solution)
 {
   Console.WriteLine();
   Console.WriteLine($"Restoring solution '{solution}'");
   Console.WriteLine();
-  Run("dotnet", $"restore .\\{solution} --no-cache");
+  Run("dotnet", $"restore \".\\{solution}\" --no-cache");
 }
 void DeleteFiles(string pattern)
 {
@@ -125,17 +124,6 @@ Target(
   }
 );
 
-Target(
-  VERSION,
-  async () =>
-  {
-    var (output, _) = await ReadAsync("dotnet", "minver -v w");
-    output = output.Trim();
-    Console.WriteLine($"Version: {output}");
-    Run("echo", $"\"version={output}\" >> $GITHUB_OUTPUT");
-  }
-);
-
 Target(
   RESTORE_TOOLS,
   () =>
@@ -144,6 +132,18 @@ Target(
   }
 );
 
+Target(
+  DETECT_AFFECTED,
+  DependsOn(RESTORE_TOOLS),
+  async () =>
+  {
+    foreach (var group in await Affected.GetAffectedProjectGroups())
+    {
+      Console.WriteLine("Affected project group being built: " + group.HostAppSlug);
+    }
+  }
+);
+
 Target(
   FORMAT,
   DependsOn(RESTORE_TOOLS),
@@ -155,20 +155,14 @@ Target(
 
 Target(
   RESTORE,
-  DependsOn(FORMAT),
+  DependsOn(FORMAT, DETECT_AFFECTED),
   Consts.Solutions,
-  s =>
+  async s =>
   {
-    Run("dotnet", $"restore {s} --locked-mode");
-  }
-);
-
-Target(
-  BUILD_SERVER_VERSION,
-  DependsOn(RESTORE_TOOLS),
-  () =>
-  {
-    Run("dotnet", "tool run dotnet-gitversion /output json /output buildserver");
+    var version = await Versions.ComputeVersion();
+    var fileVersion = await Versions.ComputeFileVersion();
+    Console.WriteLine($"Restoring: {s} - Version: {version} & {fileVersion}");
+    await RunAsync("dotnet", $"restore \"{s}\" --locked-mode");
   }
 );
 
@@ -176,14 +170,14 @@ Target(
   BUILD,
   DependsOn(RESTORE),
   Consts.Solutions,
-  s =>
+  async s =>
   {
-    var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild";
-    var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0";
-    Console.WriteLine($"Version: {version} & {fileVersion}");
-    Run(
+    var version = await Versions.ComputeVersion();
+    var fileVersion = await Versions.ComputeFileVersion();
+    Console.WriteLine($"Restoring: {s} - Version: {version} & {fileVersion}");
+    await RunAsync(
       "dotnet",
-      $"build {s} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+      $"build \"{s}\" -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
     );
   }
 );
@@ -193,23 +187,26 @@ Target(CHECK_SOLUTIONS, Solutions.CompareConnectorsToLocal);
 Target(
   TEST,
   DependsOn(BUILD, CHECK_SOLUTIONS),
-  Glob.Files(".", "**/*.Tests.csproj"),
-  file =>
+  async () =>
   {
-    Run("dotnet", $"test {file} -c Release --no-build --no-restore --verbosity=minimal");
+    foreach (var s in await Affected.GetTestProjects())
+    {
+      await RunAsync("dotnet", $"test \"{s}\" -c Release --no-build --no-restore --verbosity=minimal");
+    }
   }
 );
 
+//all tests on purpose
 Target(
   TEST_ONLY,
   DependsOn(FORMAT),
   Glob.Files(".", "**/*.Tests.csproj"),
   file =>
   {
-    Run("dotnet", $"build {file} -c Release --no-incremental");
+    Run("dotnet", $"build \"{file}\" -c Release --no-incremental");
     Run(
       "dotnet",
-      $"test {file} -c Release --no-build --verbosity=minimal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning"
+      $"test \"{file}\" -c Release --no-build --verbosity=minimal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning"
     );
   }
 );
@@ -218,20 +215,20 @@ Target(
   BUILD_LINUX,
   DependsOn(FORMAT),
   Glob.Files(".", "**/Speckle.Importers.Ifc.csproj"),
-  file =>
+  async file =>
   {
-    Run("dotnet", $"restore {file} --locked-mode");
-    var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild";
-    var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0";
+    await RunAsync("dotnet", $"restore \"{file}\" --locked-mode");
+    var version = await Versions.ComputeVersion();
+    var fileVersion = await Versions.ComputeFileVersion();
     Console.WriteLine($"Version: {version} & {fileVersion}");
-    Run(
+    await RunAsync(
       "dotnet",
-      $"build {file} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+      $"build \"{file}\" -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
     );
 
-    RunAsync(
+    await RunAsync(
       "dotnet",
-      $"pack {file} -c Release -o output --no-build -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+      $"pack \"{file}\" -c Release -o output --no-build -p:Version={version} -p:FileVersion={fileVersion} -v:m"
     );
   }
 );
@@ -239,47 +236,54 @@ Target(
 Target(
   ZIP,
   DependsOn(TEST),
-  Consts.InstallerManifests,
-  x =>
+  async () =>
   {
-    var outputDir = Path.Combine(".", "output");
-    var slugDir = Path.Combine(outputDir, x.HostAppSlug);
-
-    Directory.CreateDirectory(outputDir);
-    Directory.CreateDirectory(slugDir);
-
-    foreach (var asset in x.Projects)
+    var version = await Versions.ComputeVersion();
+    foreach (var group in await Affected.GetAffectedProjectGroups())
     {
-      var fullPath = Path.Combine(".", asset.ProjectPath, "bin", "Release", asset.TargetName);
-      if (!Directory.Exists(fullPath))
+      Console.WriteLine($"Zipping: {group.HostAppSlug} as {version}");
+      var outputDir = Path.Combine(".", "output");
+      var slugDir = Path.Combine(outputDir, group.HostAppSlug);
+
+      Directory.CreateDirectory(outputDir);
+      Directory.CreateDirectory(slugDir);
+
+      foreach (var asset in group.Projects)
       {
-        throw new InvalidOperationException("Could not find: " + fullPath);
+        var fullPath = Path.Combine(".", asset.ProjectPath, "bin", "Release", asset.TargetName);
+        if (!Directory.Exists(fullPath))
+        {
+          throw new InvalidOperationException("Could not find: " + fullPath);
+        }
+
+        var assetName = Path.GetFileName(asset.ProjectPath);
+        var connectorDir = Path.Combine(slugDir, assetName);
+
+        Directory.CreateDirectory(connectorDir);
+        foreach (var directory in Directory.EnumerateDirectories(fullPath, "*", SearchOption.AllDirectories))
+        {
+          Directory.CreateDirectory(directory.Replace(fullPath, connectorDir));
+        }
+
+        foreach (var file in Directory.EnumerateFiles(fullPath, "*", SearchOption.AllDirectories))
+        {
+          Console.WriteLine(file);
+          File.Copy(file, file.Replace(fullPath, connectorDir), true);
+        }
       }
 
-      var assetName = Path.GetFileName(asset.ProjectPath);
-      var connectorDir = Path.Combine(slugDir, assetName);
-
-      Directory.CreateDirectory(connectorDir);
-      foreach (var directory in Directory.EnumerateDirectories(fullPath, "*", SearchOption.AllDirectories))
-      {
-        Directory.CreateDirectory(directory.Replace(fullPath, connectorDir));
-      }
-
-      foreach (var file in Directory.EnumerateFiles(fullPath, "*", SearchOption.AllDirectories))
-      {
-        Console.WriteLine(file);
-        File.Copy(file, file.Replace(fullPath, connectorDir), true);
-      }
+      var outputPath = Path.Combine(outputDir, $"{group.HostAppSlug}.zip");
+      File.Delete(outputPath);
+      Console.WriteLine($"Zipping: '{slugDir}' to '{outputPath}'");
+      ZipFile.CreateFromDirectory(slugDir, outputPath);
     }
 
-    var outputPath = Path.Combine(outputDir, $"{x.HostAppSlug}.zip");
-    File.Delete(outputPath);
-    Console.WriteLine($"Zipping: '{slugDir}' to '{outputPath}'");
-    ZipFile.CreateFromDirectory(slugDir, outputPath);
-    // Directory.Delete(slugDir, true);
+    string githubEnv = Environment.GetEnvironmentVariable("GITHUB_ENV") ?? "Unset";
+    Console.WriteLine($"GITHUB_ENV: {githubEnv}");
+    File.AppendAllText(githubEnv, $"SPECKLE_VERSION={version}{Environment.NewLine}");
   }
 );
 
-Target("default", DependsOn(FORMAT, ZIP), () => Console.WriteLine("Done!"));
+Target("default", DependsOn(TEST), () => Console.WriteLine("Done!"));
 
 await RunTargetsAndExitAsync(args).ConfigureAwait(true);

Build/Versions.cs

@@ -0,0 +1,79 @@
+using Semver;
+using static SimpleExec.Command;
+
+namespace Build;
+
+public static class Versions
+{
+  private static string? s_currentTag;
+  private static SemVersion? s_currentVersion;
+
+  public static async Task<string> GetCurrentTag()
+  {
+    if (s_currentTag is not null)
+    {
+      return s_currentTag;
+    }
+    //finds current tag or makes one
+    var (currentTag, _) = await ReadAsync("git", "describe --tags");
+    currentTag = currentTag.Trim();
+    s_currentTag = currentTag;
+    return s_currentTag;
+  }
+
+  public static async Task<SemVersion> ComputeVersion()
+  {
+    if (s_currentVersion is not null)
+    {
+      return s_currentVersion;
+    }
+    var currentTag = await GetCurrentTag();
+
+    if (!SemVersion.TryParse(currentTag, SemVersionStyles.AllowLowerV, out var currentVersion))
+    {
+      throw new InvalidOperationException($"Could not parse version: '{currentTag}'");
+    }
+    s_currentVersion = currentVersion;
+    return s_currentVersion;
+  }
+
+  private static string? s_currentFileVersion;
+
+  public static async Task<string> ComputeFileVersion()
+  {
+    if (s_currentFileVersion is not null)
+    {
+      return s_currentFileVersion;
+    }
+    var currentVersion = await ComputeVersion();
+    s_currentFileVersion = currentVersion.WithoutPrereleaseOrMetadata() + ".0";
+    return s_currentFileVersion;
+  }
+
+  public static async Task<string> GetPreviousTag(string currentTag)
+  {
+    //finds a tag starting with current tag and adds no abbrevation
+    var (lastTag, _) = await ReadAsync("git", $"describe --abbrev=0 --tags {currentTag}^");
+    lastTag = lastTag.Trim();
+
+    return lastTag;
+  }
+
+  private static SemVersion? s_previousVersion;
+
+  public static async Task<SemVersion> ComputePreviousVersion(string currentTag)
+  {
+    if (s_previousVersion is not null)
+    {
+      return s_previousVersion;
+    }
+    var lastTag = await GetPreviousTag(currentTag);
+
+    if (!SemVersion.TryParse(lastTag, SemVersionStyles.AllowLowerV, out var lastVersion))
+    {
+      throw new InvalidOperationException($"Could not parse version: '{lastTag}'");
+    }
+    s_previousVersion = lastVersion;
+    return s_previousVersion;
+  }
+}

Build/packages.lock.json

@@ -53,6 +53,15 @@
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
+      "Semver": {
+        "type": "Direct",
+        "requested": "[3.0.0, )",
+        "resolved": "3.0.0",
+        "contentHash": "9jZCicsVgTebqkAujRWtC9J1A5EQVlu0TVKHcgoCuv345ve5DYf4D1MjhKEnQjdRZo6x/vdv6QQrYFs7ilGzLA==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "5.0.1"
+        }
+      },
       "SimpleExec": {
         "type": "Direct",
         "requested": "[12.0.0, )",
@@ -75,6 +84,11 @@
         "resolved": "8.0.0",
         "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
       },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "5.0.1",
+        "contentHash": "5WPSmL4YeP7eW+Vc8XZ4DwjYWBAiSwDV9Hm63JJWcz1Ie3Xjv4KuJXzgCstj48LkLfVCYa7mLcx7y+q6yqVvtw=="
+      },
       "Microsoft.NET.StringTools": {
         "type": "Transitive",
         "resolved": "17.11.4",

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

@@ -46,6 +46,7 @@ public sealed class ArcGISSendBinding : ISendBinding
   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:
@@ -71,6 +72,7 @@ public sealed class ArcGISSendBinding : ISendBinding
     IArcGISConversionSettingsFactory arcGisConversionSettingsFactory,
     MapMembersUtils mapMemberUtils,
     IThreadContext threadContext,
+    ISpeckleApplication speckleApplication,
     ITopLevelExceptionHandler topLevelExceptionHandler
   )
   {
@@ -85,6 +87,7 @@ public sealed class ArcGISSendBinding : ISendBinding
     _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
     _mapMemberUtils = mapMemberUtils;
     _threadContext = threadContext;
+    _speckleApplication = speckleApplication;
 
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
@@ -422,7 +425,7 @@ public sealed class ArcGISSendBinding : ISendBinding
         .ServiceProvider.GetRequiredService<SendOperation<MapMember>>()
         .Execute(
           mapMembers,
-          modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
+          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
           cancellationItem.Token
         );

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

@@ -67,6 +67,8 @@ public class BasicConnectorBinding : IBasicConnectorBinding
 
   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());

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

@@ -184,6 +184,7 @@ public class ArcGISColorUnpacker
     if (StoredColor is int existingColorProxyId)
     {
       AddObjectIdToColorProxyCache(rowApplicationId, existingColorProxyId);
+      return;
     }
 
     // get the color from the renderer and row

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

@@ -102,19 +102,26 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
     // 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"))
     {
-      int count = 0;
-      foreach (ADM.MapMember layer in unpackedLayers)
+      long count = 0;
+
+      foreach (var (layer, layerFeatureCount) in layersWithFeatureCount)
       {
         cancellationToken.ThrowIfCancellationRequested();
         string layerApplicationId = layer.GetSpeckleApplicationId();
@@ -142,15 +149,33 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
             switch (layer)
             {
               case ADM.FeatureLayer featureLayer:
-                List<Base> convertedFeatureLayerObjects = ConvertFeatureLayerObjects(featureLayer);
+                List<Base> convertedFeatureLayerObjects = ConvertFeatureLayerObjects(
+                  featureLayer,
+                  count,
+                  allFeaturesCount,
+                  onOperationProgressed,
+                  cancellationToken
+                );
                 layerCollection.elements.AddRange(convertedFeatureLayerObjects);
                 break;
               case ADM.RasterLayer rasterLayer:
-                List<Base> convertedRasterLayerObjects = ConvertRasterLayerObjects(rasterLayer);
+                List<Base> convertedRasterLayerObjects = ConvertRasterLayerObjects(
+                  rasterLayer,
+                  count,
+                  allFeaturesCount,
+                  onOperationProgressed,
+                  cancellationToken
+                );
                 layerCollection.elements.AddRange(convertedRasterLayerObjects);
                 break;
               case ADM.LasDatasetLayer lasDatasetLayer:
-                List<Base> convertedLasDatasetObjects = ConvertLasDatasetLayerObjects(lasDatasetLayer);
+                List<Base> convertedLasDatasetObjects = ConvertLasDatasetLayerObjects(
+                  lasDatasetLayer,
+                  count,
+                  allFeaturesCount,
+                  onOperationProgressed,
+                  cancellationToken
+                );
                 layerCollection.elements.AddRange(convertedLasDatasetObjects);
                 break;
               default:
@@ -158,6 +183,8 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
                 sdkStatus = SdkActivityStatusCode.Error;
                 break;
             }
+
+            count += layerFeatureCount;
             results.Add(new(status, layerApplicationId, layer.GetType().Name, layerCollection));
             convertingActivity?.SetStatus(sdkStatus);
           }
@@ -174,7 +201,6 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
           convertingActivity?.RecordException(ex);
         }
 
-        onOperationProgressed.Report(new("Converting", (double)++count / layers.Count));
         await Task.Yield();
       }
     }
@@ -190,7 +216,41 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
     return new RootObjectBuilderResult(rootCollection, results);
   }
 
-  private List<Base> ConvertFeatureLayerObjects(ADM.FeatureLayer featureLayer)
+  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();
@@ -204,6 +264,9 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
     {
       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)
         {
@@ -217,6 +280,8 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
           // process the object color
           _colorUnpacker.ProcessFeatureLayerColor(row, applicationId);
         }
+        // update report
+        onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
       }
     }
 
@@ -224,19 +289,38 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
   }
 
   // POC: raster colors are stored as mesh vertex colors in RasterToSpeckleConverter. Should probably move to color unpacker.
-  private List<Base> ConvertRasterLayerObjects(ADM.RasterLayer rasterLayer)
+  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)
+  private List<Base> ConvertLasDatasetLayerObjects(
+    ADM.LasDatasetLayer lasDatasetLayer,
+    long count,
+    long allFeaturesCount,
+    IProgress<CardProgress> onOperationProgressed,
+    CancellationToken cancellationToken
+  )
   {
     string layerApplicationId = lasDatasetLayer.GetSpeckleApplicationId();
     List<Base> convertedObjects = new();
@@ -250,6 +334,9 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
       {
         while (ptCursor.MoveNext())
         {
+          // allow cancellation before every point
+          cancellationToken.ThrowIfCancellationRequested();
+
           using (ACD.Analyst3D.LasPoint pt = ptCursor.Current)
           {
             Base converted = _rootToSpeckleConverter.Convert(pt);
@@ -260,6 +347,8 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
             // process the object color
             _colorUnpacker.ProcessLasLayerColor(pt, applicationId);
           }
+          // update report
+          onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
         }
       }
     }

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

@@ -226,9 +226,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -236,8 +236,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -261,7 +261,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -299,18 +299,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -320,14 +320,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     "net6.0-windows7.0/win-x64": {

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -294,7 +294,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -338,18 +338,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -359,14 +359,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -294,7 +294,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -338,18 +338,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -359,14 +359,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -295,7 +295,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -215,9 +215,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -225,8 +225,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -251,7 +251,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -295,18 +295,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -315,14 +315,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -79,6 +79,8 @@ public class AutocadBasicConnectorBinding : IBasicConnectorBinding
 
   public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
 
+  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
+
   public async Task HighlightObjects(IReadOnlyList<string> objectIds)
   {
     // POC: Will be addressed to move it into AutocadContext!

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

@@ -0,0 +1,119 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+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.Logging;
+using Speckle.Connectors.DUI.Models;
+using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Sdk;
+
+namespace Speckle.Connectors.Autocad.Bindings;
+
+public abstract class AutocadReceiveBaseBinding : IReceiveBinding
+{
+  public string Name => "receiveBinding";
+  public IBrowserBridge Parent { get; }
+
+  private readonly DocumentModelStore _store;
+  private readonly ICancellationManager _cancellationManager;
+  private readonly IServiceProvider _serviceProvider;
+  private readonly IOperationProgressManager _operationProgressManager;
+  private readonly ILogger<AutocadReceiveBinding> _logger;
+  private readonly ISpeckleApplication _speckleApplication;
+  private readonly IThreadContext _threadContext;
+
+  private ReceiveBindingUICommands Commands { get; }
+
+  protected AutocadReceiveBaseBinding(
+    DocumentModelStore store,
+    IBrowserBridge parent,
+    ICancellationManager cancellationManager,
+    IServiceProvider serviceProvider,
+    IOperationProgressManager operationProgressManager,
+    ILogger<AutocadReceiveBinding> logger,
+    ISpeckleApplication speckleApplication,
+    IThreadContext threadContext
+  )
+  {
+    _store = store;
+    _cancellationManager = cancellationManager;
+    _serviceProvider = serviceProvider;
+    _operationProgressManager = operationProgressManager;
+    _logger = logger;
+    _speckleApplication = speckleApplication;
+    _threadContext = threadContext;
+    Parent = parent;
+    Commands = new ReceiveBindingUICommands(parent);
+  }
+
+  protected abstract void InitializeSettings(IServiceProvider serviceProvider);
+
+  public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
+
+  public async Task Receive(string modelCardId) =>
+    await _threadContext.RunOnMainAsync(async () => await ReceiveInternal(modelCardId));
+
+  private async Task ReceiveInternal(string modelCardId)
+  {
+    using var scope = _serviceProvider.CreateScope();
+    InitializeSettings(scope.ServiceProvider);
+
+    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);
+
+      // Disable document activation (document creation and document switch)
+      // Not disabling results in DUI model card being out of sync with the active document
+      // The DocumentActivated event isn't usable probably because it is pushed to back of main thread queue
+      Application.DocumentManager.DocumentActivationEnabled = false;
+
+      // Receive host objects
+      var operationResults = await scope
+        .ServiceProvider.GetRequiredService<ReceiveOperation>()
+        .Execute(
+          modelCard.GetReceiveInfo(_speckleApplication.Slug),
+          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
+          cancellationItem.Token
+        );
+
+      await Commands.SetModelReceiveResult(
+        modelCardId,
+        operationResults.BakedObjectIds,
+        operationResults.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);
+    }
+    finally
+    {
+      // reenable document activation
+      Application.DocumentManager.DocumentActivationEnabled = true;
+
+      // regenerate doc to flush graphics, sometimes some objects (ellipses, nurbs curves) do not appear fully visible after receive.
+      // Adding a regen (must be run on main thread) here, but it doesn't seem to work:
+      // it's run on main thread, tried sending the "regen" string to execute, also tried regen after every object bake, but still can't fix.
+      // the objects should appear visible if you manually call the "regen" command after the operation finishes, or click on a view on the view cube which also calls regen.
+      Application.DocumentManager.CurrentDocument.Editor.Regen();
+    }
+  }
+}

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

@@ -1,34 +1,19 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 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.Logging;
 using Speckle.Connectors.DUI.Models;
-using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
 
 namespace Speckle.Connectors.Autocad.Bindings;
 
-public sealed class AutocadReceiveBinding : IReceiveBinding
+public sealed class AutocadReceiveBinding : AutocadReceiveBaseBinding
 {
-  public string Name => "receiveBinding";
-  public IBrowserBridge Parent { get; }
-
-  private readonly DocumentModelStore _store;
-  private readonly ICancellationManager _cancellationManager;
-  private readonly IServiceProvider _serviceProvider;
-  private readonly IOperationProgressManager _operationProgressManager;
-  private readonly ILogger<AutocadReceiveBinding> _logger;
   private readonly IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
-  private readonly ISpeckleApplication _speckleApplication;
-  private readonly IThreadContext _threadContext;
-
-  private ReceiveBindingUICommands Commands { get; }
 
   public AutocadReceiveBinding(
     DocumentModelStore store,
@@ -41,77 +26,24 @@ public sealed class AutocadReceiveBinding : IReceiveBinding
     ISpeckleApplication speckleApplication,
     IThreadContext threadContext
   )
+    : base(
+      store,
+      parent,
+      cancellationManager,
+      serviceProvider,
+      operationProgressManager,
+      logger,
+      speckleApplication,
+      threadContext
+    )
   {
-    _store = store;
-    _cancellationManager = cancellationManager;
-    _serviceProvider = serviceProvider;
-    _operationProgressManager = operationProgressManager;
-    _logger = logger;
     _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
-    _speckleApplication = speckleApplication;
-    _threadContext = threadContext;
-    Parent = parent;
-    Commands = new ReceiveBindingUICommands(parent);
   }
 
-  public void CancelReceive(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);
-
-  public async Task Receive(string modelCardId) =>
-    await _threadContext.RunOnMainAsync(async () => await ReceiveInternal(modelCardId));
-
-  public async Task ReceiveInternal(string modelCardId)
+  protected override void InitializeSettings(IServiceProvider serviceProvider)
   {
-    using var scope = _serviceProvider.CreateScope();
-    scope
-      .ServiceProvider.GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
+    serviceProvider
+      .GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
       .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
-    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);
-
-      // Disable document activation (document creation and document switch)
-      // Not disabling results in DUI model card being out of sync with the active document
-      // The DocumentActivated event isn't usable probably because it is pushed to back of main thread queue
-      Application.DocumentManager.DocumentActivationEnabled = false;
-
-      // Receive host objects
-      var operationResults = await scope
-        .ServiceProvider.GetRequiredService<ReceiveOperation>()
-        .Execute(
-          modelCard.GetReceiveInfo(_speckleApplication.Slug),
-          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
-          cancellationItem.Token
-        );
-
-      await Commands.SetModelReceiveResult(
-        modelCardId,
-        operationResults.BakedObjectIds,
-        operationResults.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);
-    }
-    finally
-    {
-      // reenable document activation
-      Application.DocumentManager.DocumentActivationEnabled = true;
-    }
   }
 }

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

@@ -48,7 +48,7 @@ public abstract class AutocadSendBaseBinding : ISendBinding
   /// 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 ConcurrentBag<string> ChangedObjectIds { get; set; } = new();
 
   protected AutocadSendBaseBinding(
     DocumentModelStore store,
@@ -114,21 +114,20 @@ public abstract class AutocadSendBaseBinding : ISendBinding
 
   private void OnChangeChangedObjectIds(DBObject dBObject)
   {
-    ChangedObjectIds[dBObject.GetSpeckleApplicationId()] = 1;
-    _idleManager.SubscribeToIdle(nameof(AutocadSendBinding), async () => await RunExpirationChecks());
+    ChangedObjectIds.Add(dBObject.GetSpeckleApplicationId());
+    _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), async () => await RunExpirationChecks());
   }
 
   private async Task RunExpirationChecks()
   {
     var senders = _store.GetSenders();
-    string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
     List<string> expiredSenderIds = new();
 
-    _sendConversionCache.EvictObjects(objectIdsList);
+    _sendConversionCache.EvictObjects(ChangedObjectIds);
 
     foreach (SenderModelCard modelCard in senders)
     {
-      var intersection = modelCard.SendFilter.NotNull().RefreshObjectIds().Intersect(objectIdsList).ToList();
+      var intersection = modelCard.SendFilter.NotNull().RefreshObjectIds().Intersect(ChangedObjectIds).ToList();
       bool isExpired = intersection.Count != 0;
       if (isExpired)
       {
@@ -184,7 +183,7 @@ public abstract class AutocadSendBaseBinding : ISendBinding
         .ServiceProvider.GetRequiredService<SendOperation<AutocadRootObject>>()
         .Execute(
           autocadObjects,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
           cancellationItem.Token
         );

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

@@ -83,7 +83,7 @@ public class AutocadHostObjectBuilder(
       colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
     }
 
-    // 5 - Convert atomic objects
+    // 4 - Convert atomic objects
     HashSet<ReceiveConversionResult> results = new();
     HashSet<string> bakedObjectIds = new();
     Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap = new();
@@ -116,7 +116,7 @@ public class AutocadHostObjectBuilder(
       }
     }
 
-    // 6 - Convert instances
+    // 5 - Convert instances
     var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = instanceBaker.BakeInstances(
       instanceComponentsWithPath,
       applicationIdMap,
@@ -129,7 +129,7 @@ public class AutocadHostObjectBuilder(
     results.RemoveWhere(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
     results.UnionWith(instanceConversionResults);
 
-    // 7 - Create groups
+    // 6 - Create groups
     if (unpackedRoot.GroupProxies != null)
     {
       IReadOnlyCollection<ReceiveConversionResult> groupResults = groupBaker.CreateGroups(
@@ -167,7 +167,7 @@ public class AutocadHostObjectBuilder(
         convertedEntities.Add(bakedEntity);
         break;
 
-      case List<(Entity, Base)> listConversionResult: // this is from fallback conversion for brep/brepx/subdx/extrusionx
+      case List<(Entity, Base)> listConversionResult: // this is from fallback conversion for brep/brepx/subdx/extrusionx/polycurve
         var bakedFallbackEntities = BakeObjectsAsGroup(listConversionResult, obj, layerName, baseLayerNamePrefix);
         convertedEntities.UnionWith(bakedFallbackEntities);
         break;

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

@@ -9,6 +9,7 @@
     <Import_RootNamespace>Speckle.Connectors.AutocadShared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadReceiveBaseBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadSelectionBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadReceiveBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\AutocadSendBinding.cs" />

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

@@ -268,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -278,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -304,7 +304,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -348,18 +348,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -369,14 +369,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -268,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -278,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -304,7 +304,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -348,18 +348,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -369,14 +369,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -268,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -278,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -304,7 +304,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -348,18 +348,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -369,14 +369,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -224,9 +224,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -234,8 +234,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -261,7 +261,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -305,18 +305,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -325,14 +325,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     "net8.0-windows7.0/win-x64": {

Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dReceiveBinding.cs

@@ -0,0 +1,60 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Autocad.Bindings;
+using Speckle.Connectors.Common.Cancellation;
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Models;
+using Speckle.Converters.Autocad;
+using Speckle.Converters.Civil3dShared;
+using Speckle.Converters.Common;
+using Speckle.Sdk;
+
+namespace Speckle.Connectors.Civil3dShared.Bindings;
+
+public sealed class Civil3dReceiveBinding : AutocadReceiveBaseBinding
+{
+  private readonly ICivil3dConversionSettingsFactory _civil3dConversionSettingsFactory;
+  private readonly IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
+
+  public Civil3dReceiveBinding(
+    DocumentModelStore store,
+    IBrowserBridge parent,
+    ICancellationManager cancellationManager,
+    IServiceProvider serviceProvider,
+    IOperationProgressManager operationProgressManager,
+    ILogger<AutocadReceiveBinding> logger,
+    ICivil3dConversionSettingsFactory civil3dConversionSettingsFactory,
+    IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
+    ISpeckleApplication speckleApplication,
+    IThreadContext threadContext
+  )
+    : base(
+      store,
+      parent,
+      cancellationManager,
+      serviceProvider,
+      operationProgressManager,
+      logger,
+      speckleApplication,
+      threadContext
+    )
+  {
+    _civil3dConversionSettingsFactory = civil3dConversionSettingsFactory;
+    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
+  }
+
+  // POC: we're registering the conversion settings for autocad here because we need the autocad conversion settings to be able to use the autocad typed converters.
+  // POC: We need a separate receive binding for civil3d due to using a different unit converter (needed for conversion settings construction)
+  protected override void InitializeSettings(IServiceProvider serviceProvider)
+  {
+    serviceProvider
+      .GetRequiredService<IConverterSettingsStore<Civil3dConversionSettings>>()
+      .Initialize(_civil3dConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
+
+    serviceProvider
+      .GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
+      .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
+  }
+}

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

@@ -16,16 +16,20 @@ public static class Civil3dConnectorModule
   public static void AddCivil3d(this IServiceCollection serviceCollection)
   {
     serviceCollection.AddAutocadBase();
-    serviceCollection.LoadSend();
 
-    // register civil specific send classes
+    // add send
+    serviceCollection.LoadSend();
     serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Civil3dRootObjectBuilder>();
     serviceCollection.AddSingleton<IBinding, Civil3dSendBinding>();
 
-    // automatically detects the Class:IClass interface pattern to register all generated interfaces
-    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());
+    // add receive
+    serviceCollection.LoadReceive();
+    serviceCollection.AddSingleton<IBinding, Civil3dReceiveBinding>();
 
     // additional classes
     serviceCollection.AddScoped<PropertySetDefinitionHandler>();
+
+    // automatically detects the Class:IClass interface pattern to register all generated interfaces
+    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());
   }
 }

Connectors/Autocad/Speckle.Connectors.Civil3dShared/Operations/Send/Civil3dRootObjectBuilder.cs

@@ -50,7 +50,6 @@ public sealed class Civil3dRootObjectBuilder : AutocadRootObjectBaseBuilder
     return (layer, autocadLayer);
   }
 
-  // POC: probably will need to add Network proxies as well
   public override void AddAdditionalProxiesToRoot(Collection rootObject)
   {
     rootObject[ProxyKeys.PROPERTYSET_DEFINITIONS] = _propertySetDefinitionHandler.Definitions;

Connectors/Autocad/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems

@@ -9,13 +9,13 @@
     <Import_RootNamespace>Speckle.Connectors.Civil3dShared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Bindings\Civil3dReceiveBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Civil3dConnectorModule.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Civil3dRootObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\Civil3dSendBinding.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)DependencyInjection\" />
-    <Folder Include="$(MSBuildThisFileDirectory)Bindings\" />
     <Folder Include="$(MSBuildThisFileDirectory)Operations\Send\" />
   </ItemGroup>
 </Project>

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

@@ -65,6 +65,9 @@ public class CsiSharedBasicConnectorBinding : IBasicConnectorBinding
   public void RemoveModel(ModelCard model) =>
     _topLevelExceptionHandler.CatchUnhandled(() => _threadContext.RunOnThread(() => _store.RemoveModel(model), true));
 
+  public void RemoveModels(List<ModelCard> models) =>
+    _topLevelExceptionHandler.CatchUnhandled(() => _threadContext.RunOnThread(() => _store.RemoveModels(models), true));
+
   public Task HighlightModel(string modelCardId) => Task.CompletedTask;
 
   public Task HighlightObjects(IReadOnlyList<string> objectIds) => Task.CompletedTask;

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

@@ -101,7 +101,7 @@ public sealed class CsiSharedSendBinding : ISendBinding
         .ServiceProvider.GetRequiredService<SendOperation<ICsiWrapper>>()
         .Execute(
           wrappers,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
           cancellationItem.Token
         );

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.etabs21": {
@@ -337,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -215,9 +215,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -225,8 +225,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -243,7 +243,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.etabs22": {
@@ -293,18 +293,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -313,14 +313,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.navisworks2020": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.navisworks2021": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.navisworks2022": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.navisworks2023": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.navisworks2024": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -265,9 +265,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -275,8 +275,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -293,7 +293,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.navisworks2025": {
@@ -339,18 +339,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +360,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -50,6 +50,8 @@ public class NavisworksBasicConnectorBinding : IBasicConnectorBinding
 
   public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
 
+  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
+
   public Task HighlightModel(string modelCardId) => Task.CompletedTask;
 
   public async Task HighlightObjects(IReadOnlyList<string> objectIds) =>

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

@@ -26,7 +26,7 @@ public class NavisworksSelectionBinding : ISelectionBinding
   }
 
   private void OnSelectionChange(object? o, EventArgs eventArgs) =>
-    _idleManager.SubscribeToIdle(nameof(NavisworksSelectionBinding), async () => await UpdateSelectionAsync());
+    _idleManager.SubscribeToIdle(nameof(UpdateSelectionAsync), async () => await UpdateSelectionAsync());
 
   private async Task UpdateSelectionAsync()
   {

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

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Speckle.Connector.Navisworks.Operations.Send.Filters;
 using Speckle.Connector.Navisworks.Operations.Send.Settings;
 using Speckle.Connector.Navisworks.Services;
 using Speckle.Connectors.Common.Cancellation;
@@ -30,7 +31,6 @@ public class NavisworksSendBinding : ISendBinding
 
   private readonly DocumentModelStore _store;
   private readonly IServiceProvider _serviceProvider;
-  private readonly List<ISendFilter> _sendFilters;
   private readonly ICancellationManager _cancellationManager;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<NavisworksSendBinding> _logger;
@@ -44,7 +44,6 @@ public class NavisworksSendBinding : ISendBinding
   public NavisworksSendBinding(
     DocumentModelStore store,
     IBrowserBridge parent,
-    IEnumerable<ISendFilter> sendFilters,
     IServiceProvider serviceProvider,
     ICancellationManager cancellationManager,
     IOperationProgressManager operationProgressManager,
@@ -61,7 +60,6 @@ public class NavisworksSendBinding : ISendBinding
     Commands = new SendBindingUICommands(parent);
     _store = store;
     _serviceProvider = serviceProvider;
-    _sendFilters = sendFilters.ToList();
     _cancellationManager = cancellationManager;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
@@ -76,7 +74,12 @@ public class NavisworksSendBinding : ISendBinding
 
   private static void SubscribeToNavisworksEvents() { }
 
-  public List<ISendFilter> GetSendFilters() => _sendFilters;
+  // Do not change the behavior/scope of this class on send binding unless make sure the behavior is same. Otherwise, we might not be able to update list of saved sets.
+  public List<ISendFilter> GetSendFilters() =>
+    [
+      new NavisworksSelectionFilter() { IsDefault = true },
+      new NavisworksSavedSetsFilter(new ElementSelectionService())
+    ];
 
   public List<ICardSetting> GetSendSettings() =>
     [
@@ -84,6 +87,7 @@ public class NavisworksSendBinding : ISendBinding
       new OriginModeSetting(OriginMode.ModelOrigin),
       new IncludeInternalPropertiesSetting(false),
       new ConvertHiddenElementsSetting(false),
+      new PreserveModelHierarchySetting(false),
     ];
 
   public async Task Send(string modelCardId) =>
@@ -102,9 +106,21 @@ public class NavisworksSendBinding : ISendBinding
 
       using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId);
 
-      var navisworksModelItems = GetNavisworksModelItems(modelCard);
+      var progress = _operationProgressManager.CreateOperationProgressEventHandler(
+        Parent,
+        modelCard.ModelCardId.NotNull(),
+        cancellationItem.Token
+      );
 
-      var sendResult = await ExecuteSendOperation(scope, modelCard, navisworksModelItems, cancellationItem.Token);
+      var navisworksModelItems = await GetNavisworksModelItems(modelCard, progress);
+
+      var sendResult = await ExecuteSendOperation(
+        scope,
+        modelCard,
+        navisworksModelItems,
+        progress,
+        cancellationItem.Token
+      );
 
       await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
     }
@@ -119,12 +135,16 @@ public class NavisworksSendBinding : ISendBinding
       _logger.LogModelCardHandledError(ex);
       await Commands.SetModelError(modelCardId, ex);
     }
+    finally
+    {
+      // otherwise the id of the operation persists on the cancellation manager and triggers 'Operations cancelled because of document swap!' message to UI.
+      _cancellationManager.CancelOperation(modelCardId);
+    }
   }
 
   private SenderModelCard GetModelCard(string modelCardId) =>
-    _store.GetModelById(modelCardId) is not SenderModelCard modelCard
-      ? throw new InvalidOperationException("No publish model card was found.")
-      : modelCard;
+    _store.GetModelById(modelCardId) as SenderModelCard
+    ?? throw new InvalidOperationException("No publish model card was found.");
 
   private void InitializeConverterSettings(IServiceScope scope, SenderModelCard modelCard) =>
     scope
@@ -134,43 +154,56 @@ public class NavisworksSendBinding : ISendBinding
           originMode: _toSpeckleSettingsManagerNavisworks.GetOriginMode(modelCard),
           visualRepresentationMode: _toSpeckleSettingsManagerNavisworks.GetVisualRepresentationMode(modelCard),
           convertHiddenElements: _toSpeckleSettingsManagerNavisworks.GetConvertHiddenElements(modelCard),
-          includeInternalProperties: _toSpeckleSettingsManagerNavisworks.GetIncludeInternalProperties(modelCard)
+          includeInternalProperties: _toSpeckleSettingsManagerNavisworks.GetIncludeInternalProperties(modelCard),
+          preserveModelHierarchy: _toSpeckleSettingsManagerNavisworks.GetPreserveModelHierarchy(modelCard)
         )
       );
 
-  private List<NAV.ModelItem> GetNavisworksModelItems(SenderModelCard modelCard)
+  private async Task<List<NAV.ModelItem>> GetNavisworksModelItems(
+    SenderModelCard modelCard,
+    IProgress<CardProgress> onOperationProgressed
+  )
   {
     var selectedPaths = modelCard.SendFilter.NotNull().RefreshObjectIds();
+    var convertHiddenElementsSetting =
+      modelCard.Settings!.FirstOrDefault(s => s.Id == "convertHiddenElements")?.Value as bool? ?? false;
+    var message = convertHiddenElementsSetting
+      ? "No visible objects were found to convert. Please update your publish filter!"
+      : "No objects were found to convert. Please update your publish filter, or check items are visible!";
+
     if (selectedPaths.Count == 0)
     {
-      throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
+      throw new SpeckleSendFilterException(message);
     }
+    onOperationProgressed.Report(new CardProgress("Getting selection...", null));
+    await Task.CompletedTask;
 
-    var modelItems = modelCard
-      .SendFilter.NotNull()
-      .RefreshObjectIds()
-      .Select(_selectionService.GetModelItemFromPath)
-      .SelectMany(_selectionService.GetGeometryNodes)
-      .Where(_selectionService.IsVisible)
-      .ToList();
-
-    return modelItems.Count == 0
-      ? throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!")
-      : modelItems;
+    var modelItems = new List<NAV.ModelItem>();
+    double count = 0;
+    foreach (var path in selectedPaths)
+    {
+      onOperationProgressed.Report(new CardProgress("Getting selection...", count / selectedPaths.Count));
+      await Task.CompletedTask;
+      var modelItem = _selectionService.GetModelItemFromPath(path);
+      modelItems.AddRange(_selectionService.GetGeometryNodes(modelItem).Where(_selectionService.IsVisible));
+      count++;
+    }
+    return modelItems.Count == 0 ? throw new SpeckleSendFilterException(message) : modelItems;
   }
 
   private async Task<SendOperationResult> ExecuteSendOperation(
     IServiceScope scope,
     SenderModelCard modelCard,
     List<NAV.ModelItem> navisworksModelItems,
+    IProgress<CardProgress> onOperationProgressed,
     CancellationToken token
   ) =>
     await scope
       .ServiceProvider.GetRequiredService<SendOperation<NAV.ModelItem>>()
       .Execute(
         navisworksModelItems,
-        modelCard.GetSendInfo(_speckleApplication.Slug),
-        _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCard.ModelCardId.NotNull(), token),
+        modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
+        onOperationProgressed,
         token
       );
 

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs

@@ -67,6 +67,7 @@ public static class NavisworksConnectorServiceRegistration
 
     // register filters
     serviceCollection.AddScoped<ISendFilter, NavisworksSelectionFilter>();
+    serviceCollection.AddScoped<ISendFilter, NavisworksSavedSetsFilter>();
     serviceCollection.AddScoped<IElementSelectionService, ElementSelectionService>();
   }
 }

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Extensions/ElementSelectionService.cs

@@ -1,15 +1,9 @@
-using static Speckle.Converter.Navisworks.Helpers.ElementSelectionHelper;
+using Speckle.InterfaceGenerator;
+using static Speckle.Converter.Navisworks.Helpers.ElementSelectionHelper;
 
 namespace Speckle.Connector.Navisworks.Services;
 
-public interface IElementSelectionService
-{
-  string GetModelItemPath(NAV.ModelItem modelItem);
-  NAV.ModelItem GetModelItemFromPath(string path);
-  bool IsVisible(NAV.ModelItem modelItem);
-  IReadOnlyCollection<NAV.ModelItem> GetGeometryNodes(NAV.ModelItem modelItem);
-}
-
+[GenerateAutoInterface]
 public class ElementSelectionService : IElementSelectionService
 {
   public string GetModelItemPath(NAV.ModelItem modelItem) => ResolveModelItemToIndexPath(modelItem);
@@ -18,6 +12,5 @@ public class ElementSelectionService : IElementSelectionService
 
   public bool IsVisible(NAV.ModelItem modelItem) => IsElementVisible(modelItem);
 
-  public IReadOnlyCollection<NAV.ModelItem> GetGeometryNodes(NAV.ModelItem modelItem) =>
-    ResolveGeometryLeafNodes(modelItem);
+  public IEnumerable<NAV.ModelItem> GetGeometryNodes(NAV.ModelItem modelItem) => ResolveGeometryLeafNodes(modelItem);
 }

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

@@ -43,12 +43,13 @@ public class NavisworksColorUnpacker(
     Dictionary<string, ColorProxy> colorProxies = [];
     Dictionary<string, string> mergedIds = [];
 
-    // Build mergedIds map once
     foreach (var group in groupedNodes)
     {
-      foreach (var node in group.Value)
+      string groupKey = group.Key;
+
+      foreach (var nodePath in group.Value.Select(selectionService.GetModelItemPath))
       {
-        mergedIds[selectionService.GetModelItemPath(node)] = group.Key;
+        mergedIds[nodePath] = groupKey;
       }
     }
 
@@ -56,13 +57,13 @@ public class NavisworksColorUnpacker(
     {
       try
       {
-        // Skip non-2D elements
         if (!Is2DElement(navisworksObject))
         {
           continue;
         }
 
         var navisworksObjectId = selectionService.GetModelItemPath(navisworksObject);
+
         var finalId = mergedIds.TryGetValue(navisworksObjectId, out var mergedId) ? mergedId : navisworksObjectId;
 
         var geometry = navisworksObject.Geometry;
@@ -77,7 +78,6 @@ public class NavisworksColorUnpacker(
           geometry.OriginalColor,
           defaultColor
         );
-
         var colorId = Select(
           mode,
           $"{geometry.ActiveColor.GetHashCode()}_{geometry.ActiveTransparency}".GetHashCode(),

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

@@ -77,7 +77,10 @@ public sealed class NavisworksDocumentEvents
 
     _topLevelExceptionHandler.CatchUnhandled(
       () =>
-        _idleManager.SubscribeToIdle(nameof(NavisworksDocumentEvents), async () => await ProcessModelStateChangeAsync())
+        _idleManager.SubscribeToIdle(
+          nameof(ProcessModelStateChangeAsync),
+          async () => await ProcessModelStateChangeAsync()
+        )
     );
   }
 

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

@@ -43,12 +43,13 @@ public class NavisworksMaterialUnpacker(
     Dictionary<string, RenderMaterialProxy> renderMaterialProxies = [];
     Dictionary<string, string> mergedIds = [];
 
-    // Build mergedIds map once
     foreach (var group in groupedNodes)
     {
-      foreach (var node in group.Value)
+      string groupKey = group.Key;
+
+      foreach (var nodePath in group.Value.Select(selectionService.GetModelItemPath))
       {
-        mergedIds[selectionService.GetModelItemPath(node)] = group.Key;
+        mergedIds[nodePath] = groupKey;
       }
     }
 
@@ -63,7 +64,6 @@ public class NavisworksMaterialUnpacker(
 
         var navisworksObjectId = selectionService.GetModelItemPath(navisworksObject);
         var finalId = mergedIds.TryGetValue(navisworksObjectId, out var mergedId) ? mergedId : navisworksObjectId;
-
         var geometry = navisworksObject.Geometry;
         var mode = converterSettings.Current.User.VisualRepresentationMode;
 
@@ -76,7 +76,6 @@ public class NavisworksMaterialUnpacker(
           geometry.OriginalColor,
           defaultColor
         );
-
         var renderTransparency = Select(
           mode,
           geometry.ActiveTransparency,
@@ -84,7 +83,6 @@ public class NavisworksMaterialUnpacker(
           geometry.OriginalTransparency,
           0.0
         );
-
         var renderMaterialId = Select(
           mode,
           $"{geometry.ActiveColor.GetHashCode()}_{geometry.ActiveTransparency}".GetHashCode(),

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Filters/NavisworksSavedSetsFilter.cs

@@ -0,0 +1,131 @@
+using Speckle.Connector.Navisworks.Services;
+using Speckle.Connectors.DUI.Exceptions;
+using Speckle.Connectors.DUI.Models.Card.SendFilter;
+using Speckle.Connectors.DUI.Utils;
+using Speckle.Converter.Navisworks.Constants;
+
+namespace Speckle.Connector.Navisworks.Operations.Send.Filters;
+
+public class NavisworksSavedSetsFilter : DiscriminatedObject, ISendFilterSelect
+{
+  private readonly IElementSelectionService _selectionService;
+
+  public NavisworksSavedSetsFilter(IElementSelectionService selectionService)
+  {
+    _selectionService = selectionService;
+
+    Items = [];
+    SelectedItems = [];
+
+    GetSavedSets();
+  }
+
+  public string Id { get; set; } = "navisworksSavedSets";
+  public string Name { get; set; } = "Saved Sets";
+  public string? Summary { get; set; }
+  public bool IsDefault { get; set; }
+  public List<string> SelectedObjectIds { get; set; } = [];
+  public Dictionary<string, string>? IdMap { get; set; }
+
+  public bool IsMultiSelectable { get; set; } = true;
+  public List<SendFilterSelectItem> SelectedItems { get; set; }
+  public List<SendFilterSelectItem> Items { get; set; }
+
+  public List<string> RefreshObjectIds()
+  {
+    List<string> objectIds = [];
+
+    if (SelectedItems.Count == 0)
+    {
+      return objectIds;
+    }
+
+    var selectionSets = NavisworksApp.ActiveDocument.SelectionSets;
+
+    foreach (var selectedSetGuid in SelectedItems)
+    {
+      var guid = new Guid(selectedSetGuid.Id);
+      var selectionSetItem =
+        selectionSets.ResolveGuid(guid)
+        ?? throw new SpeckleSendFilterException($"Selection set with GUID {guid} not found.");
+      var selectionSet = (NAV.SelectionSet)selectionSetItem;
+      if (selectionSet.HasSearch)
+      {
+        objectIds.AddRange(ResolveSearchSet(selectionSet.Search));
+      }
+
+      if (selectionSet.HasExplicitModelItems)
+      {
+        objectIds.AddRange(ResolveSelectionSet(selectionSet.ExplicitModelItems));
+      }
+    }
+
+    return objectIds;
+  }
+
+  private IEnumerable<string> ResolveSelectionSet(NAV.ModelItemCollection selectionSetExplicitModelItems) =>
+    selectionSetExplicitModelItems
+      .Where(_selectionService.IsVisible) // Exclude hidden elements
+      .Select(_selectionService.GetModelItemPath) // Resolve to index paths
+      .ToList();
+
+  private IEnumerable<string> ResolveSearchSet(NAV.Search selectionSetSearch) =>
+    selectionSetSearch
+      .FindAll(NavisworksApp.ActiveDocument, false)
+      .Where(_selectionService.IsVisible)
+      .Select(_selectionService.GetModelItemPath)
+      .ToList();
+
+  /// <summary>
+  /// Since it is called from constructor, it is re-called whenever UI calls SendBinding.GetSendFilters() on SendFilter dialog.
+  /// Do not change the behavior/scope of this class on send binding unless make sure the behavior is same. Otherwise, we might not be able to update list of saved sets.
+  /// </summary>
+  private void GetSavedSets()
+  {
+    List<NAV.SelectionSet> savedSetRecords = [];
+
+    CollectSavedSets(NavisworksApp.ActiveDocument.SelectionSets.RootItem, savedSetRecords);
+
+    Items = savedSetRecords
+      .Select(setRecord =>
+      {
+        string hierarchicalName = BuildHierarchicalName(setRecord);
+        return new SendFilterSelectItem(setRecord.Guid.ToString(), hierarchicalName);
+      })
+      .ToList();
+  }
+
+  private static void CollectSavedSets(NAV.SavedItem parentItem, List<NAV.SelectionSet> collectedSets)
+  {
+    if (!parentItem.IsGroup)
+    {
+      return;
+    }
+
+    foreach (NAV.SavedItem item in ((NAV.FolderItem)parentItem).Children)
+    {
+      if (item.IsGroup)
+      {
+        CollectSavedSets(item, collectedSets);
+      }
+      else
+      {
+        collectedSets.Add((NAV.SelectionSet)item);
+      }
+    }
+  }
+
+  private static string BuildHierarchicalName(NAV.SavedItem item)
+  {
+    var pathParts = new List<string> { item.DisplayName };
+
+    var current = item.Parent;
+    while (current != null && current != NavisworksApp.ActiveDocument.SelectionSets.RootItem)
+    {
+      pathParts.Insert(0, current.DisplayName);
+      current = current.Parent;
+    }
+
+    return string.Join(PathConstants.SET_SEPARATOR, pathParts);
+  }
+}

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/GeometryNodeMerger.cs

@@ -1,4 +1,5 @@
 using Speckle.Connector.Navisworks.Services;
+using Speckle.Converter.Navisworks.Constants;
 
 namespace Speckle.Connector.Navisworks.Operations.Send;
 
@@ -7,16 +8,158 @@ namespace Speckle.Connector.Navisworks.Operations.Send;
 /// </summary>
 public static class GeometryNodeMerger
 {
-  public static Dictionary<string, List<NAV.ModelItem>> GroupSiblingGeometryNodes(IReadOnlyList<NAV.ModelItem> nodes) =>
-    nodes
+  /// <summary>
+  /// Groups sibling geometry nodes based on material properties for merging.
+  /// Only merges nodes that share the same parent and have identical material properties.
+  /// </summary>
+  /// <param name="nodes">The collection of ModelItems to process</param>
+  /// <returns>Dictionary mapping parent paths (with material signature suffix) to their mergeable child nodes</returns>
+  public static Dictionary<string, List<NAV.ModelItem>> GroupSiblingGeometryNodes(IReadOnlyList<NAV.ModelItem> nodes)
+  {
+    var selectionService = new ElementSelectionService();
+
+    // Group nameless geometry nodes by parent path and material signature
+    var mergeableGroups = nodes
       .Where(node => node.HasGeometry && string.IsNullOrEmpty(node.DisplayName)) // Only anonymous geometry nodes
       .GroupBy(node =>
       {
-        var service = new ElementSelectionService();
-        var path = service.GetModelItemPath(node);
+        // Get parent path
+        var path = selectionService.GetModelItemPath(node);
         var lastSeparatorIndex = path.LastIndexOf(PathConstants.SEPARATOR);
-        return lastSeparatorIndex == -1 ? path : path[..lastSeparatorIndex];
+        var parentPath = lastSeparatorIndex == -1 ? path : path[..lastSeparatorIndex];
+
+        // Generate material signature
+        string signature = GenerateSignature(node);
+
+        // Combine parent path with signature
+        return $"{parentPath}{PathConstants.MATERIAL_SEPARATOR}{signature}";
       })
-      .Where(group => group.Count() > 1) // Only group multiples
+      .Where(group => group.Count() > 1) // Only include groups with multiple children
       .ToDictionary(group => group.Key, group => group.ToList());
+
+    return mergeableGroups;
+  }
+
+  /// <summary>
+  /// Generates a signature for a node based on material properties
+  /// </summary>
+  private static string GenerateSignature(NAV.ModelItem node)
+  {
+    var signatureProperties = new Dictionary<string, object>();
+
+    // We can as many signature defining methods as we want here
+    AddMaterialProperties(node, signatureProperties);
+
+    // When we are done adding properties, we can generate the signature
+    return GetSignature(signatureProperties);
+  }
+
+  /// <summary>
+  /// Adds material-related properties to the properties dictionary
+  /// </summary>
+  private static void AddMaterialProperties(NAV.ModelItem node, Dictionary<string, object> properties)
+  {
+    if (!node.HasGeometry || node.Geometry == null)
+    {
+      return;
+    }
+
+    var geometry = node.Geometry;
+    if (geometry.ActiveColor != null)
+    {
+      properties["ActiveColor"] = (geometry.ActiveColor.R, geometry.ActiveColor.G, geometry.ActiveColor.B);
+      properties["ActiveTransparency"] = geometry.ActiveTransparency;
+    }
+
+    // Add material name if available
+    var materialName = GetMaterialName(node);
+    if (!string.IsNullOrEmpty(materialName))
+    {
+      properties["MaterialName"] = materialName;
+    }
+  }
+
+  /// <summary>
+  /// Creates a hash-based signature from a dictionary of properties.
+  /// </summary>
+  /// <param name="properties">Dictionary containing property name/value pairs to include in the signature</param>
+  /// <param name="hashLength">Length of the returned hash string (default: 8 characters)</param>
+  /// <returns>A hash string representing the combined properties</returns>
+  private static string GetSignature(Dictionary<string, object> properties, int hashLength = 8)
+  {
+    if (properties.Count == 0)
+    {
+      return "empty";
+    }
+
+    // Build a consistent string representation of all properties
+    var hashInput = new System.Text.StringBuilder();
+
+    // Sort keys to ensure consistent order
+    var sortedKeys = properties.Keys.OrderBy(k => k).ToList();
+
+    foreach (var key in sortedKeys)
+    {
+      var value = properties[key];
+      switch (value)
+      {
+        case null:
+          continue;
+        // Format numbers with fixed precision to avoid floating point inconsistencies
+        case double doubleValue:
+          hashInput.Append($"{key}:{Math.Round(doubleValue, 6)}_");
+          break;
+        case float floatValue:
+          hashInput.Append($"{key}:{Math.Round(floatValue, 6)}_");
+          break;
+        default:
+          hashInput.Append($"{key}:{value.GetHashCode()}_");
+          break;
+      }
+    }
+
+    if (hashInput.Length == 0)
+    {
+      return "empty";
+    }
+
+    // Use MD5 hash with warning suppression
+#pragma warning disable CA5351 // Do Not Use Broken Cryptographic Algorithms
+    using var md5 = System.Security.Cryptography.MD5.Create();
+    var inputBytes = System.Text.Encoding.UTF8.GetBytes(hashInput.ToString());
+    var hashBytes = md5.ComputeHash(inputBytes);
+#pragma warning restore CA5351
+
+    var fullHashString = BitConverter.ToString(hashBytes).Replace("-", "");
+    return fullHashString[..Math.Min(hashLength, fullHashString.Length)];
+  }
+
+  /// <summary>
+  /// Extracts material name from a node if available.
+  /// </summary>
+  private static string GetMaterialName(NAV.ModelItem node)
+  {
+    // Check Item category for material name
+    var itemCategory = node.PropertyCategories.FindCategoryByDisplayName("Item");
+    if (itemCategory != null)
+    {
+      var itemProperties = itemCategory.Properties;
+      var itemMaterial = itemProperties.FindPropertyByDisplayName("Material");
+      if (itemMaterial != null && !string.IsNullOrEmpty(itemMaterial.DisplayName))
+      {
+        return itemMaterial.Value.ToDisplayString();
+      }
+    }
+
+    // Check Material category for material name
+    var materialPropertyCategory = node.PropertyCategories.FindCategoryByDisplayName("Material");
+    if (materialPropertyCategory == null)
+    {
+      return string.Empty;
+    }
+
+    var material = materialPropertyCategory.Properties;
+    var name = material.FindPropertyByDisplayName("Name");
+    return name != null && !string.IsNullOrEmpty(name.DisplayName) ? name.Value.ToDisplayString() : string.Empty;
+  }
 }

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/NavisworksHierarchyBuilder.cs

@@ -0,0 +1,146 @@
+using Speckle.Connector.Navisworks.Services;
+using Speckle.Converter.Navisworks.Constants;
+using Speckle.Converters.Common;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+
+namespace Speckle.Connector.Navisworks.Operations.Send;
+
+/// <summary>
+/// Rebuilds the Navisworks document hierarchy from converted geometry leaves while preserving
+/// the parent-child relationships between elements in the original model structure.
+/// </summary>
+public class NavisworksHierarchyBuilder
+{
+  private readonly Dictionary<string, Base?> _geometryLeaves;
+  private readonly IRootToSpeckleConverter _converter;
+  private readonly IElementSelectionService _selectionService;
+  private readonly Dictionary<string, Base> _allNodes;
+
+  /// <summary>
+  /// Initializes a new instance of the NavisworksHierarchyBuilder.
+  /// </summary>
+  /// <param name="geometryLeaves">Dictionary of path-indexed converted geometry elements</param>
+  /// <param name="converter">Converter to transform Navisworks elements to Speckle objects</param>
+  /// <param name="selectionService">Service for resolving Navisworks element paths</param>
+  public NavisworksHierarchyBuilder(
+    Dictionary<string, Base?> geometryLeaves,
+    IRootToSpeckleConverter converter,
+    IElementSelectionService selectionService
+  )
+  {
+    _geometryLeaves = geometryLeaves;
+    _converter = converter;
+    _selectionService = selectionService;
+    _allNodes = new Dictionary<string, Base>();
+  }
+
+  /// <summary>
+  /// Constructs a hierarchical tree of Speckle objects that mirrors the Navisworks document structure.
+  /// </summary>
+  /// <returns>List of root-level Speckle Base objects containing the full hierarchy</returns>
+  public List<Base> BuildHierarchy()
+  {
+    foreach (var kvp in _geometryLeaves)
+    {
+      if (kvp.Value != null)
+      {
+        _allNodes[kvp.Key] = kvp.Value;
+      }
+    }
+
+    // For each leaf path, traverse up the document structure converting any missing ancestors
+    foreach (var nodePath in _allNodes.ToList().Select(kvp => kvp.Key))
+    {
+      ClimbUpToRoot(nodePath);
+    }
+
+    var allPaths = _allNodes.Keys.ToList();
+    allPaths.Sort(
+      (a, b) =>
+      {
+        var depthA = a.Count(c => c == PathConstants.SEPARATOR);
+        var depthB = b.Count(c => c == PathConstants.SEPARATOR);
+        return depthB.CompareTo(depthA); // <- Sort in ascending order of path length
+      }
+    );
+
+    // Link nodes to parents and identify root nodes that have no recognized parent
+    var rootCandidates = new Dictionary<string, Base>(_allNodes);
+
+    foreach (var nodePath in allPaths)
+    {
+      if (nodePath == "0")
+      {
+        continue;
+      }
+
+      var nodeBase = _allNodes[nodePath];
+      var parentPath = GetParentPath(nodePath);
+
+      if (string.IsNullOrEmpty(parentPath))
+      {
+        continue;
+      }
+
+      // Navisworks API: Add child elements to parent collections
+      if (!_allNodes.TryGetValue(parentPath, out var parentBase) || parentBase is not Collection parentCollection)
+      {
+        continue;
+      }
+
+      parentCollection.elements.Add(nodeBase);
+      rootCandidates.Remove(nodePath);
+    }
+
+    var rootNodes = rootCandidates.Values.ToList();
+    PruneEmptyCollections(rootNodes);
+
+    return rootNodes;
+  }
+
+  private void ClimbUpToRoot(string currentPath)
+  {
+    while (!string.IsNullOrEmpty(currentPath) && currentPath != "0")
+    {
+      var parentPath = GetParentPath(currentPath);
+
+      if (string.IsNullOrEmpty(parentPath))
+      {
+        return;
+      }
+
+      if (_allNodes.ContainsKey(parentPath))
+      {
+        currentPath = parentPath;
+        continue;
+      }
+
+      var parentModelItem = _selectionService.GetModelItemFromPath(parentPath);
+      var parentConverted = _converter.Convert(parentModelItem);
+      _allNodes[parentPath] = parentConverted;
+
+      currentPath = parentPath;
+    }
+  }
+
+  private static string GetParentPath(string path)
+  {
+    var idx = path.LastIndexOf(PathConstants.SEPARATOR);
+    return idx == -1 ? string.Empty : path[..idx];
+  }
+
+  private static void PruneEmptyCollections(List<Base> nodes)
+  {
+    foreach (var node in nodes.ToList())
+    {
+      if (node is not Collection collection)
+      {
+        continue;
+      }
+
+      PruneEmptyCollections(collection.elements);
+      collection.elements.RemoveAll(child => child is Collection { elements.Count: 0 });
+    }
+  }
+}

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/NavisworksRootObjectBuilder.cs

@@ -144,12 +144,27 @@ public class NavisworksRootObjectBuilder(
     Dictionary<string, List<NAV.ModelItem>> groupedNodes
   )
   {
+    // First build the grouped nodes as before
     var finalElements = new List<Base>();
     var processedPaths = new HashSet<string>();
-
     AddGroupedElements(finalElements, convertedBases, groupedNodes, processedPaths);
-    AddRemainingElements(finalElements, convertedBases, processedPaths);
 
+    // If hierarchy mode is enabled, reorganize into proper nested structure
+    if (converterSettings.Current.User.PreserveModelHierarchy)
+    {
+      var hierarchyBuilder = new NavisworksHierarchyBuilder(
+        convertedBases,
+        rootToSpeckleConverter,
+        elementSelectionService
+      );
+
+      var hierarchy = hierarchyBuilder.BuildHierarchy();
+
+      return hierarchy;
+    }
+
+    // Otherwise continue with flat mode
+    AddRemainingElements(finalElements, convertedBases, processedPaths);
     return finalElements;
   }
 
@@ -221,7 +236,8 @@ public class NavisworksRootObjectBuilder(
   /// </remarks>
   private NavisworksObject CreateNavisworksObject(string groupKey, List<Base> siblingBases)
   {
-    (string name, string path) = GetContext(groupKey);
+    string cleanParentPath = ElementSelectionHelper.GetCleanPath(groupKey);
+    (string name, string path) = GetContext(cleanParentPath);
 
     return new NavisworksObject
     {
@@ -229,7 +245,7 @@ public class NavisworksRootObjectBuilder(
       displayValue = siblingBases.SelectMany(b => b["displayValue"] as List<Base> ?? []).ToList(),
       properties = siblingBases.First()["properties"] as Dictionary<string, object?> ?? [],
       units = converterSettings.Current.Derived.SpeckleUnits,
-      applicationId = groupKey,
+      applicationId = groupKey, // Use the full composite key as applicationId to preserve uniqueness
       ["path"] = path
     };
   }

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Settings/PreserveModelHierarchySetting.cs

@@ -0,0 +1,12 @@
+using Speckle.Connectors.DUI.Settings;
+
+namespace Speckle.Connector.Navisworks.Operations.Send.Settings;
+
+public class PreserveModelHierarchySetting(bool value) : ICardSetting
+{
+  public string? Id { get; set; } = "preserveModelHierarchy";
+  public string? Title { get; set; } = "Preserve Model Hierarchy";
+  public string? Type { get; set; } = "boolean";
+  public List<string>? Enum { get; set; }
+  public object? Value { get; set; } = value;
+}

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Settings/ToSpeckleSettingsManagerNavisworks.cs

@@ -17,6 +17,7 @@ public class ToSpeckleSettingsManagerNavisworks : IToSpeckleSettingsManagerNavis
   private readonly Dictionary<string, OriginMode> _originModeCache = [];
   private readonly Dictionary<string, bool?> _convertHiddenElementsCache = [];
   private readonly Dictionary<string, bool?> _includeInternalPropertiesCache = [];
+  private readonly Dictionary<string, bool?> _preserveModelHierarchyCache = [];
 
   public ToSpeckleSettingsManagerNavisworks(ISendConversionCache sendConversionCache)
   {
@@ -120,6 +121,23 @@ public class ToSpeckleSettingsManagerNavisworks : IToSpeckleSettingsManagerNavis
     return returnValue;
   }
 
+  public bool GetPreserveModelHierarchy([NotNull] SenderModelCard modelCard)
+  {
+    var value = modelCard.Settings?.FirstOrDefault(s => s.Id == "preserveModelHierarchy")?.Value as bool?;
+
+    var returnValue = value != null && value.NotNull();
+    if (_preserveModelHierarchyCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousValue))
+    {
+      if (previousValue != returnValue)
+      {
+        EvictCacheForModelCard(modelCard);
+      }
+    }
+
+    _preserveModelHierarchyCache[modelCard.ModelCardId] = returnValue;
+    return returnValue;
+  }
+
   private void EvictCacheForModelCard(SenderModelCard modelCard)
   {
     var objectIds = modelCard.SendFilter != null ? modelCard.SendFilter.NotNull().SelectedObjectIds : [];

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/PathConstants.cs

@@ -1,6 +0,0 @@
-namespace Speckle.Connector.Navisworks;
-
-public static class PathConstants
-{
-  public const char SEPARATOR = '/';
-}

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.projitems

@@ -21,14 +21,16 @@
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksIdleManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksMaterialUnpacker.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\GeometryNodeMerger.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksHierarchyBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksRootObjectBuilder.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ConvertHiddenEleementsSetting.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\IncludeInternalPropertiesSetting.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\OriginModeSetting.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\PreserveModelHierarchySetting.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManagerNavisworks.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\VisualRepresentationSetting.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\NavisworksSelectionFilter.cs"/>
-    <Compile Include="$(MSBuildThisFileDirectory)PathConstants.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\NavisworksSavedSetsFilter.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\BrowserPane.xaml.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\DockableConnectorPane.cs"/>
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\NavisworksRibbon.xaml.cs"/>

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

@@ -287,9 +287,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -297,8 +297,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.logging": {
@@ -308,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.revit2022": {
@@ -353,11 +353,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Revit.API": {
@@ -368,9 +368,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -380,14 +380,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -287,9 +287,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -297,8 +297,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.logging": {
@@ -308,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.revit2023": {
@@ -353,11 +353,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Revit.API": {
@@ -368,9 +368,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -380,14 +380,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -287,9 +287,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -297,8 +297,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.logging": {
@@ -308,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.revit2024": {
@@ -353,11 +353,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Revit.API": {
@@ -368,9 +368,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -380,14 +380,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -237,9 +237,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -247,8 +247,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.logging": {
@@ -258,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.revit2025": {
@@ -303,11 +303,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Revit.API": {
@@ -318,9 +318,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -329,14 +329,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -82,6 +82,8 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
 
   public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
 
+  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
+
   public async Task HighlightModel(string modelCardId)
   {
     var model = _store.GetModelById(modelCardId);
@@ -103,7 +105,12 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
         var view = revitViewsFilter.GetView();
         if (view is not null)
         {
-          _revitContext.UIApplication.ActiveUIDocument.ActiveView = view;
+          await RevitTask
+            .RunAsync(() =>
+            {
+              _revitContext.UIApplication.ActiveUIDocument.ActiveView = view;
+            })
+            .ConfigureAwait(false);
         }
         return;
       }

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

@@ -8,6 +8,7 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
+using Speckle.Connectors.Revit.Plugin;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Settings;
 using Speckle.Sdk;
@@ -98,6 +99,10 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
       // 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
     }
+    catch (SpeckleRevitTaskException ex)
+    {
+      await SpeckleRevitTaskException.ProcessException(modelCardId, ex, _logger, Commands);
+    }
     catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
     {
       _logger.LogModelCardHandledError(ex);

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

@@ -1,4 +1,3 @@
-using System.Collections.Concurrent;
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.ExtensibleStorage;
 using Microsoft.Extensions.DependencyInjection;
@@ -16,6 +15,7 @@ using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Settings;
 using Speckle.Connectors.Revit.HostApp;
 using Speckle.Connectors.Revit.Operations.Send.Settings;
+using Speckle.Connectors.Revit.Plugin;
 using Speckle.Connectors.RevitShared.Operations.Send.Filters;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Helpers;
@@ -47,7 +47,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
   /// 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<ElementId, byte> ChangedObjectIds { get; set; } = new();
+  private ConcurrentHashSet<ElementId> ChangedObjectIds { get; set; } = new();
 
   public RevitSendBinding(
     IAppIdleManager idleManager,
@@ -147,7 +147,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
         .ServiceProvider.GetRequiredService<SendOperation<ElementId>>()
         .Execute(
           elementIds,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
           cancellationItem.Token
         );
@@ -160,6 +160,10 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
       // 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
     }
+    catch (SpeckleRevitTaskException ex)
+    {
+      await SpeckleRevitTaskException.ProcessException(modelCardId, ex, _logger, Commands);
+    }
     catch (Exception ex) when (!ex.IsFatal()) // UX reasons - we will report operation exceptions as model card error. We may change this later when we have more exception documentation
     {
       _logger.LogModelCardHandledError(ex);
@@ -236,17 +240,17 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
 
     foreach (ElementId elementId in addedElementIds)
     {
-      ChangedObjectIds[elementId] = 1;
+      ChangedObjectIds.Add(elementId);
     }
 
     foreach (ElementId elementId in deletedElementIds)
     {
-      ChangedObjectIds[elementId] = 1;
+      ChangedObjectIds.Add(elementId);
     }
 
     foreach (ElementId elementId in modifiedElementIds)
     {
-      ChangedObjectIds[elementId] = 1;
+      ChangedObjectIds.Add(elementId);
     }
 
     if (addedElementIds.Count > 0)
@@ -267,7 +271,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
         var selectedObjects = sender.SendFilter.NotNull().SelectedObjectIds;
         objectIds.AddRange(selectedObjects);
       }
-      var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objectIds.ToList());
+      var unpackedObjectIds = _elementUnpacker.GetUnpackedElementIds(objectIds);
       _sendConversionCache.EvictObjects(unpackedObjectIds);
     }
 
@@ -332,9 +336,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
     // }
 
     if (
-      ChangedObjectIds.Keys.Any(e =>
-        _revitContext.UIApplication.NotNull().ActiveUIDocument.Document.GetElement(e) is View
-      )
+      ChangedObjectIds.Any(e => _revitContext.UIApplication.NotNull().ActiveUIDocument.Document.GetElement(e) is View)
     )
     {
       await Commands.RefreshSendFilters();
@@ -353,7 +355,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
     }
 
     var objUniqueIds = new List<string>();
-    var changedIds = ChangedObjectIds.Keys.ToList();
+    var changedIds = ChangedObjectIds.ToList();
 
     // Handling type changes: if an element's type is changed, we need to mark as changed all objects that have that type.
     // Step 1: get any changed types
@@ -361,10 +363,10 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
       .Select(e => doc.GetElement(e))
       .OfType<ElementType>()
       .Select(el => el.Id)
-      .ToArray();
+      .ToHashSet(); // ToHashSet() for faster Contains
 
     // Step 2: Find all elements of the changed types, and add them to the changed ids list.
-    if (elementTypeIdsList.Length != 0)
+    if (elementTypeIdsList.Count != 0)
     {
       using var collector = new FilteredElementCollector(doc);
       var collectorElements = collector

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

@@ -35,7 +35,7 @@ internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, ID
 #else
 
     _revitContext.UIApplication.NotNull().SelectionChanged += (_, _) =>
-      _idleManager.SubscribeToIdle(nameof(SelectionBinding), OnSelectionChanged);
+      _idleManager.SubscribeToIdle(nameof(OnSelectionChanged), OnSelectionChanged);
 #endif
   }
 
@@ -56,15 +56,16 @@ internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, ID
     }
 
     var activeUIDoc = _revitContext.UIApplication.ActiveUIDocument.NotNull();
+    var doc = activeUIDoc.Document;
 
     // POC: this was also being called on shutdown
     // probably the bridge needs to be able to know if the plugin has been terminated
     // also on termination the OnSelectionChanged event needs unwinding
-    var selectionIds = activeUIDoc
-      .Selection.GetElementIds()
-      .Select(eid => activeUIDoc.Document.GetElement(eid).UniqueId.ToString())
-      .ToList();
-    return new SelectionInfo(selectionIds, $"{selectionIds.Count} objects selected.");
+    var selectionIds = activeUIDoc.Selection.GetElementIds();
+    //reduce allocates by allocating what we need.
+    var selectionUniqueIds = new List<string>(selectionIds.Count);
+    selectionUniqueIds.AddRange(selectionIds.Select(eid => doc.GetElement(eid).UniqueId));
+    return new SelectionInfo(selectionUniqueIds, $"{selectionIds.Count} objects selected.");
   }
 
   public void Dispose()

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

@@ -43,7 +43,7 @@ public class ElementUnpacker
   /// <remarks>
   /// This is used to invalidate object ids in the send conversion cache when the selected object id is only the parent element id
   /// </remarks>
-  public IEnumerable<string> GetUnpackedElementIds(List<string> objectIds)
+  public IEnumerable<string> GetUnpackedElementIds(IEnumerable<string> objectIds)
   {
     var doc = _revitContext.UIApplication?.ActiveUIDocument.Document!;
     var docElements = doc.GetElements(objectIds);

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

@@ -2,7 +2,7 @@ using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.ExtensibleStorage;
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Events;
-using Revit.Async;
+using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
@@ -22,6 +22,7 @@ internal sealed class RevitDocumentStore : DocumentModelStore
   private readonly DocumentModelStorageSchema _documentModelStorageSchema;
   private readonly IdStorageSchema _idStorageSchema;
   private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
+  private readonly IThreadContext _threadContext;
 
   public RevitDocumentStore(
     IAppIdleManager idleManager,
@@ -29,7 +30,8 @@ internal sealed class RevitDocumentStore : DocumentModelStore
     IJsonSerializer jsonSerializer,
     DocumentModelStorageSchema documentModelStorageSchema,
     IdStorageSchema idStorageSchema,
-    ITopLevelExceptionHandler topLevelExceptionHandler
+    ITopLevelExceptionHandler topLevelExceptionHandler,
+    IThreadContext threadContext
   )
     : base(jsonSerializer)
   {
@@ -38,6 +40,7 @@ internal sealed class RevitDocumentStore : DocumentModelStore
     _documentModelStorageSchema = documentModelStorageSchema;
     _idStorageSchema = idStorageSchema;
     _topLevelExceptionHandler = topLevelExceptionHandler;
+    _threadContext = threadContext;
 
     UIApplication uiApplication = _revitContext.UIApplication.NotNull();
 
@@ -73,7 +76,7 @@ internal sealed class RevitDocumentStore : DocumentModelStore
 
     IsDocumentInit = true;
     _idleManager.SubscribeToIdle(
-      nameof(RevitDocumentStore),
+      nameof(LoadState) + nameof(OnDocumentChanged),
       () =>
       {
         LoadState();
@@ -91,23 +94,25 @@ internal sealed class RevitDocumentStore : DocumentModelStore
       return;
     }
 
-    RevitTask.RunAsync(() =>
-    {
-      using Transaction t = new(doc, "Speckle Write State");
-      t.Start();
-      using DataStorage ds = GetSettingsDataStorage(doc) ?? DataStorage.Create(doc);
+    _threadContext
+      .RunOnMain(() =>
+      {
+        using Transaction t = new(doc, "Speckle Write State");
+        t.Start();
+        using DataStorage ds = GetSettingsDataStorage(doc) ?? DataStorage.Create(doc);
 
-      using Entity stateEntity = new(_documentModelStorageSchema.GetSchema());
-      string serializedModels = Serialize();
-      stateEntity.Set("contents", serializedModels);
+        using Entity stateEntity = new(_documentModelStorageSchema.GetSchema());
+        string serializedModels = Serialize();
+        stateEntity.Set("contents", serializedModels);
 
-      using Entity idEntity = new(_idStorageSchema.GetSchema());
-      idEntity.Set("Id", s_revitDocumentStoreId);
+        using Entity idEntity = new(_idStorageSchema.GetSchema());
+        idEntity.Set("Id", s_revitDocumentStoreId);
 
-      ds.SetEntity(idEntity);
-      ds.SetEntity(stateEntity);
-      t.Commit();
-    });
+        ds.SetEntity(idEntity);
+        ds.SetEntity(stateEntity);
+        t.Commit();
+      })
+      .FireAndForget();
   }
 
   protected override void LoadState()

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

@@ -12,6 +12,7 @@ public class SendCollectionManager
 {
   private readonly IConverterSettingsStore<RevitConversionSettings> _converterSettings;
   private readonly Dictionary<string, Collection> _collectionCache = new();
+  private readonly Dictionary<ElementId, (string name, Dictionary<string, object?> props)> _levelCache = new(); // stores level id and its properties
 
   public SendCollectionManager(IConverterSettingsStore<RevitConversionSettings> converterSettings)
   {
@@ -30,9 +31,29 @@ public class SendCollectionManager
     var doc = _converterSettings.Current.Document;
     var path = new List<string>();
 
+    // Step 0: get the level and its properties
+    string levelName = "No Level";
+    Dictionary<string, object?> levelProperties = new();
+    if (element.LevelId != ElementId.InvalidElementId)
+    {
+      if (_levelCache.TryGetValue(element.LevelId, out var cachedLevel))
+      {
+        levelName = cachedLevel.name;
+        levelProperties = cachedLevel.props;
+      }
+      else
+      {
+        var level = (Level)doc.GetElement(element.LevelId);
+        levelName = level.Name;
+        levelProperties.Add("elevation", level.Elevation);
+        levelProperties.Add("units", _converterSettings.Current.SpeckleUnits);
+        _levelCache.Add(element.LevelId, (levelName, levelProperties));
+      }
+    }
+
     // Step 1: create path components. Currently, this is
     // level > category > type
-    path.Add(doc.GetElement(element.LevelId) is not Level level ? "No level" : level.Name);
+    path.Add(levelName);
     path.Add(element.Category?.Name ?? "No category");
     var typeId = element.GetTypeId();
     if (typeId != ElementId.InvalidElementId)
@@ -57,8 +78,9 @@ public class SendCollectionManager
     string flatPathName = "";
     Collection previousCollection = rootObject;
 
-    foreach (var pathItem in path)
+    for (int i = 0; i < path.Count; i++)
     {
+      var pathItem = path[i];
       flatPathName += pathItem;
       Collection childCollection;
       if (_collectionCache.TryGetValue(flatPathName, out Collection? collection))
@@ -68,6 +90,13 @@ public class SendCollectionManager
       else
       {
         childCollection = new Collection(pathItem);
+        // add props if it's the 1st path item, representing level
+        // if the structure ever changes from level > category > type, this needs to be changed
+        if (i == 0 && levelProperties.Count > 0)
+        {
+          childCollection["properties"] = levelProperties;
+        }
+
         previousCollection.elements.Add(childCollection);
         _collectionCache[flatPathName] = childCollection;
       }

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs

@@ -40,22 +40,17 @@ public class RevitCategoriesFilter : DiscriminatedObject, ISendFilter, IRevitSen
   /// <exception cref="SpeckleSendFilterException">Whenever no view is found.</exception>
   public List<string> RefreshObjectIds()
   {
-    var objectIds = new List<string>();
     if (SelectedCategories is null)
     {
-      return objectIds;
+      return [];
     }
 
     var elementIds = SelectedCategories.Select(c => ElementIdHelper.GetElementId(c)).Where(e => e is not null).ToList();
 
     using var categoryFilter = new ElementMulticategoryFilter(elementIds);
     using var collector = new FilteredElementCollector(_doc);
-    var elements = collector
-      .WhereElementIsNotElementType()
-      .WhereElementIsViewIndependent()
-      .WherePasses(categoryFilter)
-      .ToList();
-    objectIds = elements.Select(e => e.UniqueId).ToList();
+    var elements = collector.WhereElementIsNotElementType().WhereElementIsViewIndependent().WherePasses(categoryFilter);
+    var objectIds = elements.Select(e => e.UniqueId).ToList();
     SelectedObjectIds = objectIds;
     return objectIds;
   }

Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs

@@ -53,10 +53,9 @@ public class RevitViewsFilter : DiscriminatedObject, ISendFilter, IRevitSendFilt
   /// <exception cref="SpeckleSendFilterException">Whenever no view is found.</exception>
   public List<string> RefreshObjectIds()
   {
-    var objectIds = new List<string>();
     if (SelectedView is null)
     {
-      return objectIds;
+      return [];
     }
 
     // Paşa Bilal wants it like this... (three dots = important meaning for ogu)
@@ -75,8 +74,8 @@ public class RevitViewsFilter : DiscriminatedObject, ISendFilter, IRevitSendFilt
       throw new SpeckleSendFilterException("View not found, please update your model send filter.");
     }
     using var viewCollector = new FilteredElementCollector(_doc, view.Id);
-    List<Element> elementsInView = viewCollector.ToElements().ToList();
-    objectIds = elementsInView.Select(e => e.UniqueId).ToList();
+    var elementsInView = viewCollector.ToElements();
+    var objectIds = elementsInView.Select(e => e.UniqueId).ToList();
     SelectedObjectIds = objectIds;
     return objectIds;
   }

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

@@ -1,5 +1,6 @@
 using Revit.Async;
 using Speckle.Connectors.Common.Threading;
+using Speckle.Sdk;
 
 namespace Speckle.Connectors.Revit.Plugin;
 
@@ -7,16 +8,82 @@ public class RevitThreadContext : ThreadContext
 {
   protected override Task<T> MainToWorkerAsync<T>(Func<Task<T>> action) => action();
 
-  protected override Task<T> WorkerToMainAsync<T>(Func<Task<T>> action) =>
-    RevitTask.RunAsync(async () => await action());
+  protected override Task<T> WorkerToMainAsync<T>(Func<Task<T>> action) => CatchExceptions(action);
 
   protected override Task<T> MainToWorker<T>(Func<T> action) => Task.FromResult(action());
 
-  protected override Task<T> WorkerToMain<T>(Func<T> action) => RevitTask.RunAsync(action);
+  protected override Task<T> WorkerToMain<T>(Func<T> action) => CatchExceptions(action);
 
-  protected override Task RunMainAsync(Func<Task> action) => RevitTask.RunAsync(action);
+  protected override Task RunMainAsync(Func<Task> action) => CatchExceptions(action);
 
-  protected override Task<T> RunMainAsync<T>(Func<T> action) => RevitTask.RunAsync(action);
+  protected override Task<T> RunMainAsync<T>(Func<T> action) => CatchExceptions(action);
 
-  protected override Task<T> RunMainAsync<T>(Func<Task<T>> action) => RevitTask.RunAsync(action);
+  protected override Task<T> RunMainAsync<T>(Func<Task<T>> action) => CatchExceptions(action);
+
+  private static async Task<T> CatchExceptions<T>(Func<T> action)
+  {
+    Exception? ex = null;
+    //force the usage of the application overload
+    var ret = await RevitTask.RunAsync(_ =>
+    {
+      try
+      {
+        return action();
+      }
+      catch (Exception e) when (!e.IsFatal())
+      {
+        ex = e;
+        return default;
+      }
+    });
+    if (ex is not null)
+    {
+      throw new SpeckleRevitTaskException(ex);
+    }
+    return ret!;
+  }
+
+  private static async Task<T> CatchExceptions<T>(Func<Task<T>> action)
+  {
+    Exception? ex = null;
+    //force the usage of the application overload
+    var ret = await RevitTask.RunAsync(async _ =>
+    {
+      try
+      {
+        return await action();
+      }
+      catch (Exception e) when (!e.IsFatal())
+      {
+        ex = e;
+        return default;
+      }
+    });
+    if (ex is not null)
+    {
+      throw new SpeckleRevitTaskException(ex);
+    }
+    return ret!;
+  }
+
+  private static async Task CatchExceptions(Func<Task> action)
+  {
+    Exception? ex = null;
+    //force the usage of the application overload
+    await RevitTask.RunAsync(async _ =>
+    {
+      try
+      {
+        await action();
+      }
+      catch (Exception e) when (!e.IsFatal())
+      {
+        ex = e;
+      }
+    });
+    if (ex is not null)
+    {
+      throw new SpeckleRevitTaskException(ex);
+    }
+  }
 }

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

@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Logging;
+using Speckle.Sdk;
+using Speckle.Sdk.Common;
+
+namespace Speckle.Connectors.Revit.Plugin;
+
+#pragma warning disable CA1032
+public class SpeckleRevitTaskException(Exception exception) : SpeckleException("Revit operation failed", exception)
+#pragma warning restore CA1032
+{
+  public static async Task ProcessException<T>(
+    string modelCardId,
+    SpeckleRevitTaskException ex,
+    ILogger<T> logger,
+    BasicConnectorBindingCommands commands
+  )
+    where T : IBinding
+  {
+    Exception e = ex.InnerException.NotNull();
+    while (e is SpeckleRevitTaskException srte)
+    {
+      e = srte.InnerException.NotNull();
+    }
+    if (e is 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;
+    }
+    //log everything though
+    logger.LogModelCardHandledError(ex);
+    //always process the inner exception
+    await commands.SetModelError(modelCardId, e);
+  }
+}

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

@@ -50,5 +50,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitIdleManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitThreadContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCefPlugin.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\SpeckleRevitTaskException.cs" />
   </ItemGroup>
 </Project>

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

@@ -268,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -278,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -296,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.rhino7": {
@@ -347,18 +347,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -368,14 +368,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -268,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -278,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -296,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "speckle.converters.rhino8": {
@@ -347,18 +347,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -368,14 +368,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -72,6 +72,8 @@ public sealed class RhinoBasicConnectorBinding : IBasicConnectorBinding
 
   public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
 
+  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
+
   public Task HighlightObjects(IReadOnlyList<string> objectIds)
   {
     var objects = GetObjectsFromIds(objectIds);

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

@@ -24,7 +24,7 @@ public class RhinoSelectionBinding : ISelectionBinding
   }
 
   private void OnSelectionChange(object? o, EventArgs eventArgs) =>
-    _idleManager.SubscribeToIdle(nameof(RhinoSelectionBinding), UpdateSelection);
+    _idleManager.SubscribeToIdle(nameof(UpdateSelection), UpdateSelection);
 
   private void UpdateSelection()
   {

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

@@ -113,8 +113,7 @@ public sealed class RhinoSendBinding : ISendBinding
         {
           ChangedObjectIdsInGroupsOrLayers[selectedObject.Id.ToString()] = 1;
         }
-        _idleManager.SubscribeToIdle("a", RunExpirationChecks);
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+        _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
       }
     };
 
@@ -144,7 +143,7 @@ public sealed class RhinoSendBinding : ISendBinding
         }
 
         ChangedObjectIds[e.ObjectId.ToString()] = 1;
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+        _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
       });
 
     RhinoDoc.DeleteRhinoObject += (_, e) =>
@@ -156,7 +155,7 @@ public sealed class RhinoSendBinding : ISendBinding
         }
 
         ChangedObjectIds[e.ObjectId.ToString()] = 1;
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+        _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
       });
 
     // NOTE: Catches an object's material change from one user defined doc material to another. Does not catch (as the top event is not triggered) swapping material sources for an object or moving to/from the default material (this is handled below)!
@@ -171,7 +170,7 @@ public sealed class RhinoSendBinding : ISendBinding
         if (args is RhinoDoc.RenderMaterialAssignmentChangedEventArgs changedEventArgs)
         {
           ChangedObjectIds[changedEventArgs.ObjectId.ToString()] = 1;
-          _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+          _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
         }
       });
 
@@ -187,7 +186,7 @@ public sealed class RhinoSendBinding : ISendBinding
         {
           ChangedObjectIdsInGroupsOrLayers[obj.Id.ToString()] = 1;
         }
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+        _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
       });
 
     RhinoDoc.LayerTableEvent += (_, args) =>
@@ -220,7 +219,7 @@ public sealed class RhinoSendBinding : ISendBinding
             ChangedObjectIdsInGroupsOrLayers[obj.Id.ToString()] = 1;
           }
         }
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+        _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
       });
 
     // Catches and stores changed material ids. These are then used in the expiry checks to invalidate all objects that have assigned any of those material ids.
@@ -235,7 +234,7 @@ public sealed class RhinoSendBinding : ISendBinding
         if (args.EventType == MaterialTableEventType.Modified)
         {
           ChangedMaterialIndexes[args.Index] = 1;
-          _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+          _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
         }
       });
 
@@ -260,7 +259,7 @@ public sealed class RhinoSendBinding : ISendBinding
         )
         {
           ChangedObjectIds[e.RhinoObject.Id.ToString()] = 1;
-          _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+          _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
         }
       });
 
@@ -274,7 +273,7 @@ public sealed class RhinoSendBinding : ISendBinding
 
         ChangedObjectIds[e.NewRhinoObject.Id.ToString()] = 1;
         ChangedObjectIds[e.OldRhinoObject.Id.ToString()] = 1;
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
+        _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
       });
   }
 
@@ -316,7 +315,7 @@ public sealed class RhinoSendBinding : ISendBinding
         .ServiceProvider.GetRequiredService<SendOperation<RhinoObject>>()
         .Execute(
           rhinoObjects,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
           cancellationItem.Token
         );

Connectors/Tekla/Directory.Build.targets

@@ -4,32 +4,77 @@
     <ItemGroup>
       <TeklaDlls Include="$(TargetDir)\**\*.*" Exclude="$(TargetDir)*.bmp" />
       <TeklaBmp Include="$(TargetDir)\Resources\et_element_Speckle.bmp"/>
+      <TeklaSvg Include="$(TargetDir)\Resources\speckle.svg"/>
+      <TeklaRibbonXml Include="$(TargetDir)\Resources\Speckle-Ribbon.xml"/>
     </ItemGroup>
     <Message Text="Tekla Version $(TeklaVersion)" Importance="high"/>
 
-    <!-- Delete win-arm64 folder if it exists -->
-    <RemoveDir Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native')"
-               Directories="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native" />
+    <!-- Define installation paths -->
+    <PropertyGroup>
+      <ProgramDataTeklaPath>$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0</ProgramDataTeklaPath>
+      <DirectTeklaPath>C:\TeklaStructures\$(TeklaVersion).0</DirectTeklaPath>
 
-    <RemoveDir Condition="Exists('C:\TeklaStructures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native')"
-               Directories="C:\TeklaStructures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\runtimes\win-arm64\native" />
+      <!-- Define extension and ribbon paths -->
+      <ProgramDataRibbonPath>$(ProgramDataTeklaPath)\Environments\common\system\Ribbons\CustomTabs\Modeling</ProgramDataRibbonPath>
+      <DirectRibbonPath>$(DirectTeklaPath)\Environments\common\system\Ribbons\CustomTabs\Modeling</DirectRibbonPath>
 
-    <!-- ProgramData path -->
-    <Copy Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0')"
-          DestinationFolder="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\%(RecursiveDir)"
-          SourceFiles="@(TeklaDlls)" />
+      <SpeckleExtensionPath Condition="Exists('$(ProgramDataTeklaPath)')">$(ProgramDataTeklaPath)\Environments\common\extensions\Speckle3TeklaStructures</SpeckleExtensionPath>
+      <SpeckleExtensionPath Condition="Exists('$(DirectTeklaPath)')">$(DirectTeklaPath)\Environments\common\extensions\Speckle3TeklaStructures</SpeckleExtensionPath>
+    </PropertyGroup>
 
-    <Copy Condition="Exists('$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0')"
-          DestinationFolder="$(ProgramData)\Trimble\Tekla Structures\$(TeklaVersion).0\Bitmaps"
-          SourceFiles="@(TeklaBmp)" />
+    <!-- Delete win-arm64 folder if it exists in the active installation path -->
+    <RemoveDir
+      Condition="Exists('$(SpeckleExtensionPath)\runtimes\win-arm64\native')"
+      Directories="$(SpeckleExtensionPath)\runtimes\win-arm64\native" />
 
-    <!-- TeklaStructures direct path -->
-    <Copy Condition="Exists('C:\TeklaStructures\$(TeklaVersion).0')"
-          DestinationFolder="C:\TeklaStructures\$(TeklaVersion).0\Environments\common\extensions\Speckle3TeklaStructures\%(RecursiveDir)"
-          SourceFiles="@(TeklaDlls)" />
+    <!-- Check which installation path exists for the specific version -->
+    <PropertyGroup>
+      <TeklaInstallPath Condition="Exists('$(ProgramDataTeklaPath)')">$(ProgramDataTeklaPath)</TeklaInstallPath>
+      <TeklaInstallPath Condition="Exists('$(DirectTeklaPath)')">$(DirectTeklaPath)</TeklaInstallPath>
+    </PropertyGroup>
 
-    <Copy Condition="Exists('C:\TeklaStructures\$(TeklaVersion).0')"
-          DestinationFolder="C:\TeklaStructures\$(TeklaVersion).0\Bitmaps"
-          SourceFiles="@(TeklaBmp)" />
+    <!-- Copy DLLs to extension folder -->
+    <Copy
+      Condition="'$(SpeckleExtensionPath)' != ''"
+      DestinationFolder="$(SpeckleExtensionPath)\%(RecursiveDir)"
+      SourceFiles="@(TeklaDlls)" />
+
+    <!-- Copy SVG to Resources folder -->
+    <Copy
+      Condition="'$(SpeckleExtensionPath)' != ''"
+      DestinationFolder="$(SpeckleExtensionPath)\Resources"
+      SourceFiles="@(TeklaSvg)" />
+
+    <!-- Copy BMP to Bitmaps folder -->
+    <Copy
+      Condition="'$(TeklaInstallPath)' != ''"
+      DestinationFolder="$(TeklaInstallPath)\Bitmaps"
+      SourceFiles="@(TeklaBmp)" />
+
+    <!-- Create Ribbon directories if they don't exist -->
+    <MakeDir Directories="$(ProgramDataRibbonPath)"
+             Condition="Exists('$(ProgramDataTeklaPath)') And !Exists('$(ProgramDataRibbonPath)')" />
+    <MakeDir Directories="$(DirectRibbonPath)"
+             Condition="Exists('$(DirectTeklaPath)') And !Exists('$(DirectRibbonPath)')" />
+
+    <!-- Copy the XML file to both possible destinations -->
+    <Copy
+      SourceFiles="@(TeklaRibbonXml)"
+      DestinationFolder="$(ProgramDataRibbonPath)"
+      Condition="Exists('$(ProgramDataTeklaPath)')" />
+    <Copy
+      SourceFiles="@(TeklaRibbonXml)"
+      DestinationFolder="$(DirectRibbonPath)"
+      Condition="Exists('$(DirectTeklaPath)')" />
+
+    <!-- Copy the SVG file to both possible ribbon destinations -->
+    <Copy
+      SourceFiles="@(TeklaSvg)"
+      DestinationFolder="$(ProgramDataRibbonPath)"
+      Condition="Exists('$(ProgramDataTeklaPath)')" />
+    <Copy
+      SourceFiles="@(TeklaSvg)"
+      DestinationFolder="$(DirectRibbonPath)"
+      Condition="Exists('$(DirectTeklaPath)')" />
   </Target>
 </Project>

Connectors/Tekla/Speckle.Connector.Tekla2023/Speckle.Connector.Tekla2023.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <TeklaVersion>2023</TeklaVersion>
     <UseWpf>true</UseWpf>
     <DefineConstants>$(DefineConstants);TEKLA2023</DefineConstants>

Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json

@@ -325,9 +325,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -335,8 +335,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -362,7 +362,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "LibTessDotNet": {
@@ -412,18 +412,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -433,27 +433,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
-      }
-    },
-    ".NETFramework,Version=v4.8/win-x64": {
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.1938.49, )",
-        "resolved": "1.0.1938.49",
-        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json

@@ -406,9 +406,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -416,8 +416,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -443,7 +443,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "LibTessDotNet": {
@@ -493,18 +493,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -514,14 +514,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs

@@ -60,6 +60,8 @@ public class TeklaBasicConnectorBinding : IBasicConnectorBinding
 
   public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
 
+  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
+
   public async Task HighlightModel(string modelCardId)
   {
     try

Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs

@@ -35,7 +35,7 @@ public class TeklaSelectionBinding : ISelectionBinding
   {
     lock (_selectionEventHandlerLock)
     {
-      _idleManager.SubscribeToIdle(nameof(TeklaSelectionBinding), UpdateSelection);
+      _idleManager.SubscribeToIdle(nameof(UpdateSelection), UpdateSelection);
       UpdateSelection();
     }
   }

Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs

@@ -144,7 +144,7 @@ public sealed class TeklaSendBinding : ISendBinding
         .ServiceProvider.GetRequiredService<SendOperation<ModelObject>>()
         .Execute(
           teklaObjects,
-          modelCard.GetSendInfo(_speckleApplication.Slug),
+          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
           _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
           cancellationItem.Token
         );

Connectors/Tekla/Speckle.Connector.TeklaShared/Resources/Speckle-Ribbon.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+  <Tab Header="Speckle" IsCollapsed="false" IsUserDefined="true">
+    <SimpleButton X="0" Y="0" Width="4" Height="4" Command="Plugin.CatalogPluginComponentItem?Speckle" Text="Speckle (Beta)" Icon="speckle.svg" ShowText="true" ShowIcon="true" Tooltip="Speckle Next-Gen Tekla Structures Connector"/>
+  </Tab>
+
+

Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems

@@ -13,6 +13,16 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\speckle.svg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Speckle-Ribbon.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\TeklaBasicConnectorBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\TeklaSelectionBinding.cs" />
@@ -36,4 +46,8 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)app.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\Speckle-Ribbon.xml" />
+    <Content Include="$(MSBuildThisFileDirectory)Resources\speckle.svg" />
+  </ItemGroup>
 </Project>

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

@@ -219,7 +219,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -248,18 +248,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -269,14 +269,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -258,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -287,18 +287,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -308,14 +308,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -258,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -287,18 +287,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -308,14 +308,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -259,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -269,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -287,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -331,18 +331,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -352,14 +352,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -215,9 +215,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )",
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui": {
@@ -225,8 +225,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.270, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
+          "Speckle.Sdk": "[3.1.4, )",
+          "Speckle.Sdk.Dependencies": "[3.1.4, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -243,7 +243,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -287,18 +287,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -307,14 +307,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

Converters/Autocad/Speckle.Converters.AutocadShared/Speckle.Converters.AutocadShared.projitems

@@ -27,7 +27,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\AutocadPolycurveToHostPolyline2dRawConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\AutocadPolycurveToHostPolyline3dRawConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\AutocadPolycurveToHostPolylineRawConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\PolycurveToHostSplineRawConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\CircleToHostConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\ArcToHostConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\CurveToHostConverter.cs" />

Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/DataObjectConverter.cs

@@ -4,50 +4,120 @@ using Speckle.Objects.Data;
 using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;
 
-namespace Speckle.Converters.Rhino7.ToHost.TopLevel;
+namespace Speckle.Converters.AutocadShared.ToHost.Geometry;
 
 [NameAndRankValue(typeof(DataObject), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)]
 public class DataObjectConverter : IToHostTopLevelConverter, ITypedConverter<DataObject, List<(ADB.Entity a, Base b)>>
 {
-  private readonly ITypedConverter<SOG.Line, ADB.Line> _lineConverter;
-  private readonly ITypedConverter<SOG.Polyline, ADB.Polyline3d> _polylineConverter;
-  private readonly ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> _meshConverter;
   private readonly ITypedConverter<SOG.Arc, ADB.Arc> _arcConverter;
+  private readonly ITypedConverter<SOG.BrepX, List<(ADB.Entity a, Base b)>> _brepXConverter;
+  private readonly ITypedConverter<SOG.Circle, ADB.Circle> _circleConverter;
+  private readonly ITypedConverter<SOG.Curve, ADB.Curve> _curveConverter;
+  private readonly ITypedConverter<SOG.Ellipse, ADB.Ellipse> _ellipseConverter;
+  private readonly ITypedConverter<SOG.ExtrusionX, List<(ADB.Entity a, Base b)>> _extrusionXConverter;
+  private readonly ITypedConverter<SOG.Line, ADB.Line> _lineConverter;
+  private readonly ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> _meshConverter;
   private readonly ITypedConverter<SOG.Point, ADB.DBPoint> _pointConverter;
+  private readonly ITypedConverter<SOG.Polycurve, List<(ADB.Entity a, Base b)>> _polycurveConverter;
+  private readonly ITypedConverter<SOG.Polyline, ADB.Polyline3d> _polylineConverter;
+  private readonly ITypedConverter<SOG.SubDX, List<(ADB.Entity a, Base b)>> _subDXConverter;
 
   public DataObjectConverter(
-    ITypedConverter<SOG.Line, ADB.Line> lineConverter,
-    ITypedConverter<SOG.Polyline, ADB.Polyline3d> polylineConverter,
-    ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> meshConverter,
     ITypedConverter<SOG.Arc, ADB.Arc> arcConverter,
-    ITypedConverter<SOG.Point, ADB.DBPoint> pointConverter
+    ITypedConverter<SOG.BrepX, List<(ADB.Entity a, Base b)>> brepXConverter,
+    ITypedConverter<SOG.Circle, ADB.Circle> circleConverter,
+    ITypedConverter<SOG.Curve, ADB.Curve> curveConverter,
+    ITypedConverter<SOG.Ellipse, ADB.Ellipse> ellipseConverter,
+    ITypedConverter<SOG.ExtrusionX, List<(ADB.Entity a, Base b)>> extrusionXConverter,
+    ITypedConverter<SOG.Line, ADB.Line> lineConverter,
+    ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> meshConverter,
+    ITypedConverter<SOG.Point, ADB.DBPoint> pointConverter,
+    ITypedConverter<SOG.Polycurve, List<(ADB.Entity, Base)>> polycurveConverter,
+    ITypedConverter<SOG.Polyline, ADB.Polyline3d> polylineConverter,
+    ITypedConverter<SOG.SubDX, List<(ADB.Entity a, Base b)>> subDXConverter
   )
   {
-    _lineConverter = lineConverter;
-    _polylineConverter = polylineConverter;
-    _meshConverter = meshConverter;
     _arcConverter = arcConverter;
+    _brepXConverter = brepXConverter;
+    _circleConverter = circleConverter;
+    _curveConverter = curveConverter;
+    _ellipseConverter = ellipseConverter;
+    _extrusionXConverter = extrusionXConverter;
+    _lineConverter = lineConverter;
+    _meshConverter = meshConverter;
     _pointConverter = pointConverter;
+    _polycurveConverter = polycurveConverter;
+    _polylineConverter = polylineConverter;
+    _subDXConverter = subDXConverter;
   }
 
   public object Convert(Base target) => Convert((DataObject)target);
 
   public List<(ADB.Entity a, Base b)> Convert(DataObject target)
   {
-    var result = new List<ADB.Entity>();
+    var result = new List<(ADB.Entity a, Base b)>();
     foreach (var item in target.displayValue)
     {
-      ADB.Entity x = item switch
-      {
-        SOG.Line line => _lineConverter.Convert(line),
-        SOG.Polyline polyline => _polylineConverter.Convert(polyline),
-        SOG.Mesh mesh => _meshConverter.Convert(mesh),
-        SOG.Arc arc => _arcConverter.Convert(arc),
-        SOG.Point point => _pointConverter.Convert(point),
-        _ => throw new ConversionException($"Found unsupported fallback geometry: {item.GetType()}")
-      };
-      result.Add(x);
+      result.AddRange(ConvertDisplayObject(item));
+    }
+    return result;
+  }
+
+  public IEnumerable<(ADB.Entity a, Base b)> ConvertDisplayObject(Base displayObject)
+  {
+    switch (displayObject)
+    {
+      case SOG.Arc arc:
+        yield return (_arcConverter.Convert(arc), arc);
+        break;
+      case SOG.BrepX brepX:
+        foreach (var i in _brepXConverter.Convert(brepX))
+        {
+          yield return i;
+        }
+        break;
+      case SOG.Circle circle:
+        yield return (_circleConverter.Convert(circle), circle);
+        break;
+      case SOG.Curve curve:
+        yield return (_curveConverter.Convert(curve), curve);
+        break;
+      case SOG.Ellipse ellipse:
+        yield return (_ellipseConverter.Convert(ellipse), ellipse);
+        break;
+      case SOG.ExtrusionX extrusionX:
+        foreach (var i in _extrusionXConverter.Convert(extrusionX))
+        {
+          yield return i;
+        }
+        break;
+      case SOG.Line line:
+        yield return (_lineConverter.Convert(line), line);
+        break;
+      case SOG.Mesh mesh:
+        yield return (_meshConverter.Convert(mesh), mesh);
+        break;
+      case SOG.Point point:
+        yield return (_pointConverter.Convert(point), point);
+        break;
+      case SOG.Polycurve polycurve:
+        foreach (var i in _polycurveConverter.Convert(polycurve))
+        {
+          yield return i;
+        }
+        break;
+      case SOG.Polyline polyline:
+        yield return (_polylineConverter.Convert(polyline), polyline);
+        break;
+      case SOG.SubDX subDX:
+        foreach (var i in _subDXConverter.Convert(subDX))
+        {
+          yield return i;
+        }
+        break;
+
+      default:
+        throw new ConversionException($"Found unsupported geometry: {displayObject.GetType()}");
     }
-    return result.Zip(target.displayValue, (a, b) => (a, b)).ToList();
   }
 }

Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Geometry/PolycurveToHostConverter.cs

@@ -1,3 +1,4 @@
+using Autodesk.AutoCAD.DatabaseServices;
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
 using Speckle.Sdk.Models;
@@ -10,33 +11,40 @@ namespace Speckle.Converters.AutocadShared.ToHost.Geometry;
 /// Otherwise we convert it as spline (list of ADB.Entity) that switch cases according to each segment type.
 /// </summary>
 [NameAndRankValue(typeof(SOG.Polycurve), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)]
-public class PolycurveToHostConverter : IToHostTopLevelConverter
+public class PolycurveToHostConverter : IToHostTopLevelConverter, ITypedConverter<SOG.Polycurve, List<(Entity, Base)>>
 {
   private readonly ITypedConverter<SOG.Polycurve, ADB.Polyline> _polylineConverter;
-  private readonly ITypedConverter<SOG.Polycurve, List<ADB.Entity>> _splineConverter;
+  private readonly ITypedConverter<SOG.Line, ADB.Line> _lineConverter;
+  private readonly ITypedConverter<SOG.Arc, ADB.Arc> _arcConverter;
+  private readonly ITypedConverter<SOG.Curve, ADB.Curve> _curveConverter;
 
   public PolycurveToHostConverter(
     ITypedConverter<SOG.Polycurve, ADB.Polyline> polylineConverter,
-    ITypedConverter<SOG.Polycurve, List<ADB.Entity>> splineConverter
+    ITypedConverter<SOG.Line, ADB.Line> lineConverter,
+    ITypedConverter<SOG.Arc, ADB.Arc> arcConverter,
+    ITypedConverter<SOG.Curve, ADB.Curve> curveConverter
   )
   {
     _polylineConverter = polylineConverter;
-    _splineConverter = splineConverter;
+    _lineConverter = lineConverter;
+    _arcConverter = arcConverter;
+    _curveConverter = curveConverter;
   }
 
-  public object Convert(Base target)
+  public object Convert(Base target) => Convert((SOG.Polycurve)target);
+
+  public List<(Entity, Base)> Convert(SOG.Polycurve target)
   {
-    SOG.Polycurve polycurve = (SOG.Polycurve)target;
-    bool convertAsSpline = polycurve.segments.Any(s => s is not SOG.Line and not SOG.Arc);
-    bool isPlanar = IsPolycurvePlanar(polycurve);
+    bool convertAsSpline = target.segments.Any(s => s is not SOG.Line and not SOG.Arc);
+    bool isPlanar = IsPolycurvePlanar(target);
 
     if (convertAsSpline || !isPlanar)
     {
-      return _splineConverter.Convert(polycurve);
+      return ConvertAsCurveSegments(target);
     }
     else
     {
-      return _polylineConverter.Convert(polycurve);
+      return new() { (_polylineConverter.Convert(target), target) };
     }
   }
 
@@ -86,4 +94,34 @@ public class PolycurveToHostConverter : IToHostTopLevelConverter
     }
     return true;
   }
+
+  private List<(Entity, Base)> ConvertAsCurveSegments(SOG.Polycurve target)
+  {
+    // POC: We can improve this once we have IIndex of raw converters and we can get rid of case converters?
+    // POC: Should we join entities?
+    var list = new List<ADB.Entity>();
+
+    foreach (var segment in target.segments)
+    {
+      switch (segment)
+      {
+        case SOG.Arc arc:
+          list.Add(_arcConverter.Convert(arc));
+          break;
+        case SOG.Line line:
+          list.Add(_lineConverter.Convert(line));
+          break;
+        case SOG.Polyline polyline:
+          list.Add(_polylineConverter.Convert(polyline));
+          break;
+        case SOG.Curve curve:
+          list.Add(_curveConverter.Convert(curve));
+          break;
+        default:
+          break;
+      }
+    }
+
+    return list.Zip(target.segments, (a, b) => ((ADB.Entity)a, (Base)b)).ToList();
+  }
 }

Converters/Autocad/Speckle.Converters.AutocadShared/ToHost/Raw/PolycurveToHostSplineRawConverter.cs

@@ -1,57 +0,0 @@
-using Speckle.Converters.Common.Objects;
-
-namespace Speckle.Converters.AutocadShared.ToHost.Raw;
-
-/// <summary>
-/// Polycurve segments might appear in different ICurve types which requires to handle separately for each segment.
-/// </summary>
-public class PolycurveToHostSplineRawConverter : ITypedConverter<SOG.Polycurve, List<ADB.Entity>>
-{
-  private readonly ITypedConverter<SOG.Line, ADB.Line> _lineConverter;
-  private readonly ITypedConverter<SOG.Polyline, ADB.Polyline3d> _polylineConverter;
-  private readonly ITypedConverter<SOG.Arc, ADB.Arc> _arcConverter;
-  private readonly ITypedConverter<SOG.Curve, ADB.Curve> _curveConverter;
-
-  public PolycurveToHostSplineRawConverter(
-    ITypedConverter<SOG.Line, ADB.Line> lineConverter,
-    ITypedConverter<SOG.Polyline, ADB.Polyline3d> polylineConverter,
-    ITypedConverter<SOG.Arc, ADB.Arc> arcConverter,
-    ITypedConverter<SOG.Curve, ADB.Curve> curveConverter
-  )
-  {
-    _lineConverter = lineConverter;
-    _polylineConverter = polylineConverter;
-    _arcConverter = arcConverter;
-    _curveConverter = curveConverter;
-  }
-
-  public List<ADB.Entity> Convert(SOG.Polycurve target)
-  {
-    // POC: We can improve this once we have IIndex of raw converters and we can get rid of case converters?
-    // POC: Should we join entities?
-    var list = new List<ADB.Entity>();
-
-    foreach (var segment in target.segments)
-    {
-      switch (segment)
-      {
-        case SOG.Arc arc:
-          list.Add(_arcConverter.Convert(arc));
-          break;
-        case SOG.Line line:
-          list.Add(_lineConverter.Convert(line));
-          break;
-        case SOG.Polyline polyline:
-          list.Add(_polylineConverter.Convert(polyline));
-          break;
-        case SOG.Curve curve:
-          list.Add(_curveConverter.Convert(curve));
-          break;
-        default:
-          break;
-      }
-    }
-
-    return list;
-  }
-}

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

@@ -258,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -287,18 +287,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -308,14 +308,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }

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

@@ -214,7 +214,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.270, )"
+          "Speckle.Objects": "[3.1.4, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -243,18 +243,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "3l7BaePUVvZ5LbXQoudZpSo7ntNkrXYVe5VhokKp0HsrnwPcA0A2WgDcuZC3mss204UNezu5lZUqv5lM2GXXgg==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.270"
+          "Speckle.Sdk": "3.1.4"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "aYiItasQxpGbSIQEg3sM8jk+5SV4jt2Gk+0wKr1EBUndA/l8eB5tAi6eMInL7pGnErEHjj+En9DJU4WRzo3wdw==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -263,14 +263,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
+          "Speckle.Sdk.Dependencies": "3.1.4"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.270, )",
-        "resolved": "3.1.0-dev.270",
-        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
+        "requested": "[3.1.4, )",
+        "resolved": "3.1.4",
+        "contentHash": "9w6uBekthmmKZhV4bau36Fu8HRPSq4UsS4UB1I9IUsh9xF9IPHt0hVvDBpwQB1P0Gy9fVrcZQeAuP4TMRQqv0A=="
       }
     }
   }