Merge pull request #601 from specklesystems/dev

Update release to dev
Merge pull request #595 from specklesystems/dev
2025-02-19 03:15:43 +03:00 · 2025-02-18 19:38:22 +03:00 · 2025-02-17 13:52:57 +01:00 · 2025-02-10 17:53:46 +00:00 · 2025-02-10 10:27:38 +00:00 · 2025-01-30 17:22:52 +00:00
548 changed files with 5636 additions and 28540 deletions
@@ -9,10 +9,10 @@
      ],
      "rollForward": false
    },
-    "dotnet-affected": {
-      "version": "5.0.0",
+    "gitversion.tool": {
+      "version": "6.0.2",
      "commands": [
-        "dotnet-affected"
+        "dotnet-gitversion"
      ],
      "rollForward": false
    }
@@ -314,9 +314,6 @@ dotnet_diagnostic.NUnit2037.severity = warning # Consider using Assert.That(coll
 dotnet_diagnostic.NUnit2038.severity = warning # Consider using Assert.That(actual, Is.InstanceOf(expected)) instead of Assert.IsInstanceOf(expected, actual)
 dotnet_diagnostic.NUnit2039.severity = warning # Consider using Assert.That(actual, Is.Not.InstanceOf(expected)) instead of Assert.IsNotInstanceOf(expected, actual)

-# note: added to allow the copy paste from rhino inside of the ValueSet component
-dotnet_diagnostic.CA1033.severity = none
-
 [*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,ixx,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}]
 indent_style = space
 indent_size = 2
@@ -1,10 +1,15 @@
 name: .NET Build

-on: pull_request
+on:
+  pull_request: # Run build on every pull request that is not to main
+    branches-ignore:
+      - main

-jobs:
+jobs:   
  build:
    runs-on: windows-latest
+    outputs:
+      version: ${{ steps.set-version.outputs.version }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -15,8 +20,8 @@ jobs:
        uses: actions/setup-dotnet@v4
        with:
          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
-
-      - name: Cache Nuget
+      
+      - name: Cache Nuget     
        uses: actions/cache@v4
        with:
          path: ~/.nuget/packages
@@ -29,15 +34,13 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0

      - name: Setup .NET
        uses: actions/setup-dotnet@v4
        with:
          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
-
-      - name: Cache Nuget
+      
+      - name: Cache Nuget     
        uses: actions/cache@v4
        with:
          path: ~/.nuget/packages
@@ -48,9 +51,9 @@ jobs:

      - name: ⚒️ Run tests
        run: ./build.sh test-only
-
+        
      - name: Upload coverage reports to Codecov with GitHub Action
        uses: codecov/codecov-action@v5
        with:
-          files: Converters/**/coverage.xml
+          file: Converters/**/coverage.xml
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -2,18 +2,14 @@ name: .NET Build and Publish

 on:
  push:
-    branches: ["main", "installer-test/**"]
-    tags: ["v3.*.*"] # Manual delivery on every 3.x tag
+    branches: ["main", "dev", "release/*"] # Continuous delivery on every long-lived branch
+    tags: ["v3.*"] # Manual delivery on every 3.x tag

 jobs:
  build-windows:
    runs-on: windows-latest
-    env:
-      SEMVER: "unset"
-      FILE_VERSION: "unset"
    outputs:
-      semver: ${{ steps.set-version.outputs.semver }}
-      file_version: ${{ steps.set-version.outputs.file_version }}
+      version: ${{ steps.set-version.outputs.version }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -31,43 +27,38 @@ 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 zip
+        run: ./build.ps1

      - name: ⬆️ Upload artifacts
        uses: actions/upload-artifact@v4
        with:
-          name: output-${{ env.SEMVER }}
+          name: output-${{ env.GitVersion_FullSemVer }}
          path: output/*.*
-          if-no-files-found: error
-          retention-days: 1
          compression-level: 0 # no compression

      - id: set-version
        name: Set version to output
-        run: |
-          echo "semver=${{ env.SEMVER }}" >> "$Env:GITHUB_OUTPUT"
-          echo "file_version=${{ env.FILE_VERSION }}" >> "$Env:GITHUB_OUTPUT"
+        run: echo "version=${{ env.GitVersion_FullSemVer }}" >> "$Env:GITHUB_OUTPUT"

  deploy-installers:
    runs-on: ubuntu-latest
    needs: build-windows
    env:
-      IS_PUBLIC_RELEASE: ${{ github.ref_type == 'tag' }}
+      IS_TAG_BUILD: ${{ github.ref_type == 'tag' }}
+      IS_RELEASE_BRANCH: ${{ startsWith(github.ref_name, 'release/') || github.ref_name == 'main'}}
    steps:
      - name: 🔫 Trigger Build Installers
-        uses: the-actions-org/workflow-dispatch@v4.0.0
+        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 }}",
-            "semver": "${{ needs.build-windows.outputs.semver }}",
-            "file_version": "${{ needs.build-windows.outputs.file_version }}",
-            "repo": "${{ github.repository }}",
-            "is_public_release": ${{ env.IS_PUBLIC_RELEASE }}
-            }'
+          inputs: '{ "run_id": "${{ github.run_id }}", "version": "${{ needs.build-windows.outputs.version }}", "public_release": ${{ env.IS_TAG_BUILD }}, "store_artifacts": ${{ env.IS_RELEASE_BRANCH }} }'
          ref: main
          wait-for-completion: true
          wait-for-completion-interval: 10s
@@ -98,6 +89,9 @@ 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

@@ -111,5 +105,4 @@ 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
@@ -1,116 +0,0 @@
-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);
-      }
-
-      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;
-  }
-}
@@ -10,8 +10,6 @@
    <PackageReference Include="Bullseye" />
    <PackageReference Include="Glob" />
    <PackageReference Include="Microsoft.Build" />
-    <PackageReference Include="Microsoft.VisualStudio.SolutionPersistence" />
-    <PackageReference Include="Semver" />
    <PackageReference Include="SimpleExec" />
  </ItemGroup>
 </Project>
@@ -4,14 +4,14 @@ public static class Consts
 {
  public static readonly string[] Solutions = ["Speckle.Connectors.sln"];

-  public static readonly ProjectGroup[] ProjectGroups =
+  public static readonly InstallerProject[] InstallerManifests =
  {
    new("arcgis", [new("Connectors/ArcGIS/Speckle.Connectors.ArcGIS3", "net6.0-windows")]),
    new(
      "rhino",
      [
        new("Connectors/Rhino/Speckle.Connectors.Rhino7", "net48"),
-        new("Connectors/Rhino/Speckle.Connectors.Rhino8", "net48"),
+        new("Connectors/Rhino/Speckle.Connectors.Rhino8", "net48")
      ]
    ),
    new(
@@ -20,8 +20,7 @@ public static class Consts
        new("Connectors/Revit/Speckle.Connectors.Revit2022", "net48"),
        new("Connectors/Revit/Speckle.Connectors.Revit2023", "net48"),
        new("Connectors/Revit/Speckle.Connectors.Revit2024", "net48"),
-        new("Connectors/Revit/Speckle.Connectors.Revit2025", "net8.0-windows"),
-        new("Connectors/Revit/Speckle.Connectors.Revit2026", "net8.0-windows")
+        new("Connectors/Revit/Speckle.Connectors.Revit2025", "net8.0-windows")
      ]
    ),
    new(
@@ -30,8 +29,7 @@ public static class Consts
        new("Connectors/Autocad/Speckle.Connectors.Autocad2022", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Autocad2024", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2026", "net8.0-windows")
+        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows")
      ]
    ),
    new(
@@ -40,8 +38,7 @@ public static class Consts
        new("Connectors/Autocad/Speckle.Connectors.Civil3d2022", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Civil3d2023", "net48"),
        new("Connectors/Autocad/Speckle.Connectors.Civil3d2024", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2026", "net8.0-windows")
+        new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows")
      ]
    ),
    new(
@@ -52,12 +49,11 @@ public static class Consts
        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2022", "net48"),
        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2023", "net48"),
        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2024", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2025", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2026", "net48")
+        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2025", "net48")
      ]
    ),
    new(
-      "teklastructures",
+      "tekla-structures",
      [
        new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
        new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
@@ -73,7 +69,7 @@ public static class Consts
  };
 }

-public readonly record struct ProjectGroup(string HostAppSlug, IReadOnlyList<InstallerAsset> Projects)
+public readonly record struct InstallerProject(string HostAppSlug, IReadOnlyList<InstallerAsset> Projects)
 {
  public override string ToString() => $"{HostAppSlug}";
 }
@@ -12,13 +12,13 @@ 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 GEN_SOLUTIONS = "generate-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>();
@@ -28,13 +28,20 @@ if (args.Length > 1)
  args = new[] { arguments.First() };
  //arguments = arguments.Skip(1).ToList();
 }*/
-
+void Build(string solution, string configuration)
+{
+  Console.WriteLine();
+  Console.WriteLine();
+  Console.WriteLine($"Building solution '{solution}' as '{configuration}'");
+  Console.WriteLine();
+  Run("dotnet", $"build .\\{solution} --configuration {configuration} --no-restore");
+}
 void Restore(string solution)
 {
  Console.WriteLine();
  Console.WriteLine($"Restoring solution '{solution}'");
  Console.WriteLine();
-  Run("dotnet", $"restore \".\\{solution}\" --no-cache");
+  Run("dotnet", $"restore .\\{solution} --no-cache");
 }
 void DeleteFiles(string pattern)
 {
@@ -65,31 +72,30 @@ void CleanSolution(string solution, string configuration)
  DeleteDirectories("**/obj");
  DeleteFiles("**/*.lock.json");
  Restore(solution);
+  Build(solution, configuration);
 }

 Target(
  CLEAN_LOCKS,
-  Consts.Solutions,
-  s =>
+  () =>
  {
    DeleteFiles("**/*.lock.json");
-    Restore(s);
+    Restore("Speckle.Connectors.sln");
  }
 );

 Target(
  DEEP_CLEAN,
-  Consts.Solutions,
-  s =>
+  () =>
  {
-    CleanSolution(s, "debug");
+    CleanSolution("Speckle.Connectors.sln", "debug");
  }
 );
 Target(
  DEEP_CLEAN_LOCAL,
  () =>
  {
-    CleanSolution("Local.sln", "Local");
+    CleanSolution("Local.sln", "local");
  }
 );

@@ -120,22 +126,21 @@ Target(
 );

 Target(
-  RESTORE_TOOLS,
-  () =>
+  VERSION,
+  async () =>
  {
-    Run("dotnet", "tool restore");
+    var (output, _) = await ReadAsync("dotnet", "minver -v w");
+    output = output.Trim();
+    Console.WriteLine($"Version: {output}");
+    Run("echo", $"\"version={output}\" >> $GITHUB_OUTPUT");
  }
 );

 Target(
-  DETECT_AFFECTED,
-  DependsOn(RESTORE_TOOLS),
-  async () =>
+  RESTORE_TOOLS,
+  () =>
  {
-    foreach (var group in await Affected.GetAffectedProjectGroups())
-    {
-      Console.WriteLine("Affected project group being built: " + group.HostAppSlug);
-    }
+    Run("dotnet", "tool restore");
  }
 );

@@ -150,14 +155,20 @@ Target(

 Target(
  RESTORE,
-  DependsOn(FORMAT, DETECT_AFFECTED),
+  DependsOn(FORMAT),
  Consts.Solutions,
-  async s =>
+  s =>
  {
-    var version = await Versions.ComputeVersion();
-    var fileVersion = await Versions.ComputeFileVersion();
-    Console.WriteLine($"Restoring: {s} - Version: {version} & {fileVersion}");
-    await RunAsync("dotnet", $"restore \"{s}\" --locked-mode");
+    Run("dotnet", $"restore {s} --locked-mode");
+  }
+);
+
+Target(
+  BUILD_SERVER_VERSION,
+  DependsOn(RESTORE_TOOLS),
+  () =>
+  {
+    Run("dotnet", "tool run dotnet-gitversion /output json /output buildserver");
  }
 );

@@ -165,44 +176,40 @@ Target(
  BUILD,
  DependsOn(RESTORE),
  Consts.Solutions,
-  async s =>
+  s =>
  {
-    var version = await Versions.ComputeVersion();
-    var fileVersion = await Versions.ComputeFileVersion();
-    Console.WriteLine($"Restoring: {s} - Version: {version} & {fileVersion}");
-    await RunAsync(
+    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(
      "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"
    );
  }
 );

 Target(CHECK_SOLUTIONS, Solutions.CompareConnectorsToLocal);
-Target(GEN_SOLUTIONS, Solutions.GenerateSolutions);

 Target(
  TEST,
  DependsOn(BUILD, CHECK_SOLUTIONS),
-  async () =>
+  Glob.Files(".", "**/*.Tests.csproj"),
+  file =>
  {
-    foreach (var s in await Affected.GetTestProjects())
-    {
-      await RunAsync("dotnet", $"test \"{s}\" -c Release --no-build --no-restore --verbosity=minimal");
-    }
+    Run("dotnet", $"test {file} -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"
    );
  }
 );
@@ -211,20 +218,20 @@ Target(
  BUILD_LINUX,
  DependsOn(FORMAT),
  Glob.Files(".", "**/Speckle.Importers.Ifc.csproj"),
-  async file =>
+  file =>
  {
-    await RunAsync("dotnet", $"restore \"{file}\" --locked-mode");
-    var version = await Versions.ComputeVersion();
-    var fileVersion = await Versions.ComputeFileVersion();
+    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";
    Console.WriteLine($"Version: {version} & {fileVersion}");
-    await RunAsync(
+    Run(
      "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"
    );

-    await RunAsync(
+    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"
    );
  }
 );
@@ -232,56 +239,47 @@ Target(
 Target(
  ZIP,
  DependsOn(TEST),
-  async () =>
+  Consts.InstallerManifests,
+  x =>
  {
-    var version = await Versions.ComputeVersion();
-    var fileVersion = await Versions.ComputeFileVersion();
-    foreach (var group in await Affected.GetAffectedProjectGroups())
+    var outputDir = Path.Combine(".", "output");
+    var slugDir = Path.Combine(outputDir, x.HostAppSlug);
+
+    Directory.CreateDirectory(outputDir);
+    Directory.CreateDirectory(slugDir);
+
+    foreach (var asset in x.Projects)
    {
-      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)
+      var fullPath = Path.Combine(".", asset.ProjectPath, "bin", "Release", asset.TargetName);
+      if (!Directory.Exists(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);
-        }
+        throw new InvalidOperationException("Could not find: " + fullPath);
      }

-      var outputPath = Path.Combine(outputDir, $"{group.HostAppSlug}.zip");
-      File.Delete(outputPath);
-      Console.WriteLine($"Zipping: '{slugDir}' to '{outputPath}'");
-      ZipFile.CreateFromDirectory(slugDir, outputPath);
+      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);
+      }
    }

-    string githubEnv = Environment.GetEnvironmentVariable("GITHUB_ENV") ?? "Unset";
-    Console.WriteLine($"GITHUB_ENV: {githubEnv}");
-    File.AppendAllText(githubEnv, $"SEMVER={version}{Environment.NewLine}");
-    File.AppendAllText(githubEnv, $"FILE_VERSION={fileVersion}{Environment.NewLine}");
+    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);
  }
 );

-Target("default", DependsOn(TEST), () => Console.WriteLine("Done!"));
+Target("default", DependsOn(FORMAT, ZIP), () => Console.WriteLine("Done!"));

 await RunTargetsAndExitAsync(args).ConfigureAwait(true);
@@ -1,6 +1,4 @@
 using Microsoft.Build.Construction;
-using Microsoft.VisualStudio.SolutionPersistence.Model;
-using Microsoft.VisualStudio.SolutionPersistence.Serializer;

 namespace Build;

@@ -55,53 +53,4 @@ public static class Solutions
      );
    }
  }
-
-  public static async Task GenerateSolutions()
-  {
-    await GenerateLocalSlnx();
-    foreach (var group in Consts.ProjectGroups)
-    {
-      var path = group.Projects[0].ProjectPath.Split('/');
-      var folder = $"/{path[0]}/{path[1]}/";
-      await GenerateConnector(group.HostAppSlug, folder);
-    }
-  }
-
-  public static async Task GenerateLocalSlnx()
-  {
-    var connectors = await GetFullSlnx();
-    connectors.AddProject("..\\speckle-sharp-sdk\\src\\Speckle.Objects\\Speckle.Objects.csproj");
-    connectors.AddProject("..\\speckle-sharp-sdk\\src\\Speckle.Sdk\\Speckle.Sdk.csproj");
-    connectors.AddProject("..\\speckle-sharp-sdk\\src\\Speckle.Sdk.Dependencies\\Speckle.Sdk.Dependencies.csproj");
-    var sln = Path.Combine("C:\\Users\\adam\\Git\\speckle-sharp-connectors", "Local.slnx");
-    await SolutionSerializers.SlnXml.SaveAsync(sln, connectors, default);
-    sln = Path.Combine("C:\\Users\\adam\\Git\\speckle-sharp-connectors", "Local.sln");
-    await SolutionSerializers.SlnFileV12.SaveAsync(sln, connectors, default);
-  }
-
-  public static async Task GenerateConnector(string slug, string folder)
-  {
-    slug = string.Concat(slug[0].ToString().ToUpper(), slug.AsSpan(1));
-    var connectors = await GetFullSlnx();
-    var foldersToRemove = connectors
-      .SolutionFolders.Where(x =>
-        //need base folder
-        !x.Path.Equals("/Connectors/")
-        //don't grab all
-        && (x.Path.StartsWith("/Connectors/") && !x.Path.StartsWith(folder))
-      )
-      .ToList();
-    foreach (var folderToRemove in foldersToRemove)
-    {
-      connectors.RemoveFolder(folderToRemove);
-    }
-    var sln = Path.Combine("C:\\Users\\adam\\Git\\speckle-sharp-connectors", $"Speckle.{slug}.slnx");
-    await SolutionSerializers.SlnXml.SaveAsync(sln, connectors, default);
-  }
-
-  public static async Task<SolutionModel> GetFullSlnx()
-  {
-    var connectorsSln = Path.Combine("C:\\Users\\adam\\Git\\speckle-sharp-connectors", "Speckle.Connectors.slnx");
-    return await SolutionSerializers.SlnXml.OpenAsync(connectorsSln, default);
-  }
 }
@@ -1,79 +0,0 @@
-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;
-  }
-}
@@ -47,27 +47,12 @@
          "Microsoft.SourceLink.Common": "8.0.0"
        }
      },
-      "Microsoft.VisualStudio.SolutionPersistence": {
-        "type": "Direct",
-        "requested": "[1.0.52, )",
-        "resolved": "1.0.52",
-        "contentHash": "oNv2JtYXhpdJrX63nibx1JT3uCESOBQ1LAk7Dtz/sr0+laW0KRM6eKp4CZ3MHDR2siIkKsY8MmUkeP5DKkQQ5w=="
-      },
      "PolySharp": {
        "type": "Direct",
        "requested": "[1.14.1, )",
        "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, )",
@@ -90,11 +75,6 @@
        "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",
@@ -46,7 +46,6 @@ 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:
@@ -72,7 +71,6 @@ public sealed class ArcGISSendBinding : ISendBinding
    IArcGISConversionSettingsFactory arcGisConversionSettingsFactory,
    MapMembersUtils mapMemberUtils,
    IThreadContext threadContext,
-    ISpeckleApplication speckleApplication,
    ITopLevelExceptionHandler topLevelExceptionHandler
  )
  {
@@ -87,7 +85,6 @@ public sealed class ArcGISSendBinding : ISendBinding
    _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
    _mapMemberUtils = mapMemberUtils;
    _threadContext = threadContext;
-    _speckleApplication = speckleApplication;

    Parent = parent;
    Commands = new SendBindingUICommands(parent);
@@ -425,7 +422,7 @@ public sealed class ArcGISSendBinding : ISendBinding
        .ServiceProvider.GetRequiredService<SendOperation<MapMember>>()
        .Execute(
          mapMembers,
-          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
+          modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
          cancellationItem.Token
        );
@@ -67,8 +67,6 @@ 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());
@@ -27,7 +27,7 @@ public static class ArcGISConnectorModule
 {
  public static void AddArcGIS(this IServiceCollection serviceCollection)
  {
-    serviceCollection.AddConnectors();
+    serviceCollection.AddConnectorUtils();
    serviceCollection.AddDUI<DefaultThreadContext, ArcGISDocumentStore>();
    serviceCollection.AddDUIView();

@@ -184,7 +184,6 @@ public class ArcGISColorUnpacker
    if (StoredColor is int existingColorProxyId)
    {
      AddObjectIdToColorProxyCache(rowApplicationId, existingColorProxyId);
-      return;
    }

    // get the color from the renderer and row
@@ -102,26 +102,19 @@ 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"))
    {
-      long count = 0;
-
-      foreach (var (layer, layerFeatureCount) in layersWithFeatureCount)
+      int count = 0;
+      foreach (ADM.MapMember layer in unpackedLayers)
      {
        cancellationToken.ThrowIfCancellationRequested();
        string layerApplicationId = layer.GetSpeckleApplicationId();
@@ -149,33 +142,15 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
            switch (layer)
            {
              case ADM.FeatureLayer featureLayer:
-                List<Base> convertedFeatureLayerObjects = ConvertFeatureLayerObjects(
-                  featureLayer,
-                  count,
-                  allFeaturesCount,
-                  onOperationProgressed,
-                  cancellationToken
-                );
+                List<Base> convertedFeatureLayerObjects = ConvertFeatureLayerObjects(featureLayer);
                layerCollection.elements.AddRange(convertedFeatureLayerObjects);
                break;
              case ADM.RasterLayer rasterLayer:
-                List<Base> convertedRasterLayerObjects = ConvertRasterLayerObjects(
-                  rasterLayer,
-                  count,
-                  allFeaturesCount,
-                  onOperationProgressed,
-                  cancellationToken
-                );
+                List<Base> convertedRasterLayerObjects = ConvertRasterLayerObjects(rasterLayer);
                layerCollection.elements.AddRange(convertedRasterLayerObjects);
                break;
              case ADM.LasDatasetLayer lasDatasetLayer:
-                List<Base> convertedLasDatasetObjects = ConvertLasDatasetLayerObjects(
-                  lasDatasetLayer,
-                  count,
-                  allFeaturesCount,
-                  onOperationProgressed,
-                  cancellationToken
-                );
+                List<Base> convertedLasDatasetObjects = ConvertLasDatasetLayerObjects(lasDatasetLayer);
                layerCollection.elements.AddRange(convertedLasDatasetObjects);
                break;
              default:
@@ -183,8 +158,6 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
                sdkStatus = SdkActivityStatusCode.Error;
                break;
            }
-
-            count += layerFeatureCount;
            results.Add(new(status, layerApplicationId, layer.GetType().Name, layerCollection));
            convertingActivity?.SetStatus(sdkStatus);
          }
@@ -201,6 +174,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
          convertingActivity?.RecordException(ex);
        }

+        onOperationProgressed.Report(new("Converting", (double)++count / layers.Count));
        await Task.Yield();
      }
    }
@@ -216,41 +190,7 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
    return new RootObjectBuilderResult(rootCollection, results);
  }

-  private Dictionary<ADM.MapMember, long> CountAllFeaturesInLayers(List<ADM.MapMember> unpackedLayers)
-  {
-    Dictionary<ADM.MapMember, long> layersFeatureCount = new();
-
-    foreach (ADM.MapMember layer in unpackedLayers)
-    {
-      switch (layer)
-      {
-        case ADM.FeatureLayer featureLayer:
-          layersFeatureCount.Add(featureLayer, featureLayer.GetFeatureClass().GetCount());
-          break;
-        case ADM.RasterLayer rasterLayer:
-          // count Raster layer as 1 feature: not optimal but this is the approach for now
-          layersFeatureCount.Add(rasterLayer, 1);
-          break;
-        case ADM.LasDatasetLayer lasDatasetLayer:
-          var dataset = lasDatasetLayer.GetLasDataset();
-          // simple dataset.GetPointCount() keeps returning null, so switched to EstimatePointCount
-          layersFeatureCount.Add(
-            lasDatasetLayer,
-            (long)dataset.EstimatePointCount(dataset.GetDefinition().GetExtent())
-          );
-          break;
-      }
-    }
-    return layersFeatureCount;
-  }
-
-  private List<Base> ConvertFeatureLayerObjects(
-    ADM.FeatureLayer featureLayer,
-    long count,
-    long allFeaturesCount,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
+  private List<Base> ConvertFeatureLayerObjects(ADM.FeatureLayer featureLayer)
  {
    string layerApplicationId = featureLayer.GetSpeckleApplicationId();
    List<Base> convertedObjects = new();
@@ -264,9 +204,6 @@ 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)
        {
@@ -280,8 +217,6 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
          // process the object color
          _colorUnpacker.ProcessFeatureLayerColor(row, applicationId);
        }
-        // update report
-        onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
      }
    }

@@ -289,38 +224,19 @@ 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,
-    long count,
-    long allFeaturesCount,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
+  private List<Base> ConvertRasterLayerObjects(ADM.RasterLayer rasterLayer)
  {
    string layerApplicationId = rasterLayer.GetSpeckleApplicationId();
    List<Base> convertedObjects = new();
    Raster raster = rasterLayer.GetRaster();
-
-    // check cancellation token before conversion
-    cancellationToken.ThrowIfCancellationRequested();
    Base converted = _rootToSpeckleConverter.Convert(raster);
    string applicationId = raster.GetSpeckleApplicationId(layerApplicationId);
    converted.applicationId = applicationId;
    convertedObjects.Add(converted);
-
-    // update report
-    onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
-
    return convertedObjects;
  }

-  private List<Base> ConvertLasDatasetLayerObjects(
-    ADM.LasDatasetLayer lasDatasetLayer,
-    long count,
-    long allFeaturesCount,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
+  private List<Base> ConvertLasDatasetLayerObjects(ADM.LasDatasetLayer lasDatasetLayer)
  {
    string layerApplicationId = lasDatasetLayer.GetSpeckleApplicationId();
    List<Base> convertedObjects = new();
@@ -334,9 +250,6 @@ 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);
@@ -347,8 +260,6 @@ public class ArcGISRootObjectBuilder : IRootObjectBuilder<ADM.MapMember>
            // process the object color
            _colorUnpacker.ProcessLasLayerColor(pt, applicationId);
          }
-          // update report
-          onOperationProgressed.Report(new("Converting", (double)++count / allFeaturesCount));
        }
      }
    }
@@ -4,6 +4,7 @@ using Speckle.Connectors.ArcGIS.DependencyInjection;
 using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI;
 using Speckle.Converters.ArcGIS3;
+using Speckle.Sdk.Host;
 using Module = ArcGIS.Desktop.Framework.Contracts.Module;

 namespace Speckle.Connectors.ArcGIS;
@@ -3,7 +3,6 @@ using ArcGIS.Desktop.Core.Events;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
 using ArcGIS.Desktop.Mapping.Events;
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
@@ -13,13 +12,16 @@ namespace Speckle.Connectors.ArcGIS.Utils;

 public class ArcGISDocumentStore : DocumentModelStore
 {
+  private readonly IThreadContext _threadContext;
+
  public ArcGISDocumentStore(
-    ILogger<DocumentModelStore> logger,
    IJsonSerializer jsonSerializer,
-    ITopLevelExceptionHandler topLevelExceptionHandler
+    ITopLevelExceptionHandler topLevelExceptionHandler,
+    IThreadContext threadContext
  )
-    : base(logger, jsonSerializer)
+    : base(jsonSerializer)
  {
+    _threadContext = threadContext;
    ActiveMapViewChangedEvent.Subscribe(a => topLevelExceptionHandler.CatchUnhandled(() => OnMapViewChanged(a)), true);
    ProjectSavingEvent.Subscribe(
      _ =>
@@ -221,28 +221,23 @@
        "resolved": "4.5.1",
        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
      },
-      "speckle.common.meshtriangulation": {
-        "type": "Project",
-        "dependencies": {
-          "LibTessDotNet": "[1.1.15, )",
-          "Speckle.DoubleNumerics": "[4.1.0, )"
-        }
-      },
      "speckle.connectors.common": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -259,7 +254,6 @@
        "type": "Project",
        "dependencies": {
          "Esri.ArcGISPro.Extensions30": "[3.2.0.49743, )",
-          "Speckle.Common.MeshTriangulation": "[1.0.0, )",
          "Speckle.Converters.Common": "[1.0.0, )"
        }
      },
@@ -267,15 +261,9 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
-      "LibTessDotNet": {
-        "type": "CentralTransitive",
-        "requested": "[1.1.15, )",
-        "resolved": "1.1.15",
-        "contentHash": "KuA7N3Nv/lIeawJdQBQJR6oqWD9KETHLbWzBqapwFs+Tby+R5I4crkKujKMm5bXcSuFZ8LNtflFQVadsWCbBjg=="
-      },
      "Microsoft.Extensions.DependencyInjection": {
        "type": "CentralTransitive",
        "requested": "[2.2.0, )",
@@ -311,18 +299,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -332,14 +320,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    "net6.0-windows7.0/win-x64": {
@@ -23,14 +23,4 @@
    <Message Text="Civil3D Version $(Civil3DVersion)" Importance="high"/>
    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d$(Civil3DVersion)\%(RecursiveDir)" SourceFiles="@(Civil3DDLLs)" />
  </Target>
-
-  <PropertyGroup Condition="'$(AutoCADVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Civil3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
-    <StartArguments>/product C3D</StartArguments>
-  </PropertyGroup>
 </Project>
@@ -6,10 +6,12 @@
    <AutoCADVersion>2022</AutoCADVersion>
    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2022;AUTOCAD2022_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" />
  </ItemGroup>  
  
  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -292,7 +294,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -336,18 +338,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -357,14 +359,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -6,10 +6,12 @@
    <AutoCADVersion>2023</AutoCADVersion>
    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2023;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" />
  </ItemGroup>  
  
  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -292,7 +294,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -336,18 +338,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -357,14 +359,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net48</TargetFramework>
-    <AutoCADVersion>2024</AutoCADVersion>
    <PlatformTarget>x64</PlatformTarget>
    <UseWpf>true</UseWpf>
+    <AutoCADVersion>2024</AutoCADVersion>
    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2024;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" />
  </ItemGroup>  
  
  <ItemGroup>   
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -293,7 +295,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net8.0-windows</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseWpf>true</UseWpf>
    <AutoCADVersion>2025</AutoCADVersion>
-    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2025;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER;AUTOCAD2025_OR_GREATER</DefineConstants>
+    <DefineConstants>$(DefineConstants);AUTOCAD2025;AUTOCAD</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" />
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App"/>
  </ItemGroup>  
  
  <ItemGroup>   
@@ -215,16 +215,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -249,7 +251,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -293,18 +295,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -313,14 +315,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <AutoCADVersion>2026</AutoCADVersion>
-    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2026;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER;AUTOCAD2025_OR_GREATER;AUTOCAD2026_OR_GREATER</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
-    <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2026\Speckle.Converters.Autocad2026.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
-  </ItemGroup>
-  
-  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-</Project>
@@ -79,8 +79,6 @@ 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!
@@ -1,119 +0,0 @@
-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();
-    }
-  }
-}
@@ -1,19 +1,34 @@
 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 : AutocadReceiveBaseBinding
+public sealed class AutocadReceiveBinding : 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 IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
+  private readonly ISpeckleApplication _speckleApplication;
+  private readonly IThreadContext _threadContext;
+
+  private ReceiveBindingUICommands Commands { get; }

  public AutocadReceiveBinding(
    DocumentModelStore store,
@@ -26,24 +41,77 @@ public sealed class AutocadReceiveBinding : AutocadReceiveBaseBinding
    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);
  }

-  protected override 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));
+
+  public async Task ReceiveInternal(string modelCardId)
  {
-    serviceProvider
-      .GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
+    using var scope = _serviceProvider.CreateScope();
+    scope
+      .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;
+    }
  }
 }
@@ -89,17 +89,6 @@ public class AutocadSelectionBinding : ISelectionBinding

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

        tr.Commit();
@@ -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 ConcurrentBag<string> ChangedObjectIds { get; set; } = new();
+  private ConcurrentDictionary<string, byte> ChangedObjectIds { get; set; } = new();

  protected AutocadSendBaseBinding(
    DocumentModelStore store,
@@ -114,20 +114,21 @@ public abstract class AutocadSendBaseBinding : ISendBinding

  private void OnChangeChangedObjectIds(DBObject dBObject)
  {
-    ChangedObjectIds.Add(dBObject.GetSpeckleApplicationId());
-    _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), async () => await RunExpirationChecks());
+    ChangedObjectIds[dBObject.GetSpeckleApplicationId()] = 1;
+    _idleManager.SubscribeToIdle(nameof(AutocadSendBinding), async () => await RunExpirationChecks());
  }

  private async Task RunExpirationChecks()
  {
    var senders = _store.GetSenders();
+    string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
    List<string> expiredSenderIds = new();

-    _sendConversionCache.EvictObjects(ChangedObjectIds);
+    _sendConversionCache.EvictObjects(objectIdsList);

    foreach (SenderModelCard modelCard in senders)
    {
-      var intersection = modelCard.SendFilter.NotNull().RefreshObjectIds().Intersect(ChangedObjectIds).ToList();
+      var intersection = modelCard.SendFilter.NotNull().RefreshObjectIds().Intersect(objectIdsList).ToList();
      bool isExpired = intersection.Count != 0;
      if (isExpired)
      {
@@ -183,7 +184,7 @@ public abstract class AutocadSendBaseBinding : ISendBinding
        .ServiceProvider.GetRequiredService<SendOperation<AutocadRootObject>>()
        .Execute(
          autocadObjects,
-          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
+          modelCard.GetSendInfo(_speckleApplication.Slug),
          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
          cancellationItem.Token
        );
@@ -24,7 +24,7 @@ public static class SharedRegistration
 {
  public static void AddAutocadBase(this IServiceCollection serviceCollection)
  {
-    serviceCollection.AddConnectors();
+    serviceCollection.AddConnectorUtils();
    serviceCollection.AddDUI<DefaultThreadContext, AutocadDocumentStore>();
    serviceCollection.AddDUIView();

@@ -1,4 +1,3 @@
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
@@ -10,16 +9,17 @@ public class AutocadDocumentStore : DocumentModelStore
  private const string NULL_DOCUMENT_NAME = "Null Doc";
  private string _previousDocName;
  private readonly AutocadDocumentManager _autocadDocumentManager;
+  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;

  public AutocadDocumentStore(
-    ILogger<DocumentModelStore> logger,
    IJsonSerializer jsonSerializer,
    AutocadDocumentManager autocadDocumentManager,
    ITopLevelExceptionHandler topLevelExceptionHandler
  )
-    : base(logger, jsonSerializer)
+    : base(jsonSerializer)
  {
    _autocadDocumentManager = autocadDocumentManager;
+    _topLevelExceptionHandler = topLevelExceptionHandler;
    _previousDocName = NULL_DOCUMENT_NAME;

    // POC: Will be addressed to move it into AutocadContext!
@@ -101,23 +101,6 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>

      instanceProxiesWithSameDefinition.Add(_instanceObjectsManager.GetInstanceProxy(instanceId));

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

-        // In the case of dynamic blocks, this prevents sending objects that are not visible in its current state.
-        // Also skipping AttributeDefinition because it only contains default text values. We convert AttributeReference above instead, as a separate object.
-        if (!obj.Visible || obj is AttributeDefinition)
+        // In the case of dynamic blocks, this prevents sending objects that are not visibile in its current state.
+        if (!obj.Visible)
        {
          continue;
        }
+
        string appId = obj.GetSpeckleApplicationId();
        definitionProxy.objects.Add(appId);

@@ -83,7 +83,7 @@ public class AutocadHostObjectBuilder(
      colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
    }

-    // 4 - Convert atomic objects
+    // 5 - Convert atomic objects
    HashSet<ReceiveConversionResult> results = new();
    HashSet<string> bakedObjectIds = new();
    Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap = new();
@@ -116,7 +116,7 @@ public class AutocadHostObjectBuilder(
      }
    }

-    // 5 - Convert instances
+    // 6 - 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);

-    // 6 - Create groups
+    // 7 - 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/polycurve
+      case List<(Entity, Base)> listConversionResult: // this is from fallback conversion for brep/brepx/subdx/extrusionx
        var bakedFallbackEntities = BakeObjectsAsGroup(listConversionResult, obj, layerName, baseLayerNamePrefix);
        convertedEntities.UnionWith(bakedFallbackEntities);
        break;
@@ -1,10 +1,10 @@
-using Speckle.Connectors.Common;
+using Speckle.Sdk.Host;

 namespace Speckle.Connectors.Autocad.Plugin;

 public static class AppUtils
 {
-  public static Speckle.Sdk.Application App =>
+  public static HostApplication App =>
 #if CIVIL3D
    HostApplications.Civil3D;
 #elif AUTOCAD
@@ -14,9 +14,7 @@ public static class AppUtils
 #endif

  public static HostAppVersion Version =>
-#if AUTOCAD2026 || CIVIL3D2026
-    HostAppVersion.v2026;
-#elif AUTOCAD2025 || CIVIL3D2025
+#if AUTOCAD2025 || CIVIL3D2025
    HostAppVersion.v2025;
 #elif AUTOCAD2024 || CIVIL3D2024
    HostAppVersion.v2024;
@@ -1,11 +1,9 @@
+using System.IO;
 using System.Reflection;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Autodesk.Windows;
 using Speckle.Sdk;
-#if !AUTOCAD2025_OR_GREATER && !CIVIL3D2025_OR_GREATER
-using System.IO;
-#endif

 namespace Speckle.Connectors.Autocad.Plugin;

@@ -9,7 +9,6 @@
    <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" />
@@ -6,10 +6,12 @@
    <Civil3DVersion>2022</Civil3DVersion>
    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2022;CIVIL3D2022_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3D.API"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" />
+    <PackageReference Include="Speckle.Civil3D.API" />
  </ItemGroup>
  
  <ItemGroup>
@@ -268,16 +268,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -302,7 +304,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +348,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -367,14 +369,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -6,11 +6,13 @@
    <Civil3DVersion>2023</Civil3DVersion>
    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" />
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2023.0.0" />
  </ItemGroup>
  
  <ItemGroup>
@@ -268,16 +268,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -302,7 +304,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +348,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -367,14 +369,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -6,11 +6,13 @@
    <Civil3DVersion>2024</Civil3DVersion>
    <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" />
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2024.0.0" />
  </ItemGroup>
  
  <ItemGroup>
@@ -268,16 +268,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -302,7 +304,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +348,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -367,14 +369,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net8.0-windows</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseWpf>true</UseWpf>
    <Civil3DVersion>2025</Civil3DVersion>
    <DefineConstants>$(DefineConstants);CIVIL3D2025;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER</DefineConstants>
    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" />
+    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" />
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App" />
  </ItemGroup>  
  
  <ItemGroup>   
@@ -224,16 +224,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -259,7 +261,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -303,18 +305,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -323,14 +325,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Civil3DVersion>2026</Civil3DVersion>
-    <DefineConstants>$(DefineConstants);CIVIL3D2026;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER;CIVIL3D2026_OR_GREATER</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!--This is needed for managed dependencies-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!--This is needed for the rest-->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <!--This is needed just to keep folder paths the same as the netframework versions of autocad/civil-->
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
-  </ItemGroup>  
-  
-  <ItemGroup>   
-    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2026\Speckle.Converters.Civil3d2026.csproj" />   
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
-  </ItemGroup>
-  
-  <Import Project="..\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
-  
-  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-</Project>
@@ -1,60 +0,0 @@
-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));
-  }
-}
@@ -16,20 +16,16 @@ public static class Civil3dConnectorModule
  public static void AddCivil3d(this IServiceCollection serviceCollection)
  {
    serviceCollection.AddAutocadBase();
-
-    // add send
    serviceCollection.LoadSend();
+
+    // register civil specific send classes
    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Civil3dRootObjectBuilder>();
    serviceCollection.AddSingleton<IBinding, Civil3dSendBinding>();

-    // add receive
-    serviceCollection.LoadReceive();
-    serviceCollection.AddSingleton<IBinding, Civil3dReceiveBinding>();
+    // automatically detects the Class:IClass interface pattern to register all generated interfaces
+    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());

    // additional classes
    serviceCollection.AddScoped<PropertySetDefinitionHandler>();
-
-    // automatically detects the Class:IClass interface pattern to register all generated interfaces
-    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());
  }
 }
@@ -50,6 +50,7 @@ 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;
@@ -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>
@@ -65,9 +65,6 @@ 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;
@@ -101,7 +101,7 @@ public sealed class CsiSharedSendBinding : ISendBinding
        .ServiceProvider.GetRequiredService<SendOperation<ICsiWrapper>>()
        .Execute(
          wrappers,
-          modelCard.GetSendInfo(_speckleApplication.ApplicationAndVersion),
+          modelCard.GetSendInfo(_speckleApplication.Slug),
          _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
          cancellationItem.Token
        );
@@ -26,7 +26,6 @@ public class CsiDocumentModelStore : DocumentModelStore, IDisposable
  private string ModelPathHash { get; set; }

  public CsiDocumentModelStore(
-    ILogger<DocumentModelStore> baseLogger,
    IJsonSerializer jsonSerializer,
    ISpeckleApplication speckleApplication,
    ILogger<CsiDocumentModelStore> logger,
@@ -34,7 +33,7 @@ public class CsiDocumentModelStore : DocumentModelStore, IDisposable
    ITopLevelExceptionHandler topLevelExceptionHandler,
    IThreadContext threadContext
  )
-    : base(baseLogger, jsonSerializer)
+    : base(jsonSerializer)
  {
    _threadContext = threadContext;
    _speckleApplication = speckleApplication;
@@ -7,6 +7,7 @@ using Speckle.Connectors.CSiShared.HostApp;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converters.CSiShared;
+using Speckle.Sdk.Host;

 namespace Speckle.Connectors.CSiShared;

@@ -35,7 +36,7 @@ public abstract class SpeckleFormBase : Form, ICsiApplicationService
    services.AddCsiConverters();
  }

-  protected abstract Speckle.Sdk.Application GetHostApplication();
+  protected abstract HostApplication GetHostApplication();

  protected abstract HostAppVersion GetVersion();

@@ -24,7 +24,7 @@ public static class ServiceRegistration
  {
    services.AddSingleton<IBrowserBridge, BrowserBridge>();

-    services.AddConnectors();
+    services.AddConnectorUtils();
    services.AddDUI<DefaultThreadContext, CsiDocumentModelStore>();
    services.AddDUIView();

@@ -1,5 +1,5 @@
-using Speckle.Connectors.Common;
 using Speckle.Connectors.ETABSShared;
+using Speckle.Sdk.Host;

 // NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
 // Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -285,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.etabs21": {
@@ -335,18 +337,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -356,14 +358,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -1,5 +1,5 @@
-using Speckle.Connectors.Common;
 using Speckle.Connectors.ETABSShared;
+using Speckle.Sdk.Host;

 // NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
 // Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed
@@ -215,16 +215,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -241,7 +243,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.etabs22": {
@@ -291,18 +293,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.CSharp": "4.7.0",
@@ -311,14 +313,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    }
  }
@@ -1,12 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Common;
 using Speckle.Connectors.CSiShared;
+using Speckle.Sdk.Host;

 namespace Speckle.Connectors.ETABSShared;

 public abstract class EtabsSpeckleFormBase : SpeckleFormBase
 {
-  protected override Speckle.Sdk.Application GetHostApplication() => HostApplications.ETABS;
+  protected override HostApplication GetHostApplication() => HostApplications.ETABS;

  protected override void ConfigureServices(IServiceCollection services)
  {
@@ -16,7 +16,7 @@

  <ItemGroup>
    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2020.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2020.0.0"/>
  </ItemGroup>

  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -285,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.navisworks2020": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -16,7 +16,7 @@

  <ItemGroup>
    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2021.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2021.0.0"/>
  </ItemGroup>

  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -285,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.navisworks2021": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -16,7 +16,7 @@

  <ItemGroup>
    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2022.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2022.0.0"/>
  </ItemGroup>

  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -285,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.navisworks2022": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -16,7 +16,7 @@

  <ItemGroup>
    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2023.0.0"/>
  </ItemGroup>

  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -285,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.navisworks2023": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -16,7 +16,7 @@

  <ItemGroup>
    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2024.0.0"/>
  </ItemGroup>

  <ItemGroup>
@@ -259,16 +259,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -285,7 +287,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.navisworks2024": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -16,7 +16,7 @@

  <ItemGroup>
    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2025.0.0"/>
    <PackageReference Include="Microsoft.Web.WebView2" VersionOverride="1.0.2045.28" />
  </ItemGroup>

@@ -265,16 +265,18 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui": {
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
+          "Speckle.Connectors.Common": "[1.0.0, )",
+          "Speckle.Sdk": "[3.1.0-dev.270, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.270, )"
        }
      },
      "speckle.connectors.dui.webview": {
@@ -291,7 +293,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
+          "Speckle.Objects": "[3.1.0-dev.270, )"
        }
      },
      "speckle.converters.navisworks2025": {
@@ -337,18 +339,18 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "9lCAC/Hsz2cbTVjwgHixLX2R7TNF8C90xd6rm0LsFPRgx926k15ep4k9q9wXHrblmP5Mc34qD1x9cwrSXzCiaA==",
        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
+          "Speckle.Sdk": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "dzcd3A5jn4KpcgC8a1VuoLt1RwDvUfazmi5uKbiXuGFuxXMkGbZXr+xmXbyDL1C0HQqm+vZpOBcdSea/Q62/0g==",
        "dependencies": {
          "GraphQL.Client": "6.0.0",
          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -358,14 +360,14 @@
          "Microsoft.Extensions.Logging": "2.2.0",
          "Speckle.DoubleNumerics": "4.1.0",
          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.270"
        }
      },
      "Speckle.Sdk.Dependencies": {
        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
+        "requested": "[3.1.0-dev.270, )",
+        "resolved": "3.1.0-dev.270",
+        "contentHash": "4nkNrmfNwnI+clIgZgBn+M42ISstQs1GrZH/6F97cmU0uczanVy0JTw011vKp5pPGmwZx8QFxVXbvwV5Ofx47A=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -1,9 +0,0 @@
-{
-  "profiles": {
-    "Speckle.Connector.Navisworks2026": {
-      "commandName": "Executable",
-      "executablePath": "C:\\Program Files\\Autodesk\\Navisworks Manage 2026\\Roamer.exe",
-      "commandLineArgs": " -licensing AdLM"
-    }
-  }
-}
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <FileAlignment>512</FileAlignment>
-
-    <NavisworksBuildNumber>v23</NavisworksBuildNumber>
-    <NavisworksVersion>2026</NavisworksVersion>
-
-    <DefineConstants>$(DefineConstants);TRACE;NAVIS2026;NAVIS</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
-
-  <ItemGroup>
-    <Reference Include="WindowsFormsIntegration"/>
-    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2026.0.1" ExcludeAssets="runtime"/>
-    <PackageReference Include="Microsoft.Web.WebView2" VersionOverride="1.0.2365.46" />
-    <PackageReference Include="System.Reactive" VersionOverride="6.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2026\Speckle.Converters.Navisworks2026.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
-  </ItemGroup>
-</Project>
@@ -1,387 +0,0 @@
-{
-  "version": 2,
-  "dependencies": {
-    ".NETFramework,Version=v4.8": {
-      "Microsoft.NETFramework.ReferenceAssemblies": {
-        "type": "Direct",
-        "requested": "[1.0.3, )",
-        "resolved": "1.0.3",
-        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
-        "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
-        }
-      },
-      "Microsoft.SourceLink.GitHub": {
-        "type": "Direct",
-        "requested": "[8.0.0, )",
-        "resolved": "8.0.0",
-        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
-        "dependencies": {
-          "Microsoft.Build.Tasks.Git": "8.0.0",
-          "Microsoft.SourceLink.Common": "8.0.0"
-        }
-      },
-      "Microsoft.Web.WebView2": {
-        "type": "Direct",
-        "requested": "[1.0.2365.46, )",
-        "resolved": "1.0.2365.46",
-        "contentHash": "8L/Wv1r6NRSYpaaywBE/zcjDShTlTCEqBgsrB0xPQ11umziTtSNTu/rcLVazoQhHfVnQvX/fruMtdJCiPTDuyQ=="
-      },
-      "PolySharp": {
-        "type": "Direct",
-        "requested": "[1.14.1, )",
-        "resolved": "1.14.1",
-        "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
-      },
-      "Speckle.InterfaceGenerator": {
-        "type": "Direct",
-        "requested": "[0.9.6, )",
-        "resolved": "0.9.6",
-        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
-      },
-      "Speckle.Navisworks.API": {
-        "type": "Direct",
-        "requested": "[2026.0.1, )",
-        "resolved": "2026.0.1",
-        "contentHash": "IjIxv+EGmEVYquljXMCNxdBY7kGBeMxEecIdXvyzBj3dLLhJjqpmyfA2Yheq4pfK4AmE6LWZ5mQyD+39onApRw=="
-      },
-      "System.Reactive": {
-        "type": "Direct",
-        "requested": "[6.0.0, )",
-        "resolved": "6.0.0",
-        "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "GraphQL.Client": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0",
-          "GraphQL.Client.Abstractions.Websocket": "6.0.0",
-          "System.Net.WebSockets.Client.Managed": "1.0.22",
-          "System.Reactive": "5.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==",
-        "dependencies": {
-          "GraphQL.Primitives": "6.0.0"
-        }
-      },
-      "GraphQL.Client.Abstractions.Websocket": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==",
-        "dependencies": {
-          "GraphQL.Client.Abstractions": "6.0.0"
-        }
-      },
-      "GraphQL.Primitives": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
-      },
-      "Microsoft.Bcl.AsyncInterfaces": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
-        "dependencies": {
-          "System.Threading.Tasks.Extensions": "4.5.4"
-        }
-      },
-      "Microsoft.Build.Tasks.Git": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
-      },
-      "Microsoft.CSharp": {
-        "type": "Transitive",
-        "resolved": "4.7.0",
-        "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA=="
-      },
-      "Microsoft.Data.Sqlite": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==",
-        "dependencies": {
-          "Microsoft.Data.Sqlite.Core": "7.0.5",
-          "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4"
-        }
-      },
-      "Microsoft.Data.Sqlite.Core": {
-        "type": "Transitive",
-        "resolved": "7.0.5",
-        "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "Microsoft.Extensions.Configuration": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "nOP8R1mVb/6mZtm2qgAJXn/LFm/2kMjHDAg/QJLFG6CuWYJtaD3p1BwQhufBVvRzL9ceJ/xF0SQ0qsI2GkDQAA==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "65MrmXCziWaQFrI0UHkQbesrX5wTwf9XPjY5yFm/VkgJKFJ5gqvXRoXjIZcf2wLi5ZlwGz/oMYfyURVCWbM5iw==",
-        "dependencies": {
-          "Microsoft.Extensions.Primitives": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Binder": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "vJ9xvOZCnUAIHcGC3SU35r3HKmHTVIeHzo6u/qzlHAqD8m6xv92MLin4oJntTvkpKxVX3vI1GFFkIQtU3AdlsQ==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
-      "Microsoft.Extensions.Options": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "UpZLNLBpIZ0GTebShui7xXYh6DmBHjWM8NxGxZbdQh/bPZ5e6YswqI+bru6BnEL5eWiOdodsXtEz3FROcgi/qg==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Primitives": "2.2.0",
-          "System.ComponentModel.Annotations": "4.5.0"
-        }
-      },
-      "Microsoft.Extensions.Primitives": {
-        "type": "Transitive",
-        "resolved": "2.2.0",
-        "contentHash": "azyQtqbm4fSaDzZHD/J+V6oWMFaf2tWP4WEGIYePLCMw3+b2RQdj9ybgbQyjCshcitQKQ4lEDOZjmSlTTrHxUg==",
-        "dependencies": {
-          "System.Memory": "4.5.1",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.1"
-        }
-      },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
-        "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
-      },
-      "Microsoft.SourceLink.Common": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
-      },
-      "Speckle.Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.2",
-        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
-      },
-      "SQLitePCLRaw.bundle_e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
-        "dependencies": {
-          "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
-          "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4"
-        }
-      },
-      "SQLitePCLRaw.core": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
-      },
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      },
-      "SQLitePCLRaw.provider.dynamic_cdecl": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==",
-        "dependencies": {
-          "SQLitePCLRaw.core": "2.1.4"
-        }
-      },
-      "System.Buffers": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
-      },
-      "System.ComponentModel.Annotations": {
-        "type": "Transitive",
-        "resolved": "4.5.0",
-        "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
-      },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
-        "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
-        }
-      },
-      "System.Net.WebSockets.Client.Managed": {
-        "type": "Transitive",
-        "resolved": "1.0.22",
-        "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==",
-        "dependencies": {
-          "System.Buffers": "4.4.0",
-          "System.Numerics.Vectors": "4.4.0"
-        }
-      },
-      "System.Numerics.Vectors": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
-      },
-      "System.Runtime.CompilerServices.Unsafe": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
-      },
-      "System.Threading.Tasks.Extensions": {
-        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
-        }
-      },
-      "speckle.connectors.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.3.5, )",
-          "Speckle.Sdk": "[3.3.5, )",
-          "Speckle.Sdk.Dependencies": "[3.3.5, )"
-        }
-      },
-      "speckle.connectors.dui": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )"
-        }
-      },
-      "speckle.connectors.dui.webview": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
-          "Speckle.Connectors.DUI": "[1.0.0, )"
-        }
-      },
-      "speckle.connectors.logging": {
-        "type": "Project"
-      },
-      "speckle.converters.common": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.3.5, )"
-        }
-      },
-      "speckle.converters.navisworks2026": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.Connectors.DUI": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Navisworks.API": "[2026.0.1, )",
-          "System.Reactive": "[6.0.0, )"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
-        "dependencies": {
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "Nxqhadc9FCmFHzU+fz3oc8sFlE6IadViYg8dfUdGzJZ2JUxnCsRghBhhOWdM4B2zSZqEc+0BjliBh/oNdRZuig==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Binder": "2.2.0",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Options": "2.2.0"
-        }
-      },
-      "Microsoft.Extensions.Logging.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[2.2.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
-      },
-      "Speckle.DoubleNumerics": {
-        "type": "CentralTransitive",
-        "requested": "[4.1.0, )",
-        "resolved": "4.1.0",
-        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
-      },
-      "Speckle.Objects": {
-        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "VPbYI8TyPDlKlNUHPLPAL1HveN9649LKVxw8opgGypoqq0MC5I7WxQjDcuB8xKnQ1PCSO8suu4hEJgdyPcEvWg==",
-        "dependencies": {
-          "Speckle.Sdk": "3.3.5"
-        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "7r8CmugwinniEF6v0N0bWuC+xpJaRfa/EnEjzj8NLpFG1b3uAjOxteGlQgR+evVacxTCEsuNkio7Mdv97odgpg==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.3.5"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.3.5, )",
-        "resolved": "3.3.5",
-        "contentHash": "RukqLb0lVNgtmhKPeZJCncibnyutQ6Dr6+UQCa4PjWinIXpSm3A3ywK9ISkU+5StW1QoejiR7kc9a6qmiLys6w=="
-      }
-    },
-    ".NETFramework,Version=v4.8/win-x64": {
-      "Microsoft.Web.WebView2": {
-        "type": "Direct",
-        "requested": "[1.0.2365.46, )",
-        "resolved": "1.0.2365.46",
-        "contentHash": "8L/Wv1r6NRSYpaaywBE/zcjDShTlTCEqBgsrB0xPQ11umziTtSNTu/rcLVazoQhHfVnQvX/fruMtdJCiPTDuyQ=="
-      },
-      "SQLitePCLRaw.lib.e_sqlite3": {
-        "type": "Transitive",
-        "resolved": "2.1.4",
-        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
-      }
-    }
-  }
-}
@@ -50,8 +50,6 @@ 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) =>
@@ -26,7 +26,7 @@ public class NavisworksSelectionBinding : ISelectionBinding
  }

  private void OnSelectionChange(object? o, EventArgs eventArgs) =>
-    _idleManager.SubscribeToIdle(nameof(UpdateSelectionAsync), async () => await UpdateSelectionAsync());
+    _idleManager.SubscribeToIdle(nameof(NavisworksSelectionBinding), async () => await UpdateSelectionAsync());

  private async Task UpdateSelectionAsync()
  {
@@ -38,8 +38,7 @@ public class NavisworksSelectionBinding : ISelectionBinding
  {
    // Ensure there is an active document and a valid selection
    var activeDocument = NavisworksApp.ActiveDocument;
-    var selection = activeDocument?.CurrentSelection?.SelectedItems ?? [];
-    if (selection.Count == 0)
+    if (activeDocument == null || activeDocument.CurrentSelection.SelectedItems.IsEmpty)
    {
      // Return an empty list if no valid selection exists
      return new SelectionInfo([], "No selection available");
@@ -47,8 +46,8 @@ public class NavisworksSelectionBinding : ISelectionBinding

    // Ensure only visible elements are processed by filtering using IsElementVisible
    var selectedObjectsIds = new HashSet<string>(
-      selection
-        .Where(_selectionService.IsVisible) // Exclude hidden elements
+      activeDocument
+        .CurrentSelection.SelectedItems.Where(_selectionService.IsVisible) // Exclude hidden elements
        .Select(_selectionService.GetModelItemPath) // Resolve to index paths
    );

@@ -1,6 +1,5 @@
 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;
@@ -31,6 +30,7 @@ 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,6 +44,7 @@ public class NavisworksSendBinding : ISendBinding
  public NavisworksSendBinding(
    DocumentModelStore store,
    IBrowserBridge parent,
+    IEnumerable<ISendFilter> sendFilters,
    IServiceProvider serviceProvider,
    ICancellationManager cancellationManager,
    IOperationProgressManager operationProgressManager,
@@ -60,6 +61,7 @@ public class NavisworksSendBinding : ISendBinding
    Commands = new SendBindingUICommands(parent);
    _store = store;
    _serviceProvider = serviceProvider;
+    _sendFilters = sendFilters.ToList();
    _cancellationManager = cancellationManager;
    _operationProgressManager = operationProgressManager;
    _logger = logger;
@@ -74,12 +76,7 @@ public class NavisworksSendBinding : ISendBinding

  private static void SubscribeToNavisworksEvents() { }

-  // 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<ISendFilter> GetSendFilters() => _sendFilters;

  public List<ICardSetting> GetSendSettings() =>
    [
@@ -87,7 +84,6 @@ public class NavisworksSendBinding : ISendBinding
      new OriginModeSetting(OriginMode.ModelOrigin),
      new IncludeInternalPropertiesSetting(false),
      new ConvertHiddenElementsSetting(false),
-      new PreserveModelHierarchySetting(false),
    ];

  public async Task Send(string modelCardId) =>
@@ -106,21 +102,9 @@ public class NavisworksSendBinding : ISendBinding

      using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId);

-      var progress = _operationProgressManager.CreateOperationProgressEventHandler(
-        Parent,
-        modelCard.ModelCardId.NotNull(),
-        cancellationItem.Token
-      );
+      var navisworksModelItems = GetNavisworksModelItems(modelCard);

-      var navisworksModelItems = await GetNavisworksModelItems(modelCard, progress);
-
-      var sendResult = await ExecuteSendOperation(
-        scope,
-        modelCard,
-        navisworksModelItems,
-        progress,
-        cancellationItem.Token
-      );
+      var sendResult = await ExecuteSendOperation(scope, modelCard, navisworksModelItems, cancellationItem.Token);

      await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
    }
@@ -135,16 +119,12 @@ 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) as SenderModelCard
-    ?? throw new InvalidOperationException("No publish model card was found.");
+    _store.GetModelById(modelCardId) is not SenderModelCard modelCard
+      ? throw new InvalidOperationException("No publish model card was found.")
+      : modelCard;

  private void InitializeConverterSettings(IServiceScope scope, SenderModelCard modelCard) =>
    scope
@@ -154,56 +134,43 @@ public class NavisworksSendBinding : ISendBinding
          originMode: _toSpeckleSettingsManagerNavisworks.GetOriginMode(modelCard),
          visualRepresentationMode: _toSpeckleSettingsManagerNavisworks.GetVisualRepresentationMode(modelCard),
          convertHiddenElements: _toSpeckleSettingsManagerNavisworks.GetConvertHiddenElements(modelCard),
-          includeInternalProperties: _toSpeckleSettingsManagerNavisworks.GetIncludeInternalProperties(modelCard),
-          preserveModelHierarchy: _toSpeckleSettingsManagerNavisworks.GetPreserveModelHierarchy(modelCard)
+          includeInternalProperties: _toSpeckleSettingsManagerNavisworks.GetIncludeInternalProperties(modelCard)
        )
      );

-  private async Task<List<NAV.ModelItem>> GetNavisworksModelItems(
-    SenderModelCard modelCard,
-    IProgress<CardProgress> onOperationProgressed
-  )
+  private List<NAV.ModelItem> GetNavisworksModelItems(SenderModelCard modelCard)
  {
    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(message);
+      throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
    }
-    onOperationProgressed.Report(new CardProgress("Getting selection...", null));
-    await Task.CompletedTask;

-    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;
+    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;
  }

  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.ApplicationAndVersion),
-        onOperationProgressed,
+        modelCard.GetSendInfo(_speckleApplication.Slug),
+        _operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCard.ModelCardId.NotNull(), token),
        token
      );

@@ -26,7 +26,7 @@ public static class NavisworksConnectorServiceRegistration
  public static void AddNavisworks(this IServiceCollection serviceCollection)
  {
    // Register Core functionality
-    serviceCollection.AddConnectors();
+    serviceCollection.AddConnectorUtils();
    serviceCollection.AddDUI<DefaultThreadContext, NavisworksDocumentModelStore>();
    serviceCollection.AddDUIView();

@@ -67,7 +67,6 @@ public static class NavisworksConnectorServiceRegistration

    // register filters
    serviceCollection.AddScoped<ISendFilter, NavisworksSelectionFilter>();
-    serviceCollection.AddScoped<ISendFilter, NavisworksSavedSetsFilter>();
    serviceCollection.AddScoped<IElementSelectionService, ElementSelectionService>();
  }
 }
@@ -1,31 +1,23 @@
-using Speckle.InterfaceGenerator;
-using static Speckle.Converter.Navisworks.Helpers.ElementSelectionHelper;
+using static Speckle.Converter.Navisworks.Helpers.ElementSelectionHelper;

 namespace Speckle.Connector.Navisworks.Services;

-[GenerateAutoInterface]
+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);
+}
+
 public class ElementSelectionService : IElementSelectionService
 {
-  private readonly Dictionary<Guid, bool> _visibleCache = new();
-
  public string GetModelItemPath(NAV.ModelItem modelItem) => ResolveModelItemToIndexPath(modelItem);

  public NAV.ModelItem GetModelItemFromPath(string path) => ResolveIndexPathToModelItem(path);

-  public bool IsVisible(NAV.ModelItem modelItem)
-  {
-    var key = modelItem.InstanceGuid;
-    if (_visibleCache.TryGetValue(key, out var isVisible))
-    {
-      return isVisible;
-    }
-    //same as ElementSelectionHelper.IsElementVisible
-    foreach (var item in modelItem.AncestorsAndSelf)
-    {
-      _visibleCache[item.InstanceGuid] = !item.IsHidden;
-    }
-    return _visibleCache[key];
-  }
+  public bool IsVisible(NAV.ModelItem modelItem) => IsElementVisible(modelItem);

-  public IEnumerable<NAV.ModelItem> GetGeometryNodes(NAV.ModelItem modelItem) => ResolveGeometryLeafNodes(modelItem);
+  public IReadOnlyCollection<NAV.ModelItem> GetGeometryNodes(NAV.ModelItem modelItem) =>
+    ResolveGeometryLeafNodes(modelItem);
 }
@@ -43,13 +43,12 @@ public class NavisworksColorUnpacker(
    Dictionary<string, ColorProxy> colorProxies = [];
    Dictionary<string, string> mergedIds = [];

+    // Build mergedIds map once
    foreach (var group in groupedNodes)
    {
-      string groupKey = group.Key;
-
-      foreach (var nodePath in group.Value.Select(selectionService.GetModelItemPath))
+      foreach (var node in group.Value)
      {
-        mergedIds[nodePath] = groupKey;
+        mergedIds[selectionService.GetModelItemPath(node)] = group.Key;
      }
    }

@@ -57,13 +56,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;
@@ -78,6 +77,7 @@ public class NavisworksColorUnpacker(
          geometry.OriginalColor,
          defaultColor
        );
+
        var colorId = Select(
          mode,
          $"{geometry.ActiveColor.GetHashCode()}_{geometry.ActiveTransparency}".GetHashCode(),
@@ -77,10 +77,7 @@ public sealed class NavisworksDocumentEvents

    _topLevelExceptionHandler.CatchUnhandled(
      () =>
-        _idleManager.SubscribeToIdle(
-          nameof(ProcessModelStateChangeAsync),
-          async () => await ProcessModelStateChangeAsync()
-        )
+        _idleManager.SubscribeToIdle(nameof(NavisworksDocumentEvents), async () => await ProcessModelStateChangeAsync())
    );
  }

@@ -1,5 +1,4 @@
 using System.Data;
-using Microsoft.Extensions.Logging;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
@@ -20,11 +19,10 @@ public sealed class NavisworksDocumentModelStore : DocumentModelStore
  private string _lastSavedState = string.Empty;

  public NavisworksDocumentModelStore(
-    ILogger<DocumentModelStore> logger,
    IJsonSerializer jsonSerializer,
    ITopLevelExceptionHandler topLevelExceptionHandler
  )
-    : base(logger, jsonSerializer)
+    : base(jsonSerializer)
  {
    _topLevelExceptionHandler = topLevelExceptionHandler;
    LoadState();
@@ -43,13 +43,12 @@ public class NavisworksMaterialUnpacker(
    Dictionary<string, RenderMaterialProxy> renderMaterialProxies = [];
    Dictionary<string, string> mergedIds = [];

+    // Build mergedIds map once
    foreach (var group in groupedNodes)
    {
-      string groupKey = group.Key;
-
-      foreach (var nodePath in group.Value.Select(selectionService.GetModelItemPath))
+      foreach (var node in group.Value)
      {
-        mergedIds[nodePath] = groupKey;
+        mergedIds[selectionService.GetModelItemPath(node)] = group.Key;
      }
    }

@@ -64,6 +63,7 @@ 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,6 +76,7 @@ public class NavisworksMaterialUnpacker(
          geometry.OriginalColor,
          defaultColor
        );
+
        var renderTransparency = Select(
          mode,
          geometry.ActiveTransparency,
@@ -83,6 +84,7 @@ public class NavisworksMaterialUnpacker(
          geometry.OriginalTransparency,
          0.0
        );
+
        var renderMaterialId = Select(
          mode,
          $"{geometry.ActiveColor.GetHashCode()}_{geometry.ActiveTransparency}".GetHashCode(),
@@ -1,132 +0,0 @@
-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 Type { get; set; } = "Select";
-  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);
-  }
-}
@@ -1,5 +1,4 @@
 using Speckle.Connector.Navisworks.Services;
-using Speckle.Converter.Navisworks.Constants;

 namespace Speckle.Connector.Navisworks.Operations.Send;

@@ -8,158 +7,16 @@ namespace Speckle.Connector.Navisworks.Operations.Send;
 /// </summary>
 public static class GeometryNodeMerger
 {
-  /// <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
+  public static Dictionary<string, List<NAV.ModelItem>> GroupSiblingGeometryNodes(IReadOnlyList<NAV.ModelItem> nodes) =>
+    nodes
      .Where(node => node.HasGeometry && string.IsNullOrEmpty(node.DisplayName)) // Only anonymous geometry nodes
      .GroupBy(node =>
      {
-        // Get parent path
-        var path = selectionService.GetModelItemPath(node);
+        var service = new ElementSelectionService();
+        var path = service.GetModelItemPath(node);
        var lastSeparatorIndex = path.LastIndexOf(PathConstants.SEPARATOR);
-        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}";
+        return lastSeparatorIndex == -1 ? path : path[..lastSeparatorIndex];
      })
-      .Where(group => group.Count() > 1) // Only include groups with multiple children
+      .Where(group => group.Count() > 1) // Only group multiples
      .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;
-  }
 }
@@ -1,146 +0,0 @@
-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 });
-    }
-  }
-}
@@ -144,27 +144,12 @@ 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);
-
-    // 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;
  }

@@ -236,8 +221,7 @@ public class NavisworksRootObjectBuilder(
  /// </remarks>
  private NavisworksObject CreateNavisworksObject(string groupKey, List<Base> siblingBases)
  {
-    string cleanParentPath = ElementSelectionHelper.GetCleanPath(groupKey);
-    (string name, string path) = GetContext(cleanParentPath);
+    (string name, string path) = GetContext(groupKey);

    return new NavisworksObject
    {
@@ -245,7 +229,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, // Use the full composite key as applicationId to preserve uniqueness
+      applicationId = groupKey,
      ["path"] = path
    };
  }
@@ -1,12 +0,0 @@
-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;
-}
@@ -17,7 +17,6 @@ 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)
  {
@@ -121,23 +120,6 @@ 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 : [];
@@ -0,0 +1,6 @@
+namespace Speckle.Connector.Navisworks;
+
+public static class PathConstants
+{
+  public const char SEPARATOR = '/';
+}
@@ -9,6 +9,7 @@ using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converter.Navisworks.DependencyInjection;
+using Speckle.Sdk.Host;

 namespace Speckle.Connector.Navisworks.Plugin;

@@ -3,12 +3,6 @@
 <ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Navisworks" Name="Speckle for Navisworks"
                    Description="Welcome to Multiplayer BIM." AppVersion="0.1.0" FriendlyVersion="0.1.0">
    <CompanyDetails Name="Speckle"/>
-    <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw23" SeriesMax="Nw23"/>
-        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2026/Speckle.Connectors.Navisworks2026.dll"
-                        AppDescription="Speckle.Connector.Navisworks2026"/>
-    </Components>
    <Components>
        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw22" SeriesMax="Nw22"/>
        <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
@@ -1,4 +1,4 @@
-using Speckle.Connectors.Common;
+using Speckle.Sdk.Host;

 namespace Speckle.Connector.Navisworks.Plugin.Tools;

@@ -14,7 +14,7 @@ public static class SpeckleV3Tool
  public const string RIBBON_STRINGS = "NavisworksRibbon.name";
  public const string PLUGIN_SUFFIX = ".Speckle";

-  public static Speckle.Sdk.Application App =>
+  public static HostApplication App =>
 #if NAVIS
    HostApplications.Navisworks;
 #else
@@ -21,16 +21,14 @@
    <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)Operations\Send\Filters\NavisworksSavedSetsFilter.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)PathConstants.cs"/>
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\BrowserPane.xaml.cs"/>
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\DockableConnectorPane.cs"/>
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\NavisworksRibbon.xaml.cs"/>
@@ -4,18 +4,10 @@
    <UseWpf>true</UseWpf>
    <RevitVersion>2022</RevitVersion>
    <DefineConstants>$(DefineConstants);REVIT2022;REVIT2022_OR_GREATER</DefineConstants>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
-
-  <PropertyGroup Label="Things needed to get ancient cef buildling with modern msbuild">
-    <!--There is a weird bug or misconfiguration in cef 65.0.1 nuget that makes it pick x86 dlls if asked to build x64.-->
-    <!--Asking it to build AnyCPU appaers to work, but generates MSB3270 warnings, which we are ignoring here-->
-    <!--Official docs suggest setting the entire solution to x64, which we can't do, and we don't want to create a new SLN just for Revit 2022-->
    <CefSharpAnyCpuSupport>true</CefSharpAnyCpuSupport>
    <Prefer32bit>false</Prefer32bit>
-    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <Configurations>Debug;Release;Local</Configurations>
  </PropertyGroup>
-  

  <Import Project="..\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems" Label="Shared" />

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Oğuzhan Koral	4bbddd46b5	Merge pull request #601 from specklesystems/dev .NET Build and Publish / build-windows (push) Has been cancelled Details .NET Build and Publish / build-linux (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update release to dev	2025-02-19 03:15:43 +03:00
Oğuzhan Koral	96e729ef50	Merge pull request #595 from specklesystems/dev .NET Build and Publish / build-windows (push) Has been cancelled Details .NET Build and Publish / build-linux (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update releases to dev	2025-02-18 19:38:22 +03:00
Björn Steinhagen	6d4e12dfae	Merge pull request #591 from specklesystems/dev test(etabs): bundled installer with ini file magic	2025-02-17 13:52:57 +01:00
Oğuzhan Koral	929db22785	Merge pull request #578 from specklesystems/dev .NET Build and Publish / build-windows (push) Has been cancelled Details .NET Build and Publish / build-linux (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details update release from dev	2025-02-10 17:53:46 +00:00
Jedd Morgan	931d7ff8d2	Merge pull request #577 from specklesystems/dev test(etabs): installer	2025-02-10 10:27:38 +00:00
Jedd Morgan	e78914955c	Merge pull request #541 from specklesystems/dev test(etabs): installer	2025-01-30 17:22:52 +00:00
Jedd Morgan	87569c9c66	Merge pull request #537 from specklesystems/dev Test for ETABS installer	2025-01-29 15:19:34 +00:00
Oğuzhan Koral	189ea3a19b	Merge pull request #501 from specklesystems/dev .NET Build and Publish / build-windows (push) Has been cancelled Details .NET Build and Publish / build-linux (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update dev to release	2025-01-16 19:18:02 +03:00
Oğuzhan Koral	370588fa89	Merge pull request #461 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update dev to release	2024-12-20 16:14:59 +03:00
Oğuzhan Koral	c9802396f5	Merge pull request #448 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update dev to release	2024-12-13 01:54:05 +03:00
Oğuzhan Koral	9644444ea7	Merge pull request #437 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update dev to release	2024-12-04 22:38:16 +03:00
Alan Rynne	bb0fffd4d7	Merge pull request #414 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update `release/3.0.0` with changes from `dev`	2024-11-27 16:23:50 +01:00
Alan Rynne	c719cfd66f	Merge pull request #383 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update `release/3.0.0` with changes from `dev`	2024-11-12 15:56:02 +01:00
Oğuzhan Koral	92435ce1a1	Merge pull request #376 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update release/3.0.0 with changes from dev	2024-11-08 18:16:16 +00:00
Oğuzhan Koral	71409e8af8	Merge pull request #374 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update release/3.0.0 with changes from dev	2024-11-08 15:13:47 +00:00
Alan Rynne	8060f46882	Merge pull request #359 from specklesystems/dev Update `release/3.0.0` with changes from `dev`	2024-11-06 18:49:52 +01:00
Alan Rynne	6671edd36e	Merge pull request #354 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update `release/3.0.0` with changes from `dev`	2024-11-06 14:22:08 +01:00
Alan Rynne	bc15ff3a34	Merge pull request #347 from specklesystems/dev Update `release/3.0.0` with changes from `dev`	2024-11-05 10:30:20 +01:00
Alan Rynne	de275dcf02	Merge pull request #337 from specklesystems/dev .NET Build and Publish / build (push) Has been cancelled Details .NET Build and Publish / test (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update `release/3.0.0` with changes from `dev`	2024-10-31 12:17:57 +01:00
Alan Rynne	6158739df0	Merge pull request #331 from specklesystems/dev Update `release/3.0.0` with changes from `dev`	2024-10-28 13:05:26 +01:00