Update SpecklePropertyGoo.cs

* fix: `consumedObjectIds` tracking preventing duplicate nested block instances

* refactor: remove redundant `isDefinitionObject` logic

.config/dotnet-tools.json

@@ -3,14 +3,14 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "1.2.6",
+      "version": "0.28.2",
       "commands": [
-        "csharpier"
+        "dotnet-csharpier"
       ],
       "rollForward": false
     },
     "dotnet-affected": {
-      "version": "6.2.0",
+      "version": "5.0.0",
       "commands": [
         "dotnet-affected"
       ],

.csharpierignore

@@ -1,29 +0,0 @@
-Directory.Build.targets
-Directory.Build.props
-Directory.Packages.props
-
-*.slnx
-
-**/bin/*
-**/obj/*
-_ReSharper.SharpCompress/
-bin/
-*.suo
-*.user
-TestArchives/Scratch/
-TestArchives/Scratch2/
-TestResults/
-*.nupkg
-packages/*/
-project.lock.json
-tests/TestArchives/Scratch
-.vs
-tools
-.vscode
-.idea/
-
-.DS_Store
-*.snupkg
-coverage.xml
-
-*.received.*

.csharpierrc.yaml

@@ -1,7 +1,7 @@
 printWidth: 120
 useTabs: false
-indentSize: 2
+tabWidth: 2
 preprocessorSymbolSets:
-  - ""
-  - "DEBUG"
-  - "DEBUG,CODE_STYLE"
+    - ""
+    - "DEBUG"
+    - "DEBUG,CODE_STYLE"

.github/CODEOWNERS

@@ -6,34 +6,34 @@
 
 # Connectors
 
-/Connectors/Autocad/* @oguzhankoral @JR-Morgan @dogukankaratas
-/Connectors/Civil3d/* @oguzhankoral @JR-Morgan @dogukankaratas
+/Connectors/ArcGIS/* @KatKatKateryna
+/Connectors/Autocad/* @clairekuang @oguzhankoral @didimitrie
+/Connectors/Civil3d/* @clairekuang @oguzhankoral @didimitrie
 /Connectors/CSi/* @bjoernsteinhagen @dogukankaratas
 /Connectors/Navisworks/* @jsdbroughton
-/Connectors/Revit/* @oguzhankoral
-/Connectors/Rhino/* @oguzhankoral @JR-Morgan
+/Connectors/Revit/* @clairekuang @oguzhankoral @didimitrie
+/Connectors/Rhino/* @clairekuang @oguzhankoral @didimitrie
 /Connectors/Tekla/* @bjoernsteinhagen @dogukankaratas
 
 # Converters
-/Convertors/Autocad/* @oguzhankoral @JR-Morgan @dogukankaratas
-/Convertors/Civil3d/* @oguzhankoral @JR-Morgan @dogukankaratas
+/Convertors/ArcGIS/* @KatKatKateryna
+/Convertors/Autocad/* @clairekuang @oguzhankoral @didimitrie
+/Convertors/Civil3d/* @clairekuang @oguzhankoral @didimitrie
 /Convertors/CSi/* @bjoernsteinhagen @dogukankaratas
 /Convertors/Navisworks/* @jsdbroughton
-/Convertors/Revit/* @oguzhankoral
-/Convertors/Rhino/* @oguzhankoral @JR-Morgan
+/Convertors/Revit/* @clairekuang @oguzhankoral @didimitrie
+/Convertors/Rhino/* @clairekuang @oguzhankoral @didimitrie
 /Convertors/Tekla/* @bjoernsteinhagen @dogukankaratas
 
 # DUI
 
-/DUI3/* @oguzhankoral
+/DUI3/* @clairekuang @oguzhankoral @didimitrie
 
 # Importers
-/Importers/* @JR-Morgan @oguzhankoral
+/Importers/* @JR-Morgan @didimitrie @oguzhankoral @adamhathcock
 
 # SDK
-/SDK/* @JR-Morgan @oguzhankoral
+/SDK/* @JR-Morgan @clairekuang @didimitrie @oguzhankoral @adamhathcock
 
 # Build
-/Build/* @JR-Morgan @oguzhankoral
-/.github/* @JR-Morgan @oguzhankoral
-/.config/* @JR-Morgan @oguzhankoral
+/Build/* @JR-Morgan @oguzhankoral @adamhathcock

.github/workflows/pr.yml

@@ -1,42 +1,56 @@
-name: .NET Test
+name: .NET Build
 
-on:
-  pull_request: {}
-  push:
-    branches: ["main"]
+on: pull_request
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
+  build:
+    runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
 
       - name: Cache Nuget
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name: ⚒️ Run Test
-        run: ./build.sh test-and-pack
+      - name: ⚒️ Run build
+        run: ./build.ps1 test
+  test:
+    runs-on: ubuntu-latest
+    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
+        uses: actions/cache@v4
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+
+      - name: ⚒️ Run Build on Linux
+        run: ./build.sh build-linux
+
+      - name: ⚒️ Run tests
+        run: ./build.sh test-only
 
       - name: Upload coverage reports to Codecov with GitHub Action
-        uses: codecov/codecov-action@v6
+        uses: codecov/codecov-action@v5
         with:
           files: Converters/**/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
-
-      # Disabling this code for now, since we no longer need to publish nugets from this repo
-      # But keeping it around incase we ever need in the future.
-      # Ideally, I'd also like to move the nuget token to be an environment secret, and to have tight package scopes
-#      - name: Push to nuget.org
-#        if: ${{ inputs.deployNugets }}
-#        run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{ secrets.CONNECTORS_NUGET_TOKEN }}

.github/workflows/release.yml

@@ -6,8 +6,8 @@ on:
     tags: ["v3.*.*"] # Manual delivery on every 3.x tag
 
 jobs:
-  build-connectors:
-    runs-on: windows-latest # Keeping on windows for now, for cross platform building of exe projects, we need to use dotnet publish
+  build-windows:
+    runs-on: windows-latest
     env:
       SEMVER: "unset"
       FILE_VERSION: "unset"
@@ -16,26 +16,26 @@ jobs:
       file_version: ${{ steps.set-version.outputs.file_version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)
 
       - name: Cache Nuget
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name: ⚒️ Run build and zip connectors
+      - name: ⚒️ Run build on Windows
         run: ./build.ps1 zip
 
       - name: ⬆️ Upload artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: output-${{ env.SEMVER }}
           path: output/*.*
@@ -51,29 +51,65 @@ jobs:
 
   deploy-installers:
     runs-on: ubuntu-latest
-    needs: build-connectors
+    needs: build-windows
     env:
       IS_PUBLIC_RELEASE: ${{ github.ref_type == 'tag' }}
     steps:
       - name: 🔫 Trigger Build Installers
-        uses: benc-uk/workflow-dispatch@v1
+        uses: the-actions-org/workflow-dispatch@v4.0.0
         with:
           workflow: Build Installers
           repo: specklesystems/connector-installers
           token: ${{ secrets.CONNECTORS_GH_TOKEN }}
           inputs: '{
             "run_id": "${{ github.run_id }}",
-            "semver": "${{ needs.build-connectors.outputs.semver }}",
-            "file_version": "${{ needs.build-connectors.outputs.file_version }}",
+            "semver": "${{ needs.build-windows.outputs.semver }}",
+            "file_version": "${{ needs.build-windows.outputs.file_version }}",
             "repo": "${{ github.repository }}",
             "is_public_release": ${{ env.IS_PUBLIC_RELEASE }}
             }'
           ref: main
           wait-for-completion: true
-          sync-status: true
-        timeout-minutes: 15
+          wait-for-completion-interval: 10s
+          wait-for-completion-timeout: 10m
+          display-workflow-run-url: true
+          display-workflow-run-url-interval: 10s
 
-      # Allows us to inspect the artifacts of failed builds, since this below step will be skipped if the above step fails
-      - uses: geekyeggo/delete-artifact@v6
+      - uses: geekyeggo/delete-artifact@v5
         with:
           name: output-*
+
+  build-linux:
+    runs-on: ubuntu-latest
+    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
+        uses: actions/cache@v4
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+
+      - name: ⚒️ Run tests on Linux
+        run: ./build.sh test-only
+
+      - name: ⚒️ Run Build and Pack on Linux
+        run: ./build.sh build-linux
+
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/codecov-action@v5
+        with:
+          files: Converters/**/coverage.xml
+          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

.gitignore

@@ -21,5 +21,3 @@ tools
 coverage.xml
 output/
 Images/Thumbs.db
-
-.claude/

Build/Build.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>

Build/Consts.cs

@@ -20,7 +20,7 @@ public static class Consts
         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.Revit2026", "net8.0-windows")
       ]
     ),
     new(
@@ -30,7 +30,7 @@ public static class Consts
         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.Autocad2026", "net8.0-windows")
       ]
     ),
     new(
@@ -40,10 +40,9 @@ public static class Consts
         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.Civil3d2026", "net8.0-windows")
       ]
     ),
-    new("plant3d", [new("Connectors/Autocad/Speckle.Connectors.Plant3d2026", "net8.0-windows")]),
     new(
       "navisworks",
       [
@@ -53,7 +52,7 @@ public static class Consts
         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.Navisworks2026", "net48")
       ]
     ),
     new(
@@ -61,7 +60,7 @@ public static class Consts
       [
         new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
         new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48"),
-        new("Connectors/Tekla/Speckle.Connector.Tekla2025", "net48"),
+        new("Connectors/Tekla/Speckle.Connector.Tekla2025", "net48")
       ]
     ),
     new(
@@ -70,8 +69,7 @@ public static class Consts
         new("Connectors/CSi/Speckle.Connectors.ETABS21", "net48"),
         new("Connectors/CSi/Speckle.Connectors.ETABS22", "net8.0-windows"),
       ]
-    ),
-    new("rhino-importer", [new("Importers/Rhino/Speckle.Importers.JobProcessor", "net8.0-windows")]),
+    )
   };
 }
 

Build/Github.cs

@@ -23,9 +23,9 @@ public static class Github
       {
         Accept = { new MediaTypeWithQualityHeaderValue("application/vnd.github+json") },
         Authorization = new AuthenticationHeaderValue("Bearer", token),
-        UserAgent = { new ProductInfoHeaderValue("Speckle.build", "3.0.0") },
+        UserAgent = { new ProductInfoHeaderValue("Speckle.build", "3.0.0") }
       },
-      Content = content,
+      Content = content
     };
     request.Headers.Add("X-GitHub-Api-Version", "2022-11-28");
     var response = await client.SendAsync(request);

Build/Program.cs

@@ -7,9 +7,9 @@ using static SimpleExec.Command;
 const string CLEAN = "clean";
 const string RESTORE = "restore";
 const string BUILD = "build";
-const string PACK = "pack";
-const string TEST_AFFECTED = "test-affected";
+const string BUILD_LINUX = "build-linux";
 const string TEST = "test";
+const string TEST_ONLY = "test-only";
 const string FORMAT = "format";
 const string ZIP = "zip";
 const string RESTORE_TOOLS = "restore-tools";
@@ -19,7 +19,6 @@ 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";
-const string TEST_AND_PACK = "test-and-pack";
 
 //need to pass arguments
 /*var arguments = new List<string>();
@@ -145,13 +144,13 @@ Target(
   DependsOn(RESTORE_TOOLS),
   () =>
   {
-    Run("dotnet", "csharpier check ./");
+    Run("dotnet", "csharpier --check .");
   }
 );
 
 Target(
   RESTORE,
-  DependsOn(FORMAT),
+  DependsOn(FORMAT, DETECT_AFFECTED),
   Consts.Solutions,
   async s =>
   {
@@ -182,8 +181,8 @@ Target(CHECK_SOLUTIONS, Solutions.CompareConnectorsToLocal);
 Target(GEN_SOLUTIONS, Solutions.GenerateSolutions);
 
 Target(
-  TEST_AFFECTED,
-  DependsOn(DETECT_AFFECTED, BUILD, CHECK_SOLUTIONS),
+  TEST,
+  DependsOn(BUILD, CHECK_SOLUTIONS),
   async () =>
   {
     foreach (var s in await Affected.GetTestProjects())
@@ -193,12 +192,14 @@ Target(
   }
 );
 
+//all tests on purpose
 Target(
-  TEST,
-  DependsOn(BUILD, CHECK_SOLUTIONS),
+  TEST_ONLY,
+  DependsOn(FORMAT),
   Glob.Files(".", "**/*.Tests.csproj"),
   file =>
   {
+    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"
@@ -206,28 +207,31 @@ Target(
   }
 );
 
-Target(TEST_AND_PACK, DependsOn(TEST, PACK));
-
 Target(
-  PACK,
-  DependsOn(BUILD),
-  Consts.Solutions,
-  async solution =>
+  BUILD_LINUX,
+  DependsOn(FORMAT),
+  Glob.Files(".", "**/Speckle.Importers.Ifc.csproj"),
+  async file =>
   {
+    await RunAsync("dotnet", $"restore \"{file}\" --locked-mode");
     var version = await Versions.ComputeVersion();
     var fileVersion = await Versions.ComputeFileVersion();
     Console.WriteLine($"Version: {version} & {fileVersion}");
+    await RunAsync(
+      "dotnet",
+      $"build \"{file}\" -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+    );
 
     await RunAsync(
       "dotnet",
-      $"pack \"{solution}\" -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"
     );
   }
 );
 
 Target(
   ZIP,
-  DependsOn(TEST_AFFECTED),
+  DependsOn(TEST),
   async () =>
   {
     var version = await Versions.ComputeVersion();
@@ -278,6 +282,6 @@ Target(
   }
 );
 
-Target("default", DependsOn(TEST_AFFECTED), () => Console.WriteLine("Done!"));
+Target("default", DependsOn(TEST), () => Console.WriteLine("Done!"));
 
 await RunTargetsAndExitAsync(args).ConfigureAwait(true);

Build/packages.lock.json

@@ -16,12 +16,12 @@
       },
       "Microsoft.Build": {
         "type": "Direct",
-        "requested": "[17.11.48, )",
-        "resolved": "17.11.48",
-        "contentHash": "g8Kn575mNAKcuFotV3C7xvF+IbxuHennl67LH2shL2au1U6UqwReTDygCHyU04+koc2Yn7fHIbVQaC08HqEWow==",
+        "requested": "[17.11.4, )",
+        "resolved": "17.11.4",
+        "contentHash": "UMC7DfeFEHY2GGHHaghybUuUlLaByFHEFudR2PehMgDBuRuLAUePp1iaa4eFtVzepRzMtIbeSCVJCzzX3NV2Gg==",
         "dependencies": {
-          "Microsoft.Build.Framework": "17.11.48",
-          "Microsoft.NET.StringTools": "17.11.48",
+          "Microsoft.Build.Framework": "17.11.4",
+          "Microsoft.NET.StringTools": "17.11.4",
           "System.Collections.Immutable": "8.0.0",
           "System.Configuration.ConfigurationManager": "8.0.0",
           "System.Reflection.Metadata": "8.0.0",
@@ -82,8 +82,8 @@
       },
       "Microsoft.Build.Framework": {
         "type": "Transitive",
-        "resolved": "17.11.48",
-        "contentHash": "C3WIMt2wBl4++NX3jSEpTq5KXBhvAV154R4JrYHkfy9JSBcXWiL0mkgpspk5xSdOj+fS/uz7zluIy6bMM1fkkQ=="
+        "resolved": "17.11.4",
+        "contentHash": "u28uDihlqxtt8h2dL1ZJOZ7TRkxBK+HGr+3FgQpILVo7Q7gErkw8mYW9R+RM5PtxvZTdYb/4MWDL66vdIsANBQ=="
       },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
@@ -97,8 +97,8 @@
       },
       "Microsoft.NET.StringTools": {
         "type": "Transitive",
-        "resolved": "17.11.48",
-        "contentHash": "0IQo089IGBEC4jgtishauZMVr9ZxOWNiGKeDvyzZlvw7p2r253lJh6IJCLLFWXvZnVrVO5mnsYIPamxFPzM08w=="
+        "resolved": "17.11.4",
+        "contentHash": "mudqUHhNpeqIdJoUx2YDWZO/I9uEDYVowan89R6wsomfnUJQk6HteoQTlNjZDixhT2B4IXMkMtgZtoceIjLRmA=="
       },
       "Microsoft.NETFramework.ReferenceAssemblies.net461": {
         "type": "Transitive",

CodeMetricsConfig.txt

@@ -1,4 +1,4 @@
 CA1502: 25
 CA1501: 5
-CA1506(Method): 60
+CA1506(Method): 50
 CA1506(Type): 95

Connectors/Autocad/Directory.Build.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Target AfterTargets="Clean" Name="CleanAddinAutocad" Condition="'$(AutoCADVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
-    <RemoveDir Directories="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Autocad.bundle\Contents\Windows\Speckle.Connectors.Autocad$(AutoCADVersion);" />
+    <RemoveDir Directories="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Autocad$(AutoCADVersion);" />
   </Target>
 
   <Target AfterTargets="Build"  Name="AfterBuildAutoCAD" Condition="'$(AutoCADVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
@@ -9,12 +9,11 @@
       <AutoCADDLLs Include="$(TargetDir)\**\*.*" />
     </ItemGroup>
     <Message Text="AutoCAD Version $(AutoCADVersion)" Importance="high"/>
-    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Autocad.bundle\Contents\Windows\Speckle.Connectors.Autocad$(AutoCADVersion)\%(RecursiveDir)" SourceFiles="@(AutoCADDLLs)" />
-    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Autocad.bundle\" SourceFiles="$(TargetDir)\Plugin\BundleAutoCAD\PackageContents.xml" />
+    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Autocad$(AutoCADVersion)\%(RecursiveDir)" SourceFiles="@(AutoCADDLLs)" />
   </Target>
 
   <Target AfterTargets="Clean" Name="CleanAddinCivil3D" Condition="'$(Civil3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
-    <RemoveDir Directories="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d.bundle\Contents\Windows\Speckle.Connectors.Civil3d$(Civil3DVersion);" />
+    <RemoveDir Directories="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d$(Civil3DVersion);" />
   </Target>
 
   <Target AfterTargets="Build"  Name="AfterBuildCivil3D" Condition="'$(Civil3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
@@ -22,8 +21,7 @@
       <Civil3DDLLs Include="$(TargetDir)\**\*.*" />
     </ItemGroup>
     <Message Text="Civil3D Version $(Civil3DVersion)" Importance="high"/>
-    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d.bundle\Contents\Windows\Speckle.Connectors.Civil3d$(Civil3DVersion)\%(RecursiveDir)" SourceFiles="@(Civil3DDLLs)" />
-    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d.bundle\" SourceFiles="$(TargetDir)\Plugin\BundleCivil3D\PackageContents.xml" />
+    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d$(Civil3DVersion)\%(RecursiveDir)" SourceFiles="@(Civil3DDLLs)" />
   </Target>
 
   <PropertyGroup Condition="'$(AutoCADVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
@@ -35,23 +33,4 @@
     <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
     <StartArguments>/product C3D</StartArguments>
   </PropertyGroup>
-
-  <Target AfterTargets="Clean" Name="CleanAddinPlant3D" Condition="'$(Plant3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
-    <RemoveDir Directories="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Plant3d.bundle\Contents\Windows\Speckle.Connectors.Plant3d$(Plant3DVersion);" />
-  </Target>
-
-  <Target AfterTargets="Build"  Name="AfterBuildPlant3D" Condition="'$(Plant3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
-    <ItemGroup>
-      <Plant3DDLLs Include="$(TargetDir)\**\*.*" />
-    </ItemGroup>
-    <Message Text="Plant3D Version $(Plant3DVersion)" Importance="high"/>
-    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Plant3d.bundle\Contents\Windows\Speckle.Connectors.Plant3d$(Plant3DVersion)\%(RecursiveDir)" SourceFiles="@(Plant3DDLLs)" />
-    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Plant3d.bundle\" SourceFiles="$(TargetDir)\Plugin\BundlePlant3D\PackageContents.xml" />
-  </Target>
-
-  <PropertyGroup Condition="'$(Plant3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Plant3DVersion)\acad.exe</StartProgram>
-    <StartArguments>/product PLNT3D</StartArguments>
-  </PropertyGroup>
 </Project>

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

@@ -7,16 +7,16 @@
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2022;AUTOCAD2022_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" ExcludeAssets="runtime" />
-  </ItemGroup>
-
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
+  </ItemGroup>  
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2022\Speckle.Converters.Autocad2022.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>

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

@@ -73,8 +73,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -169,29 +169,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -282,8 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -314,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -358,12 +336,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

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

@@ -7,16 +7,16 @@
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2023;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime" />
-  </ItemGroup>
-
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
+  </ItemGroup>  
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2023\Speckle.Converters.Autocad2023.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>

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

@@ -73,8 +73,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -169,29 +169,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -282,8 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -314,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -358,12 +336,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

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

@@ -7,16 +7,16 @@
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2024;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime" />
-  </ItemGroup>
-
+  
   <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
+  </ItemGroup>  
+  
+  <ItemGroup>   
     <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2024\Speckle.Converters.Autocad2024.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>

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

@@ -73,8 +73,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -169,29 +169,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -282,8 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -315,7 +293,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -359,12 +337,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

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

@@ -8,23 +8,20 @@
 
   <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-->
+    <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="2025.0.0" ExcludeAssets="runtime" />
-  </ItemGroup>
-
+  
   <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+  </ItemGroup>  
+  
+  <ItemGroup>   
     <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2025\Speckle.Converters.Autocad2025.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>

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

@@ -155,25 +155,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w=="
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -229,8 +210,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -262,7 +244,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -306,12 +288,33 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -8,23 +8,20 @@
 
   <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-->
+    <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>
+    <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>

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

@@ -155,25 +155,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w=="
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -229,8 +210,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -262,7 +244,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -306,12 +288,33 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -1,7 +1,6 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using Autodesk.AutoCAD.DatabaseServices;
-using Autodesk.AutoCAD.Geometry;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Cancellation;
@@ -41,9 +40,6 @@ public abstract class AutocadSendBaseBinding : ISendBinding
   /// </summary>
   private ConcurrentBag<string> ChangedObjectIds { get; set; } = new();
 
-  private readonly List<string> _docSubsTracker = new();
-  private readonly Dictionary<string, Matrix3d> _docUcsTracker = new();
-
   protected AutocadSendBaseBinding(
     DocumentModelStore store,
     IBrowserBridge parent,
@@ -75,10 +71,6 @@ public abstract class AutocadSendBaseBinding : ISendBinding
       // catches the case when autocad just opens up with a blank new doc
       SubscribeToObjectChanges(Application.DocumentManager.CurrentDocument);
     }
-
-    Application.SystemVariableChanged += (_, e) =>
-      _topLevelExceptionHandler.CatchUnhandled(() => OnSystemVariableChanged(e));
-
     // Since ids of the objects generates from same seed, we should clear the cache always whenever doc swapped.
     _store.DocumentChanged += (_, _) =>
     {
@@ -86,6 +78,8 @@ public abstract class AutocadSendBaseBinding : ISendBinding
     };
   }
 
+  private readonly List<string> _docSubsTracker = new();
+
   private void SubscribeToObjectChanges(Document doc)
   {
     if (doc == null || doc.Database == null || _docSubsTracker.Contains(doc.Name))
@@ -94,58 +88,11 @@ public abstract class AutocadSendBaseBinding : ISendBinding
     }
 
     _docSubsTracker.Add(doc.Name);
-    _docUcsTracker[doc.Name] = doc.Editor.CurrentUserCoordinateSystem;
-
     doc.Database.ObjectAppended += (_, e) => OnObjectChanged(e.DBObject);
     doc.Database.ObjectErased += (_, e) => OnObjectChanged(e.DBObject);
     doc.Database.ObjectModified += (_, e) => OnObjectChanged(e.DBObject);
   }
 
-  /// <summary>
-  /// Handles system variable changes to detect UCS modifications.
-  /// When UCS changes, clears the conversion cache and expires all sender model cards.
-  /// </summary>
-  private void OnSystemVariableChanged(Autodesk.AutoCAD.ApplicationServices.SystemVariableChangedEventArgs e)
-  {
-    // check if this is a UCS-defining system variable
-    string varName = e.Name.ToUpperInvariant();
-    bool isUcsChange = varName == "UCSNAME" || varName == "UCSORG" || varName == "UCSXDIR" || varName == "UCSYDIR";
-
-    if (!isUcsChange)
-    {
-      return;
-    }
-
-    // get the currently active document
-    Document doc = Application.DocumentManager.MdiActiveDocument;
-    if (doc == null)
-    {
-      return;
-    }
-
-    var currentUcs = doc.Editor.CurrentUserCoordinateSystem;
-
-    // first time tracking this document's UCS
-    if (!_docUcsTracker.TryGetValue(doc.Name, out Matrix3d storedUcs))
-    {
-      _docUcsTracker[doc.Name] = currentUcs;
-      return;
-    }
-
-    // ucs hasn't actually changed (multiple variables fire for single UCS change)
-    if (currentUcs.IsEqualTo(storedUcs))
-    {
-      return;
-    }
-
-    // ucs has changed - all cached conversions invalid
-    _sendConversionCache.ClearCache();
-    _docUcsTracker[doc.Name] = currentUcs;
-
-    // expire all sender model cards
-    _idleManager.SubscribeToIdle(nameof(ExpireAllSenders), async () => await ExpireAllSenders());
-  }
-
   private void OnObjectChanged(DBObject dbObject) =>
     _topLevelExceptionHandler.CatchUnhandled(() => OnChangeChangedObjectIds(dbObject));
 
@@ -176,19 +123,6 @@ public abstract class AutocadSendBaseBinding : ISendBinding
     ChangedObjectIds = new();
   }
 
-  /// <summary>
-  /// Expires all sender model cards when a global change occurs (like UCS change).
-  /// </summary>
-  private async Task ExpireAllSenders()
-  {
-    var senders = _store.GetSenders();
-    var expiredSenderIds = senders.Select(s => s.ModelCardId.NotNull()).ToList();
-    if (expiredSenderIds.Count > 0)
-    {
-      await Commands.SetModelsExpired(expiredSenderIds);
-    }
-  }
-
   public List<ISendFilter> GetSendFilters() => _sendFilters;
 
   public List<ICardSetting> GetSendSettings() => [];
@@ -211,9 +145,7 @@ public abstract class AutocadSendBaseBinding : ISendBinding
         Commands,
         modelCardId,
         (sp, card) => InitializeSettings(sp),
-        card => Application.DocumentManager.CurrentDocument.GetObjects(card.SendFilter.NotNull().RefreshObjectIds()),
-        Application.DocumentManager.CurrentDocument.Name,
-        null
+        card => Application.DocumentManager.CurrentDocument.GetObjects(card.SendFilter.NotNull().RefreshObjectIds())
       );
     }
     finally

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

@@ -18,10 +18,6 @@ public static class AutocadConnectorModule
     // Send
     serviceCollection.LoadSend();
     serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, AutocadRootObjectBuilder>();
-    serviceCollection.AddScoped<
-      IRootContinuousTraversalBuilder<AutocadRootObject>,
-      AutocadContinuousTraversalBuilder
-    >();
 
     // Receive
     serviceCollection.LoadReceive();

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

@@ -1,9 +1,9 @@
 using Autodesk.AutoCAD.Colors;
 using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Common.Operations;
 using Speckle.InterfaceGenerator;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.Proxies;
-using Speckle.Sdk.Pipelines.Progress;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;
 
 namespace Speckle.Connectors.Autocad.HostApp;

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

@@ -110,20 +110,22 @@ public class AutocadColorUnpacker
     string name = color.ColorNameForDisplay;
     string id = color.GetSpeckleApplicationId();
 
-    ColorProxy colorProxy = new()
-    {
-      value = argb,
-      applicationId = id,
-      name = name,
-      objects = new(),
-    };
+    ColorProxy colorProxy =
+      new()
+      {
+        value = argb,
+        applicationId = id,
+        name = name,
+        objects = new()
+      };
 
     // add the color source as well for receiving in other apps
     // POC: in order to support full fidelity color support across autocad and rhino, we need to keep track of the color source property. Not sure if this is the best place to keep track of the source, vs on a ColorSourceProxy or as a property on the atomic object.
-    colorProxy["source"] =
-      color.IsByBlock ? "block"
-      : color.IsByLayer ? "layer"
-      : "object";
+    colorProxy["source"] = color.IsByBlock
+      ? "block"
+      : color.IsByLayer
+        ? "layer"
+        : "object";
 
     // set additional properties if by aci or by block
     // ByBlock colors for some reason do not have their color value set to the correct color (white): instead it's a near-black

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

@@ -53,7 +53,7 @@ public class AutocadGroupUnpacker
             {
               applicationId = groupAppId,
               name = group.Name,
-              objects = [applicationId],
+              objects = [applicationId]
             };
           }
         }

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

@@ -5,6 +5,7 @@ using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Instances;
+using Speckle.Connectors.Common.Operations;
 using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.DoubleNumerics;
@@ -15,7 +16,6 @@ using Speckle.Sdk.Dependencies;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
-using Speckle.Sdk.Pipelines.Progress;
 using AutocadColor = Autodesk.AutoCAD.Colors.Color;
 
 namespace Speckle.Connectors.Autocad.HostApp;
@@ -139,7 +139,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
             ? matId
             : ObjectId.Null;
 
-          BlockReference blockRef = new(insertionPoint, definitionId) { BlockTransform = matrix3d, Layer = layerName };
+          BlockReference blockRef = new(insertionPoint, definitionId) { BlockTransform = matrix3d, Layer = layerName, };
 
           if (objColor is not null)
           {
@@ -252,7 +252,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
       matrix.M41,
       matrix.M42,
       matrix.M43,
-      matrix.M44,
+      matrix.M44
     };
 
     var m3d = new Matrix3d(scaledTransform);
@@ -291,7 +291,7 @@ public class AutocadInstanceBaker : IInstanceBaker<IReadOnlyCollection<Entity>>
       0.0,
       0.0,
       0.0,
-      matrix[3, 3],
+      matrix[3, 3]
     ];
   }
 }

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

@@ -3,9 +3,9 @@ using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Autocad.Operations.Send;
 using Speckle.Connectors.Common.Instances;
-using Speckle.Converters.Autocad.Helpers;
 using Speckle.Converters.AutocadShared.ToSpeckle;
 using Speckle.Converters.Common;
+using Speckle.DoubleNumerics;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.Instances;
 
@@ -46,7 +46,6 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
       {
         UnpackInstance(blockReference, 0, transaction);
       }
-
       _instanceObjectsManager.AddAtomicObject(obj.ApplicationId, obj);
     }
     return _instanceObjectsManager.GetUnpackResult();
@@ -67,15 +66,15 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
         ? instance.AnonymousBlockTableRecord
         : instance.BlockTableRecord;
 
-      // transforms on instances are always stored in WCS
-      InstanceProxy instanceProxy = new()
-      {
-        applicationId = instanceId,
-        definitionId = definitionId.ToString(),
-        maxDepth = depth,
-        transform = TransformHelper.ConvertToInstanceMatrix4x4(instance.BlockTransform),
-        units = _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits),
-      };
+      InstanceProxy instanceProxy =
+        new()
+        {
+          applicationId = instanceId,
+          definitionId = definitionId.ToString(),
+          maxDepth = depth,
+          transform = GetMatrix(instance.BlockTransform.ToArray()),
+          units = _unitsConverter.ConvertOrThrow(Application.DocumentManager.CurrentDocument.Database.Insunits)
+        };
 
       var properties = _propertiesExtractor.GetProperties(instance);
       if (properties?.Count > 0)
@@ -152,7 +151,7 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
         applicationId = definitionId.ToString(),
         objects = new(),
         maxDepth = depth,
-        name = !instance.AnonymousBlockTableRecord.IsNull ? "Dynamic instance " + definitionId : definition.Name,
+        name = !instance.AnonymousBlockTableRecord.IsNull ? "Dynamic instance " + definitionId : definition.Name
       };
 
       // Go through each definition object
@@ -174,7 +173,6 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
           UnpackInstance(blockReference, depth + 1, transaction);
         }
 
-        _instanceObjectsManager.AddAtomicDefinitionObjectId(appId);
         _instanceObjectsManager.AddAtomicObject(appId, new(obj, appId));
       }
 
@@ -185,4 +183,7 @@ public class AutocadInstanceUnpacker : IInstanceUnpacker<AutocadRootObject>
       _logger.LogError(ex, "Failed unpacking Autocad instance");
     }
   }
+
+  private Matrix4x4 GetMatrix(double[] t) =>
+    new(t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7], t[8], t[9], t[10], t[11], t[12], t[13], t[14], t[15]);
 }

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

@@ -3,12 +3,12 @@ using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.GraphicsInterface;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Common.Operations;
 using Speckle.InterfaceGenerator;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
 using Speckle.Sdk.Models;
-using Speckle.Sdk.Pipelines.Progress;
 using Material = Autodesk.AutoCAD.DatabaseServices.Material;
 using RenderMaterial = Speckle.Objects.Other.RenderMaterial;
 
@@ -170,12 +170,13 @@ public class AutocadMaterialBaker : IAutocadMaterialBaker
       MaterialColor diffuseColor = new(Method.Override, 1, entityDiffuseColor);
       MaterialDiffuseComponent diffuse = new(diffuseColor, map);
 
-      Material mat = new()
-      {
-        Name = matName,
-        Opacity = opacity,
-        Diffuse = diffuse,
-      };
+      Material mat =
+        new()
+        {
+          Name = matName,
+          Opacity = opacity,
+          Diffuse = diffuse
+        };
 
       if (renderMaterial["reflectivity"] is double reflectivity)
       {

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

@@ -51,12 +51,6 @@ public class AutocadMaterialUnpacker
 
         if (transaction.GetObject(entity.MaterialId, OpenMode.ForRead) is Material material)
         {
-          // skip default material
-          if (material.Name == "Global")
-          {
-            continue;
-          }
-
           string materialId = material.GetSpeckleApplicationId();
           if (materialProxies.TryGetValue(materialId, out RenderMaterialProxy? value))
           {
@@ -83,12 +77,6 @@ public class AutocadMaterialUnpacker
       {
         if (transaction.GetObject(layer.MaterialId, OpenMode.ForRead) is Material material)
         {
-          // skip default material
-          if (material.Name == "Global")
-          {
-            continue;
-          }
-
           string materialId = material.GetSpeckleApplicationId();
           string layerId = layer.GetSpeckleApplicationId(); // Do not use handle directly, see note in the 'GetSpeckleApplicationId' method
           if (materialProxies.TryGetValue(materialId, out RenderMaterialProxy? value))
@@ -122,13 +110,14 @@ public class AutocadMaterialUnpacker
       diffuseColor.Blue
     );
 
-    RenderMaterial renderMaterial = new()
-    {
-      name = material.Name,
-      opacity = material.Opacity.Percentage,
-      diffuse = diffuse.ToArgb(),
-      applicationId = id,
-    };
+    RenderMaterial renderMaterial =
+      new()
+      {
+        name = material.Name,
+        opacity = material.Opacity.Percentage,
+        diffuse = diffuse.ToArgb(),
+        applicationId = id
+      };
 
     // Add additional properties
     renderMaterial["ior"] = material.Refraction.Index;
@@ -138,7 +127,7 @@ public class AutocadMaterialUnpacker
     {
       value = renderMaterial,
       objects = new(),
-      applicationId = id,
+      applicationId = id
     };
   }
 }

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

@@ -1,297 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Dependencies;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Instances;
-using Speckle.Sdk.Pipelines.Progress;
-using AutocadColor = Autodesk.AutoCAD.Colors.Color;
-
-namespace Speckle.Connectors.Autocad.Operations.Receive;
-
-/// <summary>
-/// <para>Base class for AutoCAD host object builders. Expects to be a scoped dependency per receive operation.</para>
-/// </summary>
-public abstract class AutocadHostObjectBaseBuilder : IHostObjectBuilder
-{
-  private readonly IRootToHostConverter _converter;
-  private readonly AutocadLayerBaker _layerBaker;
-  private readonly AutocadGroupBaker _groupBaker;
-  private readonly AutocadInstanceBaker _instanceBaker;
-  private readonly IAutocadMaterialBaker _materialBaker;
-  private readonly IAutocadColorBaker _colorBaker;
-  private readonly AutocadContext _autocadContext;
-  private readonly RootObjectUnpacker _rootObjectUnpacker;
-  private readonly IReceiveConversionHandler _conversionHandler;
-
-  protected AutocadHostObjectBaseBuilder(
-    IRootToHostConverter converter,
-    AutocadLayerBaker layerBaker,
-    AutocadGroupBaker groupBaker,
-    AutocadInstanceBaker instanceBaker,
-    IAutocadMaterialBaker materialBaker,
-    IAutocadColorBaker colorBaker,
-    AutocadContext autocadContext,
-    RootObjectUnpacker rootObjectUnpacker,
-    IReceiveConversionHandler conversionHandler
-  )
-  {
-    _converter = converter;
-    _layerBaker = layerBaker;
-    _groupBaker = groupBaker;
-    _instanceBaker = instanceBaker;
-    _materialBaker = materialBaker;
-    _colorBaker = colorBaker;
-    _autocadContext = autocadContext;
-    _rootObjectUnpacker = rootObjectUnpacker;
-    _conversionHandler = conversionHandler;
-  }
-
-  public Task<HostObjectBuilderResult> Build(
-    Base rootObject,
-    string projectName,
-    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    // Prompt the UI conversion started. Progress bar will swoosh.
-    onOperationProgressed.Report(new("Converting", null));
-
-    // Layer filter for received commit with project and model name
-    _layerBaker.CreateLayerFilter(projectName, modelName);
-
-    // 0 - Clean then Rock n Roll!
-    string baseLayerPrefix = _autocadContext.RemoveInvalidChars($"SPK-{projectName}-{modelName}-");
-    PreReceiveDeepClean(baseLayerPrefix);
-
-    // 1 - Unpack objects and proxies from root commit object
-    var unpackedRoot = _rootObjectUnpacker.Unpack(rootObject);
-
-    // 2 - Split atomic objects and instance components with their path
-    var (atomicObjects, instanceComponents) = _rootObjectUnpacker.SplitAtomicObjectsAndInstances(
-      unpackedRoot.ObjectsToConvert
-    );
-    var atomicObjectsWithPath = _layerBaker.GetAtomicObjectsWithPath(atomicObjects);
-    var instanceComponentsWithPath = _layerBaker.GetInstanceComponentsWithPath(instanceComponents);
-
-    // POC: these are not captured by traversal, so we need to re-add them here
-    if (unpackedRoot.DefinitionProxies != null && unpackedRoot.DefinitionProxies.Count > 0)
-    {
-      var transformed = unpackedRoot.DefinitionProxies.Select(proxy =>
-        (Array.Empty<Collection>(), proxy as IInstanceComponent)
-      );
-      instanceComponentsWithPath.AddRange(transformed);
-    }
-
-    // 3 - Parse and bake proxies (materials and colors), as they are used later down the line by layers and objects
-    if (unpackedRoot.RenderMaterialProxies != null)
-    {
-      _materialBaker.ParseAndBakeRenderMaterials(
-        unpackedRoot.RenderMaterialProxies,
-        baseLayerPrefix,
-        onOperationProgressed
-      );
-    }
-
-    if (unpackedRoot.ColorProxies != null)
-    {
-      _colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
-    }
-
-    // 3.5 - Parse and bake additional proxies that are needed for conversion
-    ParseAndBakeAdditionalProxies(rootObject, baseLayerPrefix);
-
-    // 4 - Convert atomic objects
-    HashSet<ReceiveConversionResult> results = new();
-    HashSet<string> bakedObjectIds = new();
-    Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap = new();
-    var count = 0;
-    foreach (var (layerPath, atomicObject) in atomicObjectsWithPath)
-    {
-      onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count));
-      var ex = _conversionHandler.TryConvert(() =>
-      {
-        cancellationToken.ThrowIfCancellationRequested();
-        string objectId = atomicObject.applicationId ?? atomicObject.id.NotNull();
-        IReadOnlyCollection<Entity> convertedObjects = ConvertObject(atomicObject, layerPath, baseLayerPrefix);
-
-        applicationIdMap[objectId] = convertedObjects;
-
-        results.UnionWith(
-          convertedObjects.Select(e => new ReceiveConversionResult(
-            Status.SUCCESS,
-            atomicObject,
-            e.GetSpeckleApplicationId(),
-            e.GetType().ToString()
-          ))
-        );
-
-        bakedObjectIds.UnionWith(convertedObjects.Select(e => e.GetSpeckleApplicationId()));
-      });
-      if (ex != null)
-      {
-        results.Add(new(Status.ERROR, atomicObject, null, null, ex));
-      }
-    }
-
-    // 5 - Convert instances
-    var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = _instanceBaker.BakeInstances(
-      instanceComponentsWithPath,
-      applicationIdMap,
-      baseLayerPrefix,
-      onOperationProgressed
-    );
-
-    bakedObjectIds.RemoveWhere(id => consumedObjectIds.Contains(id));
-    bakedObjectIds.UnionWith(createdInstanceIds);
-    results.RemoveWhere(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
-    results.UnionWith(instanceConversionResults);
-
-    // 6 - Create groups
-    if (unpackedRoot.GroupProxies != null)
-    {
-      IReadOnlyCollection<ReceiveConversionResult> groupResults = _groupBaker.CreateGroups(
-        unpackedRoot.GroupProxies,
-        applicationIdMap
-      );
-      results.UnionWith(groupResults);
-    }
-
-    return Task.FromResult(new HostObjectBuilderResult(bakedObjectIds, results));
-  }
-
-  protected void PreReceiveDeepClean(string baseLayerPrefix)
-  {
-    _layerBaker.DeleteAllLayersByPrefix(baseLayerPrefix);
-    _instanceBaker.PurgeInstances(baseLayerPrefix);
-    _materialBaker.PurgeMaterials(baseLayerPrefix);
-    PreReceiveAdditionalDeepClean(baseLayerPrefix);
-  }
-
-  /// <summary>
-  /// Method for adding app-specific additional deep clean of the document prior to receiving.
-  /// </summary>
-  protected virtual void PreReceiveAdditionalDeepClean(string baseLayerPrefix) { }
-
-  /// <summary>
-  /// Method for parsing and baking additional app-specific proxies on the root prior to converting and baking objects
-  /// </summary>
-  protected virtual void ParseAndBakeAdditionalProxies(Base rootObject, string baseLayerPrefix) { }
-
-  private IReadOnlyCollection<Entity> ConvertObject(Base obj, Collection[] layerPath, string baseLayerNamePrefix)
-  {
-    string layerName = _layerBaker.CreateLayerForReceive(layerPath, baseLayerNamePrefix);
-    var convertedEntities = new HashSet<Entity>();
-
-    using var tr = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
-
-    // 1: convert
-    var converted = _converter.Convert(obj);
-
-    // 2: handle result
-    switch (converted)
-    {
-      case Entity entity:
-        var bakedEntity = BakeObject(entity, obj, layerName, tr);
-        convertedEntities.Add(bakedEntity);
-        break;
-
-      case List<(Entity, Base)> listConversionResult: // this is from fallback conversion for brep/brepx/subdx/extrusionx/polycurve
-        var bakedFallbackEntities = BakeObjectsAsGroup(listConversionResult, obj, layerName, baseLayerNamePrefix, tr);
-        convertedEntities.UnionWith(bakedFallbackEntities);
-        break;
-
-      default:
-        // TODO: capture defualt case with report object here? Same as in Rhino
-        break;
-    }
-
-    tr.Commit();
-    return convertedEntities.Freeze();
-  }
-
-  private Entity BakeObject(
-    Entity entity,
-    Base originalObject,
-    string layerName,
-    Transaction tr,
-    Base? parentObject = null
-  )
-  {
-    var objId = originalObject.applicationId ?? originalObject.id.NotNull();
-    if (_colorBaker.ObjectColorsIdMap.TryGetValue(objId, out AutocadColor? color))
-    {
-      entity.Color = color;
-    }
-
-    if (_materialBaker.TryGetMaterialId(originalObject, parentObject, out ObjectId matId))
-    {
-      entity.MaterialId = matId;
-    }
-
-    entity.AppendToDb(layerName);
-
-    // Hook for derived classes to perform additional operations after entity is added to database
-    PostBakeEntity(entity, originalObject, tr);
-
-    return entity;
-  }
-
-  /// <summary>
-  /// Method for additional app-specific operations on entities after the entity has been added to the document database.
-  /// Called after the entity is added to the database in an open transaction
-  /// </summary>
-  /// <param name="entity"></param>
-  /// <param name="originalObject"></param>
-  /// <param name="tr"></param>
-  protected virtual void PostBakeEntity(Entity entity, Base originalObject, Transaction tr)
-  {
-    // Default implementation does nothing - override in derived classes
-  }
-
-  private List<Entity> BakeObjectsAsGroup(
-    List<(Entity, Base)> fallbackConversionResult,
-    Base parentObject,
-    string layerName,
-    string baseLayerName,
-    Transaction tr
-  )
-  {
-    var ids = new ObjectIdCollection();
-    var entities = new List<Entity>();
-    foreach (var (conversionResult, originalObject) in fallbackConversionResult)
-    {
-      BakeObject(conversionResult, originalObject, layerName, tr, parentObject);
-      ids.Add(conversionResult.ObjectId);
-      entities.Add(conversionResult);
-    }
-
-    if (entities.Count <= 1) // return if empty list or only one, because we don't want to create empty or single item groups.
-    {
-      return entities;
-    }
-    var groupDictionary = (DBDictionary)
-      tr.GetObject(Application.DocumentManager.CurrentDocument.Database.GroupDictionaryId, OpenMode.ForWrite);
-
-    var groupName = _autocadContext.RemoveInvalidChars(
-      $@"{parentObject.speckle_type.Split('.').Last()} - {parentObject.applicationId ?? parentObject.id}  ({baseLayerName})"
-    );
-
-    var newGroup = new Group(groupName, true);
-    newGroup.Append(ids);
-    groupDictionary.UpgradeOpen();
-    groupDictionary.SetAt(groupName, newGroup);
-    tr.AddNewlyCreatedDBObject(newGroup, true);
-
-    return entities;
-  }
-}

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

@@ -1,35 +1,238 @@
+using Autodesk.AutoCAD.DatabaseServices;
 using Speckle.Connectors.Autocad.HostApp;
+using Speckle.Connectors.Autocad.HostApp.Extensions;
+using Speckle.Connectors.Common.Builders;
+using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Common.Extensions;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Operations.Receive;
 using Speckle.Converters.Common;
+using Speckle.Sdk.Common;
+using Speckle.Sdk.Dependencies;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.Instances;
+using AutocadColor = Autodesk.AutoCAD.Colors.Color;
 
 namespace Speckle.Connectors.Autocad.Operations.Receive;
 
 /// <summary>
-/// <para>AutoCAD-specific host object builder. Expects to be a scoped dependency per receive operation.</para>
+/// <para>Expects to be a scoped dependency per receive operation.</para>
 /// </summary>
-public sealed class AutocadHostObjectBuilder : AutocadHostObjectBaseBuilder
+public class AutocadHostObjectBuilder(
+  IRootToHostConverter converter,
+  AutocadLayerBaker layerBaker,
+  AutocadGroupBaker groupBaker,
+  AutocadInstanceBaker instanceBaker,
+  IAutocadMaterialBaker materialBaker,
+  IAutocadColorBaker colorBaker,
+  AutocadContext autocadContext,
+  RootObjectUnpacker rootObjectUnpacker,
+  IReceiveConversionHandler conversionHandler
+) : IHostObjectBuilder
 {
-  public AutocadHostObjectBuilder(
-    IRootToHostConverter converter,
-    AutocadLayerBaker layerBaker,
-    AutocadGroupBaker groupBaker,
-    AutocadInstanceBaker instanceBaker,
-    IAutocadMaterialBaker materialBaker,
-    IAutocadColorBaker colorBaker,
-    AutocadContext autocadContext,
-    RootObjectUnpacker rootObjectUnpacker,
-    IReceiveConversionHandler conversionHandler
+  public Task<HostObjectBuilderResult> Build(
+    Base rootObject,
+    string projectName,
+    string modelName,
+    IProgress<CardProgress> onOperationProgressed,
+    CancellationToken cancellationToken
   )
-    : base(
-      converter,
-      layerBaker,
-      groupBaker,
-      instanceBaker,
-      materialBaker,
-      colorBaker,
-      autocadContext,
-      rootObjectUnpacker,
-      conversionHandler
-    ) { }
+  {
+    // Prompt the UI conversion started. Progress bar will swoosh.
+    onOperationProgressed.Report(new("Converting", null));
+
+    // Layer filter for received commit with project and model name
+    layerBaker.CreateLayerFilter(projectName, modelName);
+
+    // 0 - Clean then Rock n Roll!
+    string baseLayerPrefix = autocadContext.RemoveInvalidChars($"SPK-{projectName}-{modelName}-");
+    PreReceiveDeepClean(baseLayerPrefix);
+
+    // 1 - Unpack objects and proxies from root commit object
+    var unpackedRoot = rootObjectUnpacker.Unpack(rootObject);
+
+    // 2 - Split atomic objects and instance components with their path
+    var (atomicObjects, instanceComponents) = rootObjectUnpacker.SplitAtomicObjectsAndInstances(
+      unpackedRoot.ObjectsToConvert
+    );
+    var atomicObjectsWithPath = layerBaker.GetAtomicObjectsWithPath(atomicObjects);
+    var instanceComponentsWithPath = layerBaker.GetInstanceComponentsWithPath(instanceComponents);
+
+    // POC: these are not captured by traversal, so we need to re-add them here
+    if (unpackedRoot.DefinitionProxies != null && unpackedRoot.DefinitionProxies.Count > 0)
+    {
+      var transformed = unpackedRoot.DefinitionProxies.Select(proxy =>
+        (Array.Empty<Collection>(), proxy as IInstanceComponent)
+      );
+      instanceComponentsWithPath.AddRange(transformed);
+    }
+
+    // 3 - Bake materials and colors, as they are used later down the line by layers and objects
+    if (unpackedRoot.RenderMaterialProxies != null)
+    {
+      materialBaker.ParseAndBakeRenderMaterials(
+        unpackedRoot.RenderMaterialProxies,
+        baseLayerPrefix,
+        onOperationProgressed
+      );
+    }
+
+    if (unpackedRoot.ColorProxies != null)
+    {
+      colorBaker.ParseColors(unpackedRoot.ColorProxies, onOperationProgressed);
+    }
+
+    // 4 - Convert atomic objects
+    HashSet<ReceiveConversionResult> results = new();
+    HashSet<string> bakedObjectIds = new();
+    Dictionary<string, IReadOnlyCollection<Entity>> applicationIdMap = new();
+    var count = 0;
+    foreach (var (layerPath, atomicObject) in atomicObjectsWithPath)
+    {
+      onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count));
+      var ex = conversionHandler.TryConvert(() =>
+      {
+        cancellationToken.ThrowIfCancellationRequested();
+        string objectId = atomicObject.applicationId ?? atomicObject.id.NotNull();
+        IReadOnlyCollection<Entity> convertedObjects = ConvertObject(atomicObject, layerPath, baseLayerPrefix);
+
+        applicationIdMap[objectId] = convertedObjects;
+
+        results.UnionWith(
+          convertedObjects.Select(e => new ReceiveConversionResult(
+            Status.SUCCESS,
+            atomicObject,
+            e.GetSpeckleApplicationId(),
+            e.GetType().ToString()
+          ))
+        );
+
+        bakedObjectIds.UnionWith(convertedObjects.Select(e => e.GetSpeckleApplicationId()));
+      });
+      if (ex != null)
+      {
+        results.Add(new(Status.ERROR, atomicObject, null, null, ex));
+      }
+    }
+
+    // 5 - Convert instances
+    var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = instanceBaker.BakeInstances(
+      instanceComponentsWithPath,
+      applicationIdMap,
+      baseLayerPrefix,
+      onOperationProgressed
+    );
+
+    bakedObjectIds.RemoveWhere(id => consumedObjectIds.Contains(id));
+    bakedObjectIds.UnionWith(createdInstanceIds);
+    results.RemoveWhere(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId));
+    results.UnionWith(instanceConversionResults);
+
+    // 6 - Create groups
+    if (unpackedRoot.GroupProxies != null)
+    {
+      IReadOnlyCollection<ReceiveConversionResult> groupResults = groupBaker.CreateGroups(
+        unpackedRoot.GroupProxies,
+        applicationIdMap
+      );
+      results.UnionWith(groupResults);
+    }
+
+    return Task.FromResult(new HostObjectBuilderResult(bakedObjectIds, results));
+  }
+
+  private void PreReceiveDeepClean(string baseLayerPrefix)
+  {
+    layerBaker.DeleteAllLayersByPrefix(baseLayerPrefix);
+    instanceBaker.PurgeInstances(baseLayerPrefix);
+    materialBaker.PurgeMaterials(baseLayerPrefix);
+  }
+
+  private IReadOnlyCollection<Entity> ConvertObject(Base obj, Collection[] layerPath, string baseLayerNamePrefix)
+  {
+    string layerName = layerBaker.CreateLayerForReceive(layerPath, baseLayerNamePrefix);
+    var convertedEntities = new HashSet<Entity>();
+
+    using var tr = Application.DocumentManager.CurrentDocument.Database.TransactionManager.StartTransaction();
+
+    // 1: convert
+    var converted = converter.Convert(obj);
+
+    // 2: handle result
+    switch (converted)
+    {
+      case Entity entity:
+        var bakedEntity = BakeObject(entity, obj, layerName);
+        convertedEntities.Add(bakedEntity);
+        break;
+
+      case List<(Entity, Base)> listConversionResult: // this is from fallback conversion for brep/brepx/subdx/extrusionx/polycurve
+        var bakedFallbackEntities = BakeObjectsAsGroup(listConversionResult, obj, layerName, baseLayerNamePrefix);
+        convertedEntities.UnionWith(bakedFallbackEntities);
+        break;
+
+      default:
+        // TODO: capture defualt case with report object here? Same as in Rhino
+        break;
+    }
+
+    tr.Commit();
+    return convertedEntities.Freeze();
+  }
+
+  private Entity BakeObject(Entity entity, Base originalObject, string layerName, Base? parentObject = null)
+  {
+    var objId = originalObject.applicationId ?? originalObject.id.NotNull();
+    if (colorBaker.ObjectColorsIdMap.TryGetValue(objId, out AutocadColor? color))
+    {
+      entity.Color = color;
+    }
+
+    if (materialBaker.TryGetMaterialId(originalObject, parentObject, out ObjectId matId))
+    {
+      entity.MaterialId = matId;
+    }
+
+    entity.AppendToDb(layerName);
+    return entity;
+  }
+
+  private List<Entity> BakeObjectsAsGroup(
+    List<(Entity, Base)> fallbackConversionResult,
+    Base parentObject,
+    string layerName,
+    string baseLayerName
+  )
+  {
+    var ids = new ObjectIdCollection();
+    var entities = new List<Entity>();
+    foreach (var (conversionResult, originalObject) in fallbackConversionResult)
+    {
+      BakeObject(conversionResult, originalObject, layerName, parentObject);
+      ids.Add(conversionResult.ObjectId);
+      entities.Add(conversionResult);
+    }
+
+    if (entities.Count <= 1) // return if empty list or only one, because we don't want to create empty or single item groups.
+    {
+      return entities;
+    }
+
+    var tr = Application.DocumentManager.CurrentDocument.Database.TransactionManager.TopTransaction;
+    var groupDictionary = (DBDictionary)
+      tr.GetObject(Application.DocumentManager.CurrentDocument.Database.GroupDictionaryId, OpenMode.ForWrite);
+
+    var groupName = autocadContext.RemoveInvalidChars(
+      $@"{parentObject.speckle_type.Split('.').Last()} - {parentObject.applicationId ?? parentObject.id}  ({baseLayerName})"
+    );
+
+    var newGroup = new Group(groupName, true);
+    newGroup.Append(ids);
+    groupDictionary.UpgradeOpen();
+    groupDictionary.SetAt(groupName, newGroup);
+    tr.AddNewlyCreatedDBObject(newGroup, true);
+
+    return entities;
+  }
 }

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

@@ -1,196 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Common;
-using Speckle.Sdk;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Instances;
-using Speckle.Sdk.Pipelines.Progress;
-using Speckle.Sdk.Pipelines.Send;
-
-namespace Speckle.Connectors.Autocad.Operations.Send;
-
-/// <summary>
-/// Abstract base class for AutoCAD continuous traversal builders that stream objects through a
-/// <see cref="SendPipeline"/> for packfile-based uploads. Same conversion logic as
-/// <see cref="AutocadRootObjectBaseBuilder"/>, but processes elements through the pipeline.
-/// </summary>
-public abstract class AutocadContinuousTraversalBaseBuilder : IRootContinuousTraversalBuilder<AutocadRootObject>
-{
-  private readonly IRootToSpeckleConverter _converter;
-  private readonly string[] _documentPathSeparator = ["\\"];
-  private readonly ISendConversionCache _sendConversionCache;
-  private readonly AutocadInstanceUnpacker _instanceUnpacker;
-  private readonly AutocadMaterialUnpacker _materialUnpacker;
-  private readonly AutocadColorUnpacker _colorUnpacker;
-  private readonly AutocadGroupUnpacker _groupUnpacker;
-  private readonly ILogger<AutocadRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
-
-  protected AutocadContinuousTraversalBaseBuilder(
-    IRootToSpeckleConverter converter,
-    ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
-  )
-  {
-    _converter = converter;
-    _sendConversionCache = sendConversionCache;
-    _instanceUnpacker = instanceObjectManager;
-    _materialUnpacker = materialUnpacker;
-    _colorUnpacker = colorUnpacker;
-    _groupUnpacker = groupUnpacker;
-    _logger = logger;
-    _activityFactory = activityFactory;
-  }
-
-  [SuppressMessage(
-    "Maintainability",
-    "CA1506:Avoid excessive class coupling",
-    Justification = """
-      It is already simplified but has many different references since it is a builder. Do not know can we simplify it now.
-      Later we might consider to refactor proxies from one proxy manager? but we do not know the shape of it all potential
-      proxy classes yet. So I'm supressing this one now!!!
-      """
-  )]
-  public async Task<RootObjectBuilderResult> Build(
-    IReadOnlyList<AutocadRootObject> objects,
-    string projectId,
-    SendPipeline sendPipeline,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    // 0 - Init the root
-    Collection root = new()
-    {
-      name = Application
-        .DocumentManager.CurrentDocument.Name.Split(_documentPathSeparator, StringSplitOptions.None)
-        .Reverse()
-        .First(),
-    };
-
-    Document doc = Application.DocumentManager.CurrentDocument;
-    using Transaction tr = doc.Database.TransactionManager.StartTransaction();
-
-    // 1 - Unpack the instances
-    var (atomicObjects, _, instanceProxies, instanceDefinitionProxies) = _instanceUnpacker.UnpackSelection(objects);
-    root[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies;
-
-    // 2 - Unpack the groups
-    root[ProxyKeys.GROUP] = _groupUnpacker.UnpackGroups(atomicObjects);
-    using (var _ = _activityFactory.Start("Converting objects"))
-    {
-      // 3 - Convert atomic objects and process through pipeline
-      List<LayerTableRecord> usedAcadLayers = new();
-      List<SendConversionResult> results = new();
-      int count = 0;
-      foreach (var (entity, applicationId) in atomicObjects)
-      {
-        cancellationToken.ThrowIfCancellationRequested();
-        (Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
-
-        if (autocadLayer is not null)
-        {
-          usedAcadLayers.Add(autocadLayer);
-          root.elements.Add(objectCollection);
-        }
-
-        var result = await ConvertAutocadEntity(
-          entity,
-          applicationId,
-          objectCollection,
-          instanceProxies,
-          projectId,
-          sendPipeline
-        );
-        results.Add(result);
-
-        onOperationProgressed.Report(
-          new($"Converting objects... ({count:N0} / {atomicObjects.Count:N0})", (double)++count / atomicObjects.Count)
-        );
-      }
-
-      if (results.All(x => x.Status == Status.ERROR))
-      {
-        throw new SpeckleException("Failed to convert all objects.");
-      }
-
-      // 4 - Unpack the render material proxies
-      root[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackMaterials(atomicObjects, usedAcadLayers);
-
-      // 5 - Unpack the color proxies
-      root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);
-
-      // add any additional properties (most likely from verticals)
-      AddAdditionalProxiesToRoot(root);
-
-      // Process root collection and wait for all uploads
-      await sendPipeline.Process(root);
-      await sendPipeline.WaitForUpload();
-
-      return new RootObjectBuilderResult(root, results);
-    }
-  }
-
-  public virtual (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    return (new(), null);
-  }
-
-  public virtual void AddAdditionalProxiesToRoot(Collection rootCollection)
-  {
-    return;
-  }
-
-  private async Task<SendConversionResult> ConvertAutocadEntity(
-    Entity entity,
-    string applicationId,
-    Collection collectionHost,
-    IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
-    string projectId,
-    SendPipeline sendPipeline
-  )
-  {
-    string sourceType = entity.GetType().ToString();
-    try
-    {
-      Base converted;
-      if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
-      {
-        converted = instanceProxy;
-      }
-      else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
-      {
-        converted = value;
-      }
-      else
-      {
-        converted = _converter.Convert(entity);
-        converted.applicationId = applicationId;
-      }
-
-      // NOTE: this is the main part that differentiate from the main root object builder
-      var reference = await sendPipeline.Process(converted).ConfigureAwait(false);
-      collectionHost.elements.Add(reference);
-      return new(Status.SUCCESS, applicationId, sourceType, reference);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogSendConversionError(ex, sourceType);
-      return new(Status.ERROR, applicationId, sourceType, null, ex);
-    }
-  }
-}

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

@@ -1,46 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Autocad.Operations.Send;
-
-public sealed class AutocadContinuousTraversalBuilder : AutocadContinuousTraversalBaseBuilder
-{
-  private readonly AutocadLayerUnpacker _layerUnpacker;
-
-  public AutocadContinuousTraversalBuilder(
-    AutocadLayerUnpacker layerUnpacker,
-    IRootToSpeckleConverter converter,
-    ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
-  )
-    : base(
-      converter,
-      sendConversionCache,
-      instanceObjectManager,
-      materialUnpacker,
-      colorUnpacker,
-      groupUnpacker,
-      logger,
-      activityFactory
-    )
-  {
-    _layerUnpacker = layerUnpacker;
-  }
-
-  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
-
-    return (layer, autocadLayer);
-  }
-}

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

@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Autodesk.AutoCAD.DatabaseServices;
-using Autodesk.AutoCAD.Geometry;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Common.Builders;
@@ -8,22 +7,18 @@ using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Extensions;
 using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Autocad;
-using Speckle.Converters.Autocad.Helpers;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.Instances;
-using Speckle.Sdk.Pipelines.Progress;
 
 namespace Speckle.Connectors.Autocad.Operations.Send;
 
 public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadRootObject>
 {
   private readonly IRootToSpeckleConverter _converter;
-  private readonly IConverterSettingsStore<AutocadConversionSettings> _converterSettings;
   private readonly string[] _documentPathSeparator = ["\\"];
   private readonly ISendConversionCache _sendConversionCache;
   private readonly AutocadInstanceUnpacker _instanceUnpacker;
@@ -35,7 +30,6 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
 
   protected AutocadRootObjectBaseBuilder(
     IRootToSpeckleConverter converter,
-    IConverterSettingsStore<AutocadConversionSettings> converterSettings,
     ISendConversionCache sendConversionCache,
     AutocadInstanceUnpacker instanceObjectManager,
     AutocadMaterialUnpacker materialUnpacker,
@@ -46,7 +40,6 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
   )
   {
     _converter = converter;
-    _converterSettings = converterSettings;
     _sendConversionCache = sendConversionCache;
     _instanceUnpacker = instanceObjectManager;
     _materialUnpacker = materialUnpacker;
@@ -67,90 +60,63 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
   )]
   public Task<RootObjectBuilderResult> Build(
     IReadOnlyList<AutocadRootObject> objects,
-    string projectId,
+    SendInfo sendInfo,
     IProgress<CardProgress> onOperationProgressed,
     CancellationToken cancellationToken
   )
   {
     // 0 - Init the root
-    Collection root = new()
-    {
-      name = Application
-        .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
-        .Split(_documentPathSeparator, StringSplitOptions.None)
-        .Reverse()
-        .First(),
-    };
+    Collection root =
+      new()
+      {
+        name = Application
+          .DocumentManager.CurrentDocument.Name // POC: https://spockle.atlassian.net/browse/CNX-9319
+          .Split(_documentPathSeparator, StringSplitOptions.None)
+          .Reverse()
+          .First()
+      };
 
     // TODO: better handling for document and transactions!!
     Document doc = Application.DocumentManager.CurrentDocument;
     using Transaction tr = doc.Database.TransactionManager.StartTransaction();
 
     // 1 - Unpack the instances
-    var (atomicObjects, atomicDefinitionObjectIds, instanceProxies, instanceDefinitionProxies) =
-      _instanceUnpacker.UnpackSelection(objects);
+    var (atomicObjects, instanceProxies, instanceDefinitionProxies) = _instanceUnpacker.UnpackSelection(objects);
     root[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies;
 
     // 2 - Unpack the groups
     root[ProxyKeys.GROUP] = _groupUnpacker.UnpackGroups(atomicObjects);
-
-    // 3 - Add the Reference Point
-    Matrix3d? referenceTransform = null;
-    if (
-      Application.DocumentManager.CurrentDocument.Editor.CurrentUserCoordinateSystem is Matrix3d matrix
-      && matrix != Matrix3d.Identity
-    )
-    {
-      referenceTransform = matrix.Inverse();
-
-      /* POC: Do not attach transform to root for now! we are not consuming this in autocad/civil on receive and in revit it will undo all baked transforms :(
-      var transformMatrix = ReferencePointHelper.CreateTransformDataForRootObject(matrix);
-      root[ReferencePointHelper.REFERENCE_POINT_TRANSFORM_KEY] = transformMatrix;
-      */
-    }
-
     using (var _ = _activityFactory.Start("Converting objects"))
     {
+      // 3 - Convert atomic objects
       List<LayerTableRecord> usedAcadLayers = new(); // Keeps track of autocad layers used, so we can pass them on later to the material and color unpacker.
       List<SendConversionResult> results = new();
       int count = 0;
-
-      // 4 - Convert atomic objects
       foreach (var (entity, applicationId) in atomicObjects)
       {
         cancellationToken.ThrowIfCancellationRequested();
-        // Create and add a collection for this entity if not done so already.
-        (Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
-
-        if (autocadLayer is not null)
+        using (var convertActivity = _activityFactory.Start("Converting object"))
         {
-          usedAcadLayers.Add(autocadLayer);
-          root.elements.Add(objectCollection);
-        }
+          // Create and add a collection for this entity if not done so already.
+          (Collection objectCollection, LayerTableRecord? autocadLayer) = CreateObjectCollection(entity, tr);
 
-        SendConversionResult? result = null;
-        // If this is a atomic definition object, we *do not* want to bake in the reference point transform to the object
-        if (atomicDefinitionObjectIds.Contains(applicationId))
-        {
-          using (_converterSettings.Push(currentSettings => currentSettings with { ReferencePointTransform = null }))
+          if (autocadLayer is not null)
           {
-            result = ConvertAutocadEntity(entity, applicationId, objectCollection, instanceProxies, projectId);
+            usedAcadLayers.Add(autocadLayer);
+            root.elements.Add(objectCollection);
           }
-        }
-        else // this is a selected atomic object (not part of definition)
-        {
-          result = ConvertAutocadEntity(
+
+          var result = ConvertAutocadEntity(
             entity,
             applicationId,
             objectCollection,
             instanceProxies,
-            projectId,
-            referenceTransform // set this for top level instance proxies to use if needed
+            sendInfo.ProjectId
           );
-        }
+          results.Add(result);
 
-        results.Add(result);
-        onOperationProgressed.Report(new("Converting", (double)++count / atomicObjects.Count));
+          onOperationProgressed.Report(new("Converting", (double)++count / atomicObjects.Count));
+        }
       }
 
       if (results.All(x => x.Status == Status.ERROR))
@@ -158,10 +124,10 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
         throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
       }
 
-      // 5 - Unpack the render material proxies
+      // 4 - Unpack the render material proxies
       root[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackMaterials(atomicObjects, usedAcadLayers);
 
-      // 6 - Unpack the color proxies
+      // 5 - Unpack the color proxies
       root[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, usedAcadLayers);
 
       // add any additional properties (most likely from verticals)
@@ -186,24 +152,15 @@ public abstract class AutocadRootObjectBaseBuilder : IRootObjectBuilder<AutocadR
     string applicationId,
     Collection collectionHost,
     IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
-    string projectId,
-    Matrix3d? transform = null
+    string projectId
   )
   {
     string sourceType = entity.GetType().ToString();
     try
     {
       Base converted;
-      if (entity is BlockReference br && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
+      if (entity is BlockReference && instanceProxies.TryGetValue(applicationId, out InstanceProxy? instanceProxy))
       {
-        // modify transform by reference point this if it is top level
-        if (instanceProxy.maxDepth == 0 && transform is Matrix3d validTransform)
-        {
-          instanceProxy.transform = TransformHelper.ConvertToInstanceMatrix4x4(
-            br.BlockTransform.PreMultiplyBy(validTransform)
-          );
-        }
-
         converted = instanceProxy;
       }
       else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))

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

@@ -2,7 +2,6 @@ using Autodesk.AutoCAD.DatabaseServices;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Common.Caching;
-using Speckle.Converters.Autocad;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models.Collections;
@@ -16,7 +15,6 @@ public sealed class AutocadRootObjectBuilder : AutocadRootObjectBaseBuilder
   public AutocadRootObjectBuilder(
     AutocadLayerUnpacker layerUnpacker,
     IRootToSpeckleConverter converter,
-    IConverterSettingsStore<AutocadConversionSettings> converterSettings,
     ISendConversionCache sendConversionCache,
     AutocadInstanceUnpacker instanceObjectManager,
     AutocadMaterialUnpacker materialUnpacker,
@@ -27,7 +25,6 @@ public sealed class AutocadRootObjectBuilder : AutocadRootObjectBaseBuilder
   )
     : base(
       converter,
-      converterSettings,
       sendConversionCache,
       instanceObjectManager,
       materialUnpacker,

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

@@ -7,8 +7,6 @@ public static class AppUtils
   public static Speckle.Sdk.Application App =>
 #if CIVIL3D
     HostApplications.Civil3D;
-#elif PLANT3D
-    HostApplications.Plant3D;
 #elif AUTOCAD
     HostApplications.AutoCAD;
 #else
@@ -16,11 +14,11 @@ public static class AppUtils
 #endif
 
   public static HostAppVersion Version =>
-#if AUTOCAD2026 || CIVIL3D2026 || PLANT3D2026
+#if AUTOCAD2026 || CIVIL3D2026
     HostAppVersion.v2026;
-#elif AUTOCAD2025 || CIVIL3D2025 || PLANT3D2025
+#elif AUTOCAD2025 || CIVIL3D2025
     HostAppVersion.v2025;
-#elif AUTOCAD2024 || CIVIL3D2024 || PLANT3D2024
+#elif AUTOCAD2024 || CIVIL3D2024
     HostAppVersion.v2024;
 #elif AUTOCAD2023|| CIVIL3D2023
     HostAppVersion.v2023;

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

@@ -11,9 +11,6 @@ using Speckle.Converters.Autocad;
 #elif CIVIL3D
 using Speckle.Converters.Civil3dShared;
 using Speckle.Connectors.Civil3dShared.DependencyInjection;
-#elif PLANT3D
-using Speckle.Connectors.Plant3dShared.DependencyInjection;
-using Speckle.Converters.Plant3dShared;
 #endif
 namespace Speckle.Connectors.Autocad.Plugin;
 
@@ -37,23 +34,18 @@ public class AutocadCommand
     PaletteSet = new PaletteSet($"Speckle", s_id)
     {
       Size = new Size(400, 500),
-      DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right),
+      DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
     };
 
     // init DI
     var services = new ServiceCollection();
-
     _disposableLogger = services.Initialize(AppUtils.App, AppUtils.Version);
-
 #if AUTOCAD
     services.AddAutocad();
     services.AddAutocadConverters();
 #elif CIVIL3D
     services.AddCivil3d();
     services.AddCivil3dConverters();
-#elif PLANT3D
-    services.AddPlant3d();
-    services.AddPlant3dConverters();
 #endif
     Container = services.BuildServiceProvider();
     Container.UseDUI();

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

@@ -3,7 +3,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Autodesk.Windows;
 using Speckle.Sdk;
-#if !AUTOCAD2025_OR_GREATER && !CIVIL3D2025_OR_GREATER && !PLANT3D2025_OR_GREATER
+#if !AUTOCAD2025_OR_GREATER && !CIVIL3D2025_OR_GREATER
 using System.IO;
 #endif
 
@@ -53,12 +53,13 @@ public class AutocadRibbon
     RibbonPanel panel = new() { Source = source };
     tab.Panels.Add(panel);
 
-    RibbonToolTip speckleToolTip = new()
-    {
-      Title = "Speckle",
-      Content = $"Next Gen Speckle Connector for {AppUtils.App.Name}",
-      IsHelpEnabled = true, // Without this "Press F1 for help" does not appear in the tooltip
-    };
+    RibbonToolTip speckleToolTip =
+      new()
+      {
+        Title = "Speckle",
+        Content = $"Next Gen Speckle Connector for {AppUtils.App.Name}",
+        IsHelpEnabled = true // Without this "Press F1 for help" does not appear in the tooltip
+      };
 
     _ = CreateSpeckleButton("Speckle", source, null, speckleToolTip, "logo");
   }
@@ -120,7 +121,7 @@ public class AutocadRibbon
       ShowText = true,
       ToolTip = tooltip,
       HelpSource = new System.Uri("https://speckle.guide/user/autocadcivil.html"),
-      Size = RibbonItemSize.Large,
+      Size = RibbonItemSize.Large
     };
 
     if (TryLoadPngImgSource(imageName + "16.png", out ImageSource? imageSource))

Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/BundleAutoCAD/PackageContents.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ApplicationPackage
-  SchemaVersion="1.0"
-  AppVersion="1.0"
-  Author="AEC SYSTEMS LTD"
-  Name="Speckle for AutoCAD"
-  Description="Speckle for AutoCAD"
-  Icon="./Contents/Resources/Logo.ico"
-  ProductCode="{958850b9-3782-4e6f-b9b3-1b570e0fcae1}"
-  UpgradeCode="{274de351-80aa-4972-9b45-6a93f8ce968f}"
->
-  <!-- For now, we're not updating the AppVersion & ProductCodes with each version -->
-
-  <CompanyDetails Name="Speckle" Url="https://speckle.systems" Email="support@speckle.systems" />
-  <Components>
-    <!-- AutoCAD 2022 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Autocad2022"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2022/Speckle.Connectors.Autocad2022.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R24.1" SeriesMax="R24.1" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2023 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Autocad2023"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R24.2" SeriesMax="R24.2" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2024 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Autocad2024"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2024/Speckle.Connectors.Autocad2024.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R24.3" SeriesMax="R24.3" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2025 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Autocad2025"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2025/Speckle.Connectors.Autocad2025.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R25.0" SeriesMax="R25.0" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2026 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Autocad2026"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Autocad2026/Speckle.Connectors.Autocad2026.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="AutoCAD" SeriesMin="R25.1" SeriesMax="R25.1" />
-    </ComponentEntry>
-  </Components>
-</ApplicationPackage>

Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/BundleCivil3D/PackageContents.xml

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ApplicationPackage
-  SchemaVersion="1.0"
-  AppVersion="1.0"
-  Author="AEC SYSTEMS LTD"
-  Name="Speckle for Civil 3D"
-  Description="Speckle for Civil 3D"
-  Icon="./Contents/Resources/Logo.ico"
-  ProductCode="{cecad7b2-daa9-4a9d-941d-737619ffd999}"
-  UpgradeCode="{ccf4134d-0e24-4e91-8bf4-781ec7313bef}"
->
-  <!-- For now, we're not updating the AppVersion & ProductCodes with each version -->
-
-  <CompanyDetails Name="Speckle" Url="https://speckle.systems" Email="support@speckle.systems" />
-  <Components>
-    <!-- AutoCAD 2022 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Civil3d2022"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2022/Speckle.Connectors.Civil3d2022.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R24.1" SeriesMax="R24.1" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2023 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Civil3d2023"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R24.2" SeriesMax="R24.2" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2024 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Civil3d2024"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R24.3" SeriesMax="R24.3" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2025 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Civil3d2025"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2025/Speckle.Connectors.Civil3d2025.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R25.0" SeriesMax="R25.0" />
-    </ComponentEntry>
-
-    <!-- AutoCAD 2026 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Civil3d2026"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Civil3d2026/Speckle.Connectors.Civil3d2026.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="Civil3D" SeriesMin="R25.1" SeriesMax="R25.1" />
-    </ComponentEntry>
-  </Components>
-</ApplicationPackage>

Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/BundlePlant3D/PackageContents.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ApplicationPackage
-  SchemaVersion="1.0"
-  AppVersion="1.0"
-  Author="AEC SYSTEMS LTD"
-  Name="Speckle for Plant 3D"
-  Description="Speckle for Plant 3D"
-  Icon="./Contents/Resources/Logo.ico"
-  ProductCode="{b91352b6-01db-4084-93c8-684bb231947e}"
-  UpgradeCode="{91c7e43f-e962-40e9-85bd-d6bd733b6964}"
->
-  <CompanyDetails Name="Speckle" Url="https://speckle.systems" Email="support@speckle.systems" />
-  <Components>
-    <!-- Plant 3D 2026 -->
-    <ComponentEntry
-      AppName="Speckle.Connectors.Plant3d2026"
-      ModuleName="./Contents/Windows/Speckle.Connectors.Plant3d2026/Speckle.Connectors.Plant3d2026.dll"
-      LoadOnAutoCADStartup="True"
-    >
-      <RuntimeRequirements OS="Win64" Platform="Plant3D" SeriesMin="R25.1" SeriesMax="R25.1" />
-    </ComponentEntry>
-  </Components>
-</ApplicationPackage>

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

@@ -38,11 +38,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\EntityExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\SpeckleApplicationIdExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\TransactionContext.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\AutocadHostObjectBaseBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\AutocadHostObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObject.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadContinuousTraversalBaseBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadContinuousTraversalBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObjectBaseBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadRibbon.cs" />
@@ -55,15 +52,4 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\s2logo16.png" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\s2logo32.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)Plugin\BundleCivil3D\PackageContents.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Plugin\BundleAutoCAD\PackageContents.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Plugin\BundlePlant3D\PackageContents.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
 </Project>

Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.shproj

@@ -3,15 +3,6 @@
     <PropertyGroup Label="Globals">
         <ProjectGuid>{41BC679F-887F-44CF-971D-A5502EE87DB0}</ProjectGuid>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-      <OutputPath>bin\Debug\</OutputPath>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Local|AnyCPU' ">
-      <OutputPath>bin\Local\</OutputPath>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-      <OutputPath>bin\Release\</OutputPath>
-    </PropertyGroup>
     <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
             Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
     <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>

Connectors/Autocad/Speckle.Connectors.Civil3d2022/Speckle.Connectors.Civil3d2022.csproj

@@ -8,22 +8,16 @@
     <Configurations>Debug;Release;Local</Configurations>
   </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"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Civil3D.API"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2022\Speckle.Converters.Civil3d2022.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="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems"
-    Label="Shared"
-  />
-  <Import
-    Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems"
-    Label="Shared"
-  />
+  
+  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
+  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
 </Project>

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

@@ -82,8 +82,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -178,29 +178,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -291,8 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -324,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -368,12 +346,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj

@@ -9,22 +9,16 @@
   </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" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2023.0.0" ExcludeAssets="runtime"/>
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2023\Speckle.Converters.Civil3d2023.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="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems"
-    Label="Shared"
-  />
-  <Import
-    Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems"
-    Label="Shared"
-  />
+  
+  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
+  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
 </Project>

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

@@ -82,8 +82,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -178,29 +178,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -291,8 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -324,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -368,12 +346,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

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

@@ -9,22 +9,16 @@
   </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" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Civil3D.API" VersionOverride="2024.0.0" ExcludeAssets="runtime"/>
   </ItemGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2024\Speckle.Converters.Civil3d2024.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="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems"
-    Label="Shared"
-  />
-  <Import
-    Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems"
-    Label="Shared"
-  />
+  
+  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
+  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
 </Project>

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

@@ -82,8 +82,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -178,29 +178,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -291,8 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -324,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -368,12 +346,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

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

@@ -8,26 +8,23 @@
 
   <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-->
+    <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="2025.0.0" ExcludeAssets="runtime" />
-    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" ExcludeAssets="runtime" />
-  </ItemGroup>
-
+  
   <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2025.0.0" ExcludeAssets="runtime"/>
+  </ItemGroup>  
+  
+  <ItemGroup>   
     <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2025\Speckle.Converters.Civil3d2025.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>

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

@@ -164,25 +164,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w=="
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -238,8 +219,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -272,7 +254,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -316,12 +298,33 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -8,26 +8,23 @@
 
   <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-->
+    <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" />
+    <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>

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

@@ -164,25 +164,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w=="
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -238,8 +219,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -272,7 +254,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -316,12 +298,33 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -3,8 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.Autocad.DependencyInjection;
 using Speckle.Connectors.Autocad.Operations.Send;
 using Speckle.Connectors.Civil3dShared.Bindings;
-using Speckle.Connectors.Civil3dShared.HostApp;
-using Speckle.Connectors.Civil3dShared.Operations.Receive;
 using Speckle.Connectors.Civil3dShared.Operations.Send;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.DUI.Bindings;
@@ -22,20 +20,14 @@ public static class Civil3dConnectorModule
     // add send
     serviceCollection.LoadSend();
     serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Civil3dRootObjectBuilder>();
-    serviceCollection.AddScoped<
-      IRootContinuousTraversalBuilder<AutocadRootObject>,
-      Civil3dContinuousTraversalBuilder
-    >();
     serviceCollection.AddSingleton<IBinding, Civil3dSendBinding>();
 
     // add receive
     serviceCollection.LoadReceive();
-    serviceCollection.AddScoped<IHostObjectBuilder, Civil3dHostObjectBuilder>();
     serviceCollection.AddSingleton<IBinding, Civil3dReceiveBinding>();
 
     // additional classes
     serviceCollection.AddScoped<PropertySetDefinitionHandler>();
-    serviceCollection.AddScoped<PropertySetBaker>();
 
     // automatically detects the Class:IClass interface pattern to register all generated interfaces
     serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());

Connectors/Autocad/Speckle.Connectors.Civil3dShared/HostApp/PropertySetBaker.cs

@@ -1,404 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Civil3dShared;
-using Speckle.Converters.Civil3dShared.Helpers;
-using Speckle.Converters.Civil3dShared.ToSpeckle;
-using Speckle.Converters.Common;
-using Speckle.Sdk;
-using Speckle.Sdk.Models;
-using AAEC = Autodesk.Aec;
-using AAECPDB = Autodesk.Aec.PropertyData.DatabaseServices;
-using ADB = Autodesk.AutoCAD.DatabaseServices;
-
-namespace Speckle.Connectors.Civil3dShared.HostApp;
-
-/// <summary>
-/// Helper class to bake property sets to entities on receive.
-/// </summary>
-public class PropertySetBaker
-{
-  private const string PROP_SET_DEF_DICT_NAME = "AecPropertySetDefs";
-  private readonly IConverterSettingsStore<Civil3dConversionSettings> _settingsStore;
-  private readonly ILogger<PropertySetBaker> _logger;
-  private readonly PropertyHandler _propertyHandler;
-
-  /// <summary>
-  /// Map of property set definition name to its ObjectId. Populated during ParsePropertySetDefinitions.
-  /// </summary>
-  private readonly Dictionary<string, ADB.ObjectId> _propertySetDefinitionMap = new();
-
-  public PropertySetBaker(
-    IConverterSettingsStore<Civil3dConversionSettings> settingsStore,
-    ILogger<PropertySetBaker> logger
-  )
-  {
-    _settingsStore = settingsStore;
-    _logger = logger;
-    _propertyHandler = new PropertyHandler();
-  }
-
-  /// <summary>
-  /// Removes all property set definitions with a prefix before receive operation.
-  /// </summary>
-  public void PurgePropertySets(string namePrefix)
-  {
-    ADB.Database db = _settingsStore.Current.Document.Database;
-    using var tr = db.TransactionManager.StartTransaction();
-
-    List<ADB.ObjectId> definitionsToDelete = new();
-
-    // Access the property set definition dictionary from the named object dictionary
-    var nod = (ADB.DBDictionary)tr.GetObject(db.NamedObjectsDictionaryId, ADB.OpenMode.ForRead);
-
-    if (nod.Contains(PROP_SET_DEF_DICT_NAME))
-    {
-      ADB.ObjectId propSetDefsDictId = nod.GetAt(PROP_SET_DEF_DICT_NAME);
-      var propSetDefsDict = (ADB.DBDictionary)tr.GetObject(propSetDefsDictId, ADB.OpenMode.ForRead);
-
-      // Iterate through all property set definitions in the dictionary
-      foreach (ADB.DBDictionaryEntry entry in propSetDefsDict)
-      {
-        if (entry.Key.Contains(namePrefix))
-        {
-          definitionsToDelete.Add(entry.Value);
-        }
-      }
-    }
-
-    // Delete the matching definitions
-    foreach (ADB.ObjectId defId in definitionsToDelete)
-    {
-      try
-      {
-        var propSetDef = (AAECPDB.PropertySetDefinition)tr.GetObject(defId, ADB.OpenMode.ForWrite);
-        propSetDef.Erase();
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogWarning(ex, "Failed to purge property set definition");
-      }
-    }
-
-    tr.Commit();
-  }
-
-  /// <summary>
-  /// Parse and bake all property set definitions from the root object.
-  /// Should be called after purging and after materials/colors are parsed.
-  /// </summary>
-  public void ParseAndBakePropertySetDefinitions(Base rootObject, string namePrefix)
-  {
-    _propertySetDefinitionMap.Clear();
-
-    if (rootObject[ProxyKeys.PROPERTYSET_DEFINITIONS] is not Dictionary<string, object?> definitions)
-    {
-      return;
-    }
-
-    if (definitions.Count == 0)
-    {
-      return;
-    }
-
-    using var tr = _settingsStore.Current.Document.Database.TransactionManager.StartTransaction();
-
-    foreach (var definition in definitions)
-    {
-      string setName = definition.Key;
-      object? setDefObj = definition.Value;
-
-      if (setDefObj is not Dictionary<string, object?> setDefData)
-      {
-        _logger.LogWarning("Property set definition {SetName} has invalid data format", setName);
-        continue;
-      }
-
-      if (!setDefData.TryGetValue(PropertySetDefinitionHandler.PROP_SET_PROP_DEFS_KEY, out var propDefsObj))
-      {
-        _logger.LogWarning("Property set definition {SetName} missing propertyDefinitions", setName);
-        continue;
-      }
-
-      if (propDefsObj is not Dictionary<string, object?> propertyDefinitions)
-      {
-        _logger.LogWarning("Property set definition {SetName} propertyDefinitions has invalid format", setName);
-        continue;
-      }
-
-      ADB.ObjectId defId = CreatePropertySetDefinition(setName, propertyDefinitions, namePrefix, tr);
-      if (!defId.IsNull)
-      {
-        _propertySetDefinitionMap[setName] = defId;
-      }
-    }
-
-    tr.Commit();
-  }
-
-  /// <summary>
-  /// Try to bake property sets from a Speckle object to a Civil3D entity.
-  /// </summary>
-  public bool TryBakePropertySets(ADB.Entity entity, Base sourceObject, ADB.Transaction tr)
-  {
-    if (
-      sourceObject["properties"] is not Dictionary<string, object?> properties
-      || !properties.TryGetValue("Property Sets", out var propertySetsObj)
-      || propertySetsObj is not Dictionary<string, object?> propertySets
-      || propertySets.Count == 0
-    )
-    {
-      return false;
-    }
-
-    try
-    {
-      foreach (var propertySet in propertySets)
-      {
-        string setName = propertySet.Key;
-        object? setDataObj = propertySet.Value;
-
-        if (setDataObj is not Dictionary<string, object?> setData)
-        {
-          _logger.LogWarning("Property set {SetName} has invalid data format", setName);
-          continue;
-        }
-
-        if (!TryBakePropertySet(entity, setName, setData, tr))
-        {
-          _logger.LogWarning("Failed to bake property set {SetName} onto entity", setName);
-        }
-      }
-
-      return true;
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex, "Failed to bake property sets onto entity {Handle}", entity.Handle);
-      return false;
-    }
-  }
-
-  private bool TryBakePropertySet(
-    ADB.Entity entity,
-    string setName,
-    Dictionary<string, object?> setData,
-    ADB.Transaction tr
-  )
-  {
-    try
-    {
-      if (!_propertySetDefinitionMap.TryGetValue(setName, out ADB.ObjectId propertySetDefId))
-      {
-        _logger.LogWarning("Property set definition {SetName} not found in definition map", setName);
-        return false;
-      }
-
-      if (propertySetDefId.IsNull)
-      {
-        return false;
-      }
-
-      if (ObjectHasPropertySet(entity, propertySetDefId))
-      {
-        throw new SpeckleException($"Property set '{setName}' already exists on entity.");
-      }
-
-      return AddPropertySetToEntity(entity, propertySetDefId, setData, tr);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogWarning(ex, "Failed to process property set {SetName}", setName);
-      return false;
-    }
-  }
-
-  private ADB.ObjectId CreatePropertySetDefinition(
-    string setName,
-    Dictionary<string, object?> propertyDefinitions,
-    string namePrefix,
-    ADB.Transaction tr
-  )
-  {
-    var db = _settingsStore.Current.Document.Database;
-    using AAECPDB.DictionaryPropertySetDefinitions propSetDefs = new(db);
-
-    string prefixedName = $"{setName}-{namePrefix}";
-
-    AAECPDB.PropertySetDefinition propSetDef = new();
-    propSetDef.SetToStandard(db);
-    propSetDef.SubSetDatabaseDefaults(db);
-    //propSetDef.Description = "Property Set Definition added by Speckle"; // POC: should use the description that was published. can this back in if needed
-    propSetDef.AppliesToAll = true;
-
-    foreach (var propertyDefinition in propertyDefinitions)
-    {
-      string propertyName = propertyDefinition.Key;
-      object? propertyDefObj = propertyDefinition.Value;
-
-      if (propertyDefObj is not Dictionary<string, object?> propertyDefDict)
-      {
-        continue;
-      }
-
-      if (
-        !propertyDefDict.TryGetValue(PropertySetDefinitionHandler.PROP_DEF_TYPE_KEY, out var dataTypeStr)
-        || dataTypeStr is not string dataTypeString
-      )
-      {
-        _logger.LogError(
-          "Property set definition {SetName} is invalid: property {PropertyName} missing or invalid dataType",
-          setName,
-          propertyName
-        );
-        return ADB.ObjectId.Null;
-      }
-
-      if (!Enum.TryParse(dataTypeString, out AAEC.PropertyData.DataType dataType))
-      {
-        _logger.LogError(
-          "Property set definition {SetName} is invalid: unsupported data type {DataType} for property {PropertyName}",
-          setName,
-          dataTypeString,
-          propertyName
-        );
-        return ADB.ObjectId.Null;
-      }
-
-      AAECPDB.PropertyDefinition propDef = new() { DataType = dataType, Name = propertyName };
-
-      propDef.SetToStandard(db);
-      propDef.SubSetDatabaseDefaults(db);
-
-      if (
-        propertyDefDict.TryGetValue(PropertySetDefinitionHandler.PROP_DEF_DEFAULT_VALUE_KEY, out object? defaultValue)
-        && defaultValue != null
-      )
-      {
-        try
-        {
-          // Cast numeric types to avoid bad numeric value errors
-          var convertedValue = dataType switch
-          {
-            AAEC.PropertyData.DataType.Integer => (int)(long)defaultValue,
-            AAEC.PropertyData.DataType.AutoIncrement => (int)(long)defaultValue,
-            _ => defaultValue,
-          };
-
-          propDef.DefaultData = convertedValue;
-        }
-        catch (Exception ex) when (!ex.IsFatal())
-        {
-          _logger.LogWarning(
-            ex,
-            "Failed to set default value for property {PropertyName}, continuing without default",
-            propertyName
-          );
-        }
-      }
-
-      propSetDef.Definitions.Add(propDef);
-    }
-
-    propSetDefs.AddNewRecord(prefixedName, propSetDef);
-    tr.AddNewlyCreatedDBObject(propSetDef, true);
-
-    return propSetDef.ObjectId;
-  }
-
-  private bool ObjectHasPropertySet(ADB.DBObject obj, ADB.ObjectId propertySetId)
-  {
-    try
-    {
-      ADB.ObjectId tempId = AAECPDB.PropertyDataServices.GetPropertySet(obj, propertySetId);
-      return !tempId.IsNull;
-    }
-    catch (Autodesk.AutoCAD.Runtime.Exception ex) when (!ex.IsFatal())
-    {
-      return false;
-    }
-  }
-
-  private bool AddPropertySetToEntity(
-    ADB.Entity entity,
-    ADB.ObjectId propertySetDefId,
-    Dictionary<string, object?> setData,
-    ADB.Transaction tr
-  )
-  {
-    try
-    {
-      if (!entity.IsWriteEnabled)
-      {
-        entity.UpgradeOpen();
-      }
-
-      AAECPDB.PropertyDataServices.AddPropertySet(entity, propertySetDefId);
-
-      return TrySetPropertyValues(entity, propertySetDefId, setData, tr);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogWarning(ex, "Failed to add property set to entity");
-      return false;
-    }
-  }
-
-  private bool TrySetPropertyValues(
-    ADB.Entity entity,
-    ADB.ObjectId propertySetDefId,
-    Dictionary<string, object?> setData,
-    ADB.Transaction tr
-  )
-  {
-    try
-    {
-      ADB.ObjectId propertySetId = AAECPDB.PropertyDataServices.GetPropertySet(entity, propertySetDefId);
-      var propertySet = (AAECPDB.PropertySet)tr.GetObject(propertySetId, ADB.OpenMode.ForWrite);
-      var setDefinition = (AAECPDB.PropertySetDefinition)tr.GetObject(propertySetDefId, ADB.OpenMode.ForRead);
-
-      // Build a map of property names to definition IDs
-      Dictionary<string, int> propertyNameToId = new();
-      foreach (AAECPDB.PropertyDefinition propDef in setDefinition.Definitions)
-      {
-        propertyNameToId[propDef.Name] = propDef.Id;
-      }
-
-      foreach (var propertyEntry in setData)
-      {
-        string propertyName = propertyEntry.Key;
-        object? propertyDataObj = propertyEntry.Value;
-
-        if (propertyDataObj is not Dictionary<string, object?> propertyDataDict)
-        {
-          continue;
-        }
-
-        if (!propertyDataDict.TryGetValue("value", out var value) || value == null)
-        {
-          continue;
-        }
-
-        if (!propertyNameToId.TryGetValue(propertyName, out int propertyId))
-        {
-          continue;
-        }
-
-        _propertyHandler.TryGetValue(
-          () =>
-          {
-            propertySet.SetAt(propertyId, value);
-            return true;
-          },
-          out _
-        );
-      }
-
-      return true;
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogWarning(ex, "Failed to update property set values");
-      return false;
-    }
-  }
-}

Connectors/Autocad/Speckle.Connectors.Civil3dShared/Operations/Receive/Civil3dHostObjectBuilder.cs

@@ -1,60 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Autocad.Operations.Receive;
-using Speckle.Connectors.Civil3dShared.HostApp;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Models;
-
-namespace Speckle.Connectors.Civil3dShared.Operations.Receive;
-
-/// <summary>
-/// <para>Civil3D specific host object builder with property set support. Expects to be a scoped dependency per receive operation.</para>
-/// </summary>
-public sealed class Civil3dHostObjectBuilder : AutocadHostObjectBaseBuilder
-{
-  private readonly PropertySetBaker _propertySetBaker;
-
-  public Civil3dHostObjectBuilder(
-    IRootToHostConverter converter,
-    AutocadLayerBaker layerBaker,
-    AutocadGroupBaker groupBaker,
-    AutocadInstanceBaker instanceBaker,
-    IAutocadMaterialBaker materialBaker,
-    IAutocadColorBaker colorBaker,
-    AutocadContext autocadContext,
-    RootObjectUnpacker rootObjectUnpacker,
-    IReceiveConversionHandler conversionHandler,
-    PropertySetBaker propertySetBaker
-  )
-    : base(
-      converter,
-      layerBaker,
-      groupBaker,
-      instanceBaker,
-      materialBaker,
-      colorBaker,
-      autocadContext,
-      rootObjectUnpacker,
-      conversionHandler
-    )
-  {
-    _propertySetBaker = propertySetBaker;
-  }
-
-  protected override void PreReceiveAdditionalDeepClean(string baseLayerPrefix)
-  {
-    _propertySetBaker.PurgePropertySets(baseLayerPrefix);
-  }
-
-  protected override void ParseAndBakeAdditionalProxies(Base rootObject, string baseLayerPrefix)
-  {
-    _propertySetBaker.ParseAndBakePropertySetDefinitions(rootObject, baseLayerPrefix);
-  }
-
-  protected override void PostBakeEntity(Entity entity, Base originalObject, Transaction tr)
-  {
-    _propertySetBaker.TryBakePropertySets(entity, originalObject, tr);
-  }
-}

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

@@ -1,57 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Civil3dShared.ToSpeckle;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Civil3dShared.Operations.Send;
-
-public sealed class Civil3dContinuousTraversalBuilder : AutocadContinuousTraversalBaseBuilder
-{
-  private readonly AutocadLayerUnpacker _layerUnpacker;
-  private readonly PropertySetDefinitionHandler _propertySetDefinitionHandler;
-
-  public Civil3dContinuousTraversalBuilder(
-    AutocadLayerUnpacker layerUnpacker,
-    PropertySetDefinitionHandler propertySetDefinitionHandler,
-    IRootToSpeckleConverter converter,
-    ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
-  )
-    : base(
-      converter,
-      sendConversionCache,
-      instanceObjectManager,
-      materialUnpacker,
-      colorUnpacker,
-      groupUnpacker,
-      logger,
-      activityFactory
-    )
-  {
-    _layerUnpacker = layerUnpacker;
-    _propertySetDefinitionHandler = propertySetDefinitionHandler;
-  }
-
-  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
-
-    return (layer, autocadLayer);
-  }
-
-  public override void AddAdditionalProxiesToRoot(Collection rootObject)
-  {
-    rootObject[ProxyKeys.PROPERTYSET_DEFINITIONS] = _propertySetDefinitionHandler.Definitions;
-  }
-}

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

@@ -4,7 +4,6 @@ using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Autocad.Operations.Send;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Operations;
-using Speckle.Converters.Autocad;
 using Speckle.Converters.Civil3dShared.ToSpeckle;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Logging;
@@ -21,7 +20,6 @@ public sealed class Civil3dRootObjectBuilder : AutocadRootObjectBaseBuilder
     AutocadLayerUnpacker layerUnpacker,
     PropertySetDefinitionHandler propertySetDefinitionHandler,
     IRootToSpeckleConverter converter,
-    IConverterSettingsStore<AutocadConversionSettings> converterSettings,
     ISendConversionCache sendConversionCache,
     AutocadInstanceUnpacker instanceObjectManager,
     AutocadMaterialUnpacker materialUnpacker,
@@ -32,7 +30,6 @@ public sealed class Civil3dRootObjectBuilder : AutocadRootObjectBaseBuilder
   )
     : base(
       converter,
-      converterSettings,
       sendConversionCache,
       instanceObjectManager,
       materialUnpacker,

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

@@ -11,16 +11,11 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\Civil3dReceiveBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Civil3dConnectorModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\PropertySetBaker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\Civil3dHostObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Civil3dContinuousTraversalBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Civil3dRootObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\Civil3dSendBinding.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)DependencyInjection\" />
-    <Folder Include="$(MSBuildThisFileDirectory)HostApp\" />
-    <Folder Include="$(MSBuildThisFileDirectory)Operations\Receive\" />
     <Folder Include="$(MSBuildThisFileDirectory)Operations\Send\" />
   </ItemGroup>
 </Project>

Connectors/Autocad/Speckle.Connectors.Plant3d2026/Speckle.Connectors.Plant3d2026.csproj

@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Plant3DVersion>2026</Plant3DVersion>
-    <DefineConstants>$(DefineConstants);PLANT3D2026;PLANT3D;PLANT3D2024_OR_GREATER;PLANT3D2025_OR_GREATER;PLANT3D2026_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-->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
-    <PackageReference Include="Speckle.Plant3D.API" VersionOverride="2026.0.0" ExcludeAssets="runtime" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Plant3d\Speckle.Converters.Plant3d2026\Speckle.Converters.Plant3d2026.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.Plant3dShared\Speckle.Connectors.Plant3dShared.projitems" Label="Shared" />
-
-  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
-</Project>

Connectors/Autocad/Speckle.Connectors.Plant3dShared/Bindings/Plant3dSendBinding.cs

@@ -1,61 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Autocad.Bindings;
-using Speckle.Connectors.Common.Caching;
-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.Connectors.DUI.Models.Card.SendFilter;
-using Speckle.Converters.Autocad;
-using Speckle.Converters.Common;
-using Speckle.Converters.Plant3dShared;
-
-namespace Speckle.Connectors.Plant3dShared.Bindings;
-
-public sealed class Plant3dSendBinding : AutocadSendBaseBinding
-{
-  private readonly IPlant3dConversionSettingsFactory _plant3dConversionSettingsFactory;
-  private readonly IAutocadConversionSettingsFactory _autocadConversionSettingsFactory;
-
-  public Plant3dSendBinding(
-    DocumentModelStore store,
-    IBrowserBridge parent,
-    IEnumerable<ISendFilter> sendFilters,
-    ICancellationManager cancellationManager,
-    ISendConversionCache sendConversionCache,
-    IPlant3dConversionSettingsFactory plant3dConversionSettingsFactory,
-    IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
-    IThreadContext threadContext,
-    ITopLevelExceptionHandler topLevelExceptionHandler,
-    IAppIdleManager appIdleManager,
-    ISendOperationManagerFactory sendOperationManagerFactory
-  )
-    : base(
-      store,
-      parent,
-      sendFilters,
-      cancellationManager,
-      sendConversionCache,
-      threadContext,
-      topLevelExceptionHandler,
-      appIdleManager,
-      sendOperationManagerFactory
-    )
-  {
-    _plant3dConversionSettingsFactory = plant3dConversionSettingsFactory;
-    _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
-  }
-
-  // We need a separate send binding for Plant 3D due to using a different unit converter (needed for conversion settings construction)
-  protected override void InitializeSettings(IServiceProvider serviceProvider)
-  {
-    serviceProvider
-      .GetRequiredService<IConverterSettingsStore<Plant3dConversionSettings>>()
-      .Initialize(_plant3dConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
-
-    serviceProvider
-      .GetRequiredService<IConverterSettingsStore<AutocadConversionSettings>>()
-      .Initialize(_autocadConversionSettingsFactory.Create(Application.DocumentManager.CurrentDocument));
-  }
-}

Connectors/Autocad/Speckle.Connectors.Plant3dShared/DependencyInjection/Plant3dConnectorModule.cs

@@ -1,27 +0,0 @@
-using System.Reflection;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Autocad.DependencyInjection;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.Plant3dShared.Bindings;
-using Speckle.Connectors.Plant3dShared.Operations.Send;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.Plant3dShared.DependencyInjection;
-
-public static class Plant3dConnectorModule
-{
-  public static void AddPlant3d(this IServiceCollection serviceCollection)
-  {
-    serviceCollection.AddAutocadBase();
-
-    // add send
-    serviceCollection.LoadSend();
-    serviceCollection.AddScoped<IRootObjectBuilder<AutocadRootObject>, Plant3dRootObjectBuilder>();
-    serviceCollection.AddSingleton<IBinding, Plant3dSendBinding>();
-
-    // automatically detects the Class:IClass interface pattern to register all generated interfaces
-    serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetExecutingAssembly());
-  }
-}

Connectors/Autocad/Speckle.Connectors.Plant3dShared/Operations/Send/Plant3dRootObjectBuilder.cs

@@ -1,50 +0,0 @@
-using Autodesk.AutoCAD.DatabaseServices;
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Common.Caching;
-using Speckle.Converters.Autocad;
-using Speckle.Converters.Common;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Plant3dShared.Operations.Send;
-
-public sealed class Plant3dRootObjectBuilder : AutocadRootObjectBaseBuilder
-{
-  private readonly AutocadLayerUnpacker _layerUnpacker;
-
-  public Plant3dRootObjectBuilder(
-    AutocadLayerUnpacker layerUnpacker,
-    IRootToSpeckleConverter converter,
-    IConverterSettingsStore<AutocadConversionSettings> converterSettings,
-    ISendConversionCache sendConversionCache,
-    AutocadInstanceUnpacker instanceObjectManager,
-    AutocadMaterialUnpacker materialUnpacker,
-    AutocadColorUnpacker colorUnpacker,
-    AutocadGroupUnpacker groupUnpacker,
-    ILogger<AutocadRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory
-  )
-    : base(
-      converter,
-      converterSettings,
-      sendConversionCache,
-      instanceObjectManager,
-      materialUnpacker,
-      colorUnpacker,
-      groupUnpacker,
-      logger,
-      activityFactory
-    )
-  {
-    _layerUnpacker = layerUnpacker;
-  }
-
-  public override (Collection, LayerTableRecord?) CreateObjectCollection(Entity entity, Transaction tr)
-  {
-    Layer layer = _layerUnpacker.GetOrCreateSpeckleLayer(entity, tr, out LayerTableRecord? autocadLayer);
-
-    return (layer, autocadLayer);
-  }
-}

Connectors/Autocad/Speckle.Connectors.Plant3dShared/Speckle.Connectors.Plant3dShared.projitems

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>B1C4A14C-2F4E-4C3D-9B71-A3F5D8E6C912</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Speckle.Connectors.Plant3dShared</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\Plant3dConnectorModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Plant3dRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\Plant3dSendBinding.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)DependencyInjection\" />
-    <Folder Include="$(MSBuildThisFileDirectory)Operations\Send\" />
-  </ItemGroup>
-</Project>

Connectors/Autocad/Speckle.Connectors.Plant3dShared/Speckle.Connectors.Plant3dShared.shproj

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B1C4A14C-2F4E-4C3D-9B71-A3F5D8E6C912}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <Import Project="Speckle.Connectors.Plant3dShared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

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

@@ -48,10 +48,11 @@ public class CsiSharedSelectionBinding : ISelectionBinding, IDisposable
     {
       _lastSelection = currentIds;
       // ensure UI updates also run on main thread
-      _threadContext.RunOnMain(() =>
-        _topLevelExceptionHandler.CatchUnhandled(() =>
-          Parent.Send(SelectionBindingEvents.SET_SELECTION, currentSelection)
-        )
+      _threadContext.RunOnMain(
+        () =>
+          _topLevelExceptionHandler.CatchUnhandled(
+            () => Parent.Send(SelectionBindingEvents.SET_SELECTION, currentSelection)
+          )
       );
     }
   }
@@ -95,7 +96,7 @@ public class CsiSharedSelectionBinding : ISelectionBinding, IDisposable
       var typeKey = (ModelObjectType)objectType[i];
       var typeName = typeKey.ToString();
       encodedIds.Add(ObjectIdentifier.Encode(objectType[i], objectName[i]));
-      typeCounts[typeName] = (typeCounts.TryGetValue(typeName, out var count) ? count : 0) + 1;
+      typeCounts[typeName] = (typeCounts.TryGetValue(typeName, out var count) ? count : 0) + 1; // NOTE: Cross-framework compatibility (net 48 and net8)
     }
     var summary =
       encodedIds.Count == 0

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

@@ -1,9 +1,6 @@
-using System.IO;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.Common.Cancellation;
 using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Connectors.CSiShared.Operations.Send.Settings;
-using Speckle.Connectors.CSiShared.Settings;
 using Speckle.Connectors.CSiShared.Utils;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
@@ -26,7 +23,6 @@ public sealed class CsiSharedSendBinding : ISendBinding
   private readonly ICsiApplicationService _csiApplicationService;
   private readonly ICsiConversionSettingsFactory _csiConversionSettingsFactory;
   private readonly ISendOperationManagerFactory _sendOperationManagerFactory;
-  private readonly ToSpeckleSettingsManager _toSpeckleSettingsManager;
 
   public CsiSharedSendBinding(
     IBrowserBridge parent,
@@ -34,8 +30,7 @@ public sealed class CsiSharedSendBinding : ISendBinding
     ICancellationManager cancellationManager,
     ICsiConversionSettingsFactory csiConversionSettingsFactory,
     ICsiApplicationService csiApplicationService,
-    ISendOperationManagerFactory sendOperationManagerFactory,
-    ToSpeckleSettingsManager toSpeckleSettingsManager
+    ISendOperationManagerFactory sendOperationManagerFactory
   )
   {
     _sendFilters = sendFilters.ToList();
@@ -45,50 +40,25 @@ public sealed class CsiSharedSendBinding : ISendBinding
     _csiConversionSettingsFactory = csiConversionSettingsFactory;
     _csiApplicationService = csiApplicationService;
     _sendOperationManagerFactory = sendOperationManagerFactory;
-    _toSpeckleSettingsManager = toSpeckleSettingsManager;
   }
 
   public List<ISendFilter> GetSendFilters() => _sendFilters;
 
-  public List<ICardSetting> GetSendSettings() =>
-    [new LoadCaseCombinationSetting([], _csiApplicationService.SapModel), new ResultTypeSetting([])];
+  public List<ICardSetting> GetSendSettings() => [];
 
   public async Task Send(string modelCardId)
   {
     using var manager = _sendOperationManagerFactory.Create();
-    var (fileName, fileSizeBytes) = GetFileInfo();
     await manager.Process(
       Commands,
       modelCardId,
-      (sp, card) =>
-      {
+      (sp, _) =>
         sp.GetRequiredService<IConverterSettingsStore<CsiConversionSettings>>()
-          .Initialize(
-            _csiConversionSettingsFactory.Create(
-              _csiApplicationService.SapModel,
-              _toSpeckleSettingsManager.GetLoadCasesAndCombinations(card),
-              _toSpeckleSettingsManager.GetResultTypes(card)
-            )
-          );
-      },
-      card => card.SendFilter.NotNull().RefreshObjectIds().Select(DecodeObjectIdentifier).ToList(),
-      fileName,
-      fileSizeBytes
+          .Initialize(_csiConversionSettingsFactory.Create(_csiApplicationService.SapModel)),
+      card => card.SendFilter.NotNull().RefreshObjectIds().Select(DecodeObjectIdentifier).ToList()
     );
   }
 
-  private (string? fileName, long? fileBytes) GetFileInfo()
-  {
-    string fullPath = _csiApplicationService.SapModel.GetModelFilename(true);
-    if (!File.Exists(fullPath))
-    {
-      return (null, null);
-    }
-
-    var fileInfo = new FileInfo(fullPath);
-    return (fileInfo.Name, fileInfo.Length);
-  }
-
   private ICsiWrapper DecodeObjectIdentifier(string encodedId)
   {
     var (type, name) = ObjectIdentifier.Decode(encodedId);

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

@@ -89,11 +89,7 @@ public class CsiDocumentModelStore : DocumentModelStore, IDisposable
         _speckleApplication.Slug
       );
       DocumentStateFile = Path.Combine(HostAppUserDataPath, $"{ModelPathHash}.json");
-      _logger.LogDebug(
-        "Paths set - Hash: {ModelPathHash}, File: {DocumentStateFile}",
-        ModelPathHash,
-        DocumentStateFile
-      );
+      _logger.LogDebug($"Paths set - Hash: {ModelPathHash}, File: {DocumentStateFile}");
     }
     catch (Exception ex) when (!ex.IsFatal())
     {

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiFrameSectionPropertyExtractor.cs

@@ -20,8 +20,23 @@ public class CsiFrameSectionPropertyExtractor : IFrameSectionPropertyExtractor
     _settingsStore = settingsStore;
   }
 
-  public void ExtractProperties(string sectionName, Dictionary<string, object?> properties) =>
+  public void ExtractProperties(string sectionName, Dictionary<string, object?> properties)
+  {
+    GetMaterialName(sectionName, properties);
     GetSectionProperties(sectionName, properties);
+    GetPropertyModifiers(sectionName, properties);
+  }
+
+  private void GetMaterialName(string sectionName, Dictionary<string, object?> properties)
+  {
+    // get material name
+    string materialName = string.Empty;
+    _settingsStore.Current.SapModel.PropFrame.GetMaterial(sectionName, ref materialName);
+
+    // append to General Data of properties dictionary
+    Dictionary<string, object?> generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+    generalData["Material"] = materialName;
+  }
 
   private void GetSectionProperties(string sectionName, Dictionary<string, object?> properties)
   {
@@ -54,20 +69,47 @@ public class CsiFrameSectionPropertyExtractor : IFrameSectionPropertyExtractor
       ref radiusOfGyrationAboutMinorAxis
     );
 
+    string distanceUnit = _settingsStore.Current.SpeckleUnits;
+    string areaUnit = $"{distanceUnit}²"; // // TODO: Formalize this better
+    string modulusUnit = $"{distanceUnit}³"; // // TODO: Formalize this better
+    string inertiaUnit = $"{distanceUnit}\u2074"; // TODO: Formalize this better
+
     Dictionary<string, object?> mechanicalProperties = properties.EnsureNested(
       SectionPropertyCategory.SECTION_PROPERTIES
     );
-    mechanicalProperties.Add("Area", crossSectionalArea);
-    mechanicalProperties.Add("As2", shearAreaInMajorAxisDirection);
-    mechanicalProperties.Add("As3", shearAreaInMinorAxisDirection);
-    mechanicalProperties.Add("J", torsionalConstant);
-    mechanicalProperties.Add("I22", momentOfInertiaAboutMajorAxis);
-    mechanicalProperties.Add("I33", momentOfInertiaAboutMinorAxis);
-    mechanicalProperties.Add("S22", sectionModulusAboutMajorAxis);
-    mechanicalProperties.Add("S33", sectionModulusAboutMinorAxis);
-    mechanicalProperties.Add("Z22", plasticModulusAboutMajorAxis);
-    mechanicalProperties.Add("Z33", plasticModulusAboutMinorAxis);
-    mechanicalProperties.Add("R22", radiusOfGyrationAboutMajorAxis);
-    mechanicalProperties.Add("R33", radiusOfGyrationAboutMinorAxis);
+    mechanicalProperties.AddWithUnits("Area", crossSectionalArea, areaUnit);
+    mechanicalProperties.AddWithUnits("As2", shearAreaInMajorAxisDirection, areaUnit);
+    mechanicalProperties.AddWithUnits("As3", shearAreaInMinorAxisDirection, areaUnit);
+    mechanicalProperties.AddWithUnits("J", torsionalConstant, inertiaUnit);
+    mechanicalProperties.AddWithUnits("I22", momentOfInertiaAboutMajorAxis, inertiaUnit);
+    mechanicalProperties.AddWithUnits("I33", momentOfInertiaAboutMinorAxis, inertiaUnit);
+    mechanicalProperties.AddWithUnits("S22", sectionModulusAboutMajorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("S33", sectionModulusAboutMinorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("Z22", plasticModulusAboutMajorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("Z33", plasticModulusAboutMinorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("R22", radiusOfGyrationAboutMajorAxis, distanceUnit);
+    mechanicalProperties.AddWithUnits("R33", radiusOfGyrationAboutMinorAxis, distanceUnit);
+  }
+
+  private void GetPropertyModifiers(string sectionName, Dictionary<string, object?> properties)
+  {
+    double[] stiffnessModifiersArray = [];
+    _settingsStore.Current.SapModel.PropFrame.GetModifiers(sectionName, ref stiffnessModifiersArray);
+
+    Dictionary<string, object?> modifiers =
+      new()
+      {
+        ["Cross-section (Axial) Area"] = stiffnessModifiersArray[0],
+        ["Shear Area in 2 Direction"] = stiffnessModifiersArray[1],
+        ["Shear Area in 3 Direction"] = stiffnessModifiersArray[2],
+        ["Torsional Constant"] = stiffnessModifiersArray[3],
+        ["Moment of Inertia about 2 Axis"] = stiffnessModifiersArray[4],
+        ["Moment of Inertia about 3 Axis"] = stiffnessModifiersArray[5],
+        ["Mass"] = stiffnessModifiersArray[6],
+        ["Weight"] = stiffnessModifiersArray[7],
+      };
+
+    Dictionary<string, object?> generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+    generalData["Modifiers"] = modifiers;
   }
 }

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiMaterialPropertyExtractor.cs

@@ -11,7 +11,7 @@ namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
 /// Currently, all material property extraction can happen on a CsiShared level which simplifies things a lot.
 /// Properties depend on the directional symmetry of the material, hence the switch statements.
 /// </remarks>
-public class CsiMaterialPropertyExtractor : IMaterialPropertyExtractor
+public class CsiMaterialPropertyExtractor
 {
   /// <summary>
   /// Property strings for all mechanical properties, used by numerous methods.
@@ -35,11 +35,11 @@ public class CsiMaterialPropertyExtractor : IMaterialPropertyExtractor
     _settingsStore = settingsStore;
   }
 
-  public void ExtractProperties(string name, Dictionary<string, object?> properties)
+  public void ExtractProperties(string materialName, Dictionary<string, object?> properties)
   {
-    GetGeneralProperties(name, properties);
-    GetWeightAndMassProperties(name, properties);
-    GetMechanicalProperties(name, properties);
+    GetGeneralProperties(materialName, properties);
+    GetWeightAndMassProperties(materialName, properties); // TODO: Add units
+    GetMechanicalProperties(materialName, properties); // TODO: Add units
   }
 
   private void GetGeneralProperties(string materialName, Dictionary<string, object?> properties)
@@ -76,7 +76,7 @@ public class CsiMaterialPropertyExtractor : IMaterialPropertyExtractor
       ref massPerUnitVolume
     );
 
-    var weightAndMass = properties.EnsureNested(SectionPropertyCategory.WEIGHT_AND_MASS);
+    var weightAndMass = properties.EnsureNested("Weight and Mass");
     weightAndMass["Weight per Unit Volume"] = weightPerUnitVolume;
     weightAndMass["Mass per Unit Volume"] = massPerUnitVolume;
   }
@@ -98,10 +98,10 @@ public class CsiMaterialPropertyExtractor : IMaterialPropertyExtractor
       1 => DirectionalSymmetryType.ORTHOTROPIC,
       2 => DirectionalSymmetryType.ANISOTROPIC,
       3 => DirectionalSymmetryType.UNIAXIAL,
-      _ => throw new ArgumentException($"Unknown symmetry type: {materialDirectionalSymmetryKey}"),
+      _ => throw new ArgumentException($"Unknown symmetry type: {materialDirectionalSymmetryKey}")
     };
 
-    var mechanicalProperties = properties.EnsureNested(SectionPropertyCategory.MECHANICAL_DATA);
+    var mechanicalProperties = properties.EnsureNested("Mechanical Properties");
     mechanicalProperties["Directional Symmetry Type"] = materialDirectionalSymmetryValue.ToString();
 
     GetMechanicalPropertiesByType(materialName, materialDirectionalSymmetryValue, mechanicalProperties);

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiResultsExtractorFactory.cs

@@ -1,29 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
-using Speckle.Converters.CSiShared.Utils;
-
-namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
-
-public class CsiResultsExtractorFactory
-{
-  private readonly IServiceProvider _serviceProvider;
-
-  public CsiResultsExtractorFactory(IServiceProvider serviceProvider)
-  {
-    _serviceProvider = serviceProvider;
-  }
-
-  public IApplicationResultsExtractor GetExtractor(string resultsKey) =>
-    resultsKey switch
-    {
-      ResultsKey.BASE_REACT => _serviceProvider.GetRequiredService<CsiBaseReactResultsExtractor>(),
-      ResultsKey.FRAME_FORCES => _serviceProvider.GetRequiredService<CsiFrameForceResultsExtractor>(),
-      ResultsKey.JOINT_REACT => _serviceProvider.GetRequiredService<CsiJointReactResultsExtractor>(),
-      ResultsKey.MODAL_PERIOD => _serviceProvider.GetRequiredService<CsiModalPeriodExtractor>(),
-      ResultsKey.PIER_FORCES => _serviceProvider.GetRequiredService<CsiPierForceResultsExtractor>(),
-      ResultsKey.SPANDREL_FORCES => _serviceProvider.GetRequiredService<CsiSpandrelForceResultsExtractor>(),
-      ResultsKey.STORY_DRIFTS => _serviceProvider.GetRequiredService<CsiStoryDriftsResultsExtractor>(),
-      ResultsKey.STORY_FORCES => _serviceProvider.GetRequiredService<CsiStoryForceResultsExtractor>(),
-      _ => throw new InvalidOperationException($"{resultsKey} not accounted for in CsiResultsExtractorFactory"),
-    };
-}

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiShellSectionPropertyExtractor.cs

@@ -47,19 +47,20 @@ public class CsiShellSectionPropertyExtractor : IShellSectionPropertyExtractor
     double[] stiffnessModifiersArray = [];
     _settingsStore.Current.SapModel.PropArea.GetModifiers(sectionName, ref stiffnessModifiersArray);
 
-    Dictionary<string, object?> modifiers = new()
-    {
-      ["Membrane f11 Direction"] = stiffnessModifiersArray[0],
-      ["Membrane f22 Direction"] = stiffnessModifiersArray[1],
-      ["Membrane f12 Direction"] = stiffnessModifiersArray[2],
-      ["Bending m11 Direction"] = stiffnessModifiersArray[3],
-      ["Bending m22 Direction"] = stiffnessModifiersArray[3],
-      ["Bending m12 Direction"] = stiffnessModifiersArray[4],
-      ["Shear v13 Direction"] = stiffnessModifiersArray[5],
-      ["Shear v23 Direction"] = stiffnessModifiersArray[6],
-      ["Mass"] = stiffnessModifiersArray[7],
-      ["Weight"] = stiffnessModifiersArray[8],
-    };
+    Dictionary<string, object?> modifiers =
+      new()
+      {
+        ["Membrane f11 Direction"] = stiffnessModifiersArray[0],
+        ["Membrane f22 Direction"] = stiffnessModifiersArray[1],
+        ["Membrane f12 Direction"] = stiffnessModifiersArray[2],
+        ["Bending m11 Direction"] = stiffnessModifiersArray[3],
+        ["Bending m22 Direction"] = stiffnessModifiersArray[3],
+        ["Bending m12 Direction"] = stiffnessModifiersArray[4],
+        ["Shear v13 Direction"] = stiffnessModifiersArray[5],
+        ["Shear v23 Direction"] = stiffnessModifiersArray[6],
+        ["Mass"] = stiffnessModifiersArray[7],
+        ["Weight"] = stiffnessModifiersArray[8]
+      };
 
     var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
     generalData["Modifiers"] = modifiers;

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/IApplicationMaterialPropertyExtractor.cs

@@ -1,13 +0,0 @@
-namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
-
-/// <summary>
-/// Contract for host application specific material property extraction.
-/// </summary>
-/// <remarks>
-/// Mirrors property extraction system pattern by composing with base extractor.
-/// Enables both shared and application-specific property extraction in one call.
-/// </remarks>
-public interface IApplicationMaterialPropertyExtractor
-{
-  void ExtractProperties(string name, Dictionary<string, object?> properties);
-}

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/IMaterialPropertyExtractor.cs

@@ -1,9 +0,0 @@
-namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
-
-/// <summary>
-/// Core contract for material property extraction common across CSi products.
-/// </summary>
-public interface IMaterialPropertyExtractor
-{
-  void ExtractProperties(string name, Dictionary<string, object?> properties);
-}

Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/IMaterialUnpacker.cs

@@ -1,10 +0,0 @@
-using Speckle.Sdk.Models.Proxies;
-
-namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
-
-// NOTE: Interface because Etabs and Sap2000 material unpacking and extraction is different.
-// At ServiceRegistration, we inject the correct implementation of the IMaterialUnpacker
-public interface IMaterialUnpacker
-{
-  IEnumerable<IProxyCollection> UnpackMaterials();
-}

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

@@ -0,0 +1,51 @@
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
+using Speckle.Sdk.Models.Proxies;
+
+namespace Speckle.Connectors.CSiShared.HostApp;
+
+/// <summary>
+/// Creates material proxies based on stored entries from the materials cache
+/// </summary>
+public class MaterialUnpacker
+{
+  private readonly CsiMaterialPropertyExtractor _propertyExtractor;
+  private readonly CsiToSpeckleCacheSingleton _csiToSpeckleCacheSingleton;
+
+  public MaterialUnpacker(
+    CsiMaterialPropertyExtractor propertyExtractor,
+    CsiToSpeckleCacheSingleton csiToSpeckleCacheSingleton
+  )
+  {
+    _propertyExtractor = propertyExtractor;
+    _csiToSpeckleCacheSingleton = csiToSpeckleCacheSingleton;
+  }
+
+  // Creates a list of material proxies from the csi materials cache
+  public IEnumerable<IProxyCollection> UnpackMaterials()
+  {
+    foreach (var kvp in _csiToSpeckleCacheSingleton.MaterialCache)
+    {
+      // get the cached entry
+      string materialName = kvp.Key;
+      List<string> sectionIds = kvp.Value;
+
+      // get the properties of the material
+      Dictionary<string, object?> properties = new(); // create empty dictionary
+      _propertyExtractor.ExtractProperties(materialName, properties); // dictionary mutated with respective properties
+
+      // create the material proxy
+      GroupProxy materialProxy =
+        new()
+        {
+          id = materialName,
+          name = materialName,
+          applicationId = materialName,
+          objects = sectionIds,
+          ["properties"] = properties
+        };
+
+      yield return materialProxy;
+    }
+  }
+}

Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiContinuousTraversalBuilder.cs

@@ -1,210 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Conversion;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.CSiShared.HostApp;
-using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Connectors.CSiShared.Utils;
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Converters.CSiShared.Extensions;
-using Speckle.Converters.CSiShared.Utils;
-using Speckle.Sdk;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Pipelines.Progress;
-using Speckle.Sdk.Pipelines.Send;
-
-namespace Speckle.Connectors.CSiShared.Builders;
-
-/// <summary>
-/// Continuous traversal builder for CSi that streams objects through a <see cref="SendPipeline"/>
-/// for packfile-based uploads. Same conversion logic as <see cref="CsiRootObjectBuilder"/>.
-/// </summary>
-public class CsiContinuousTraversalBuilder : IRootContinuousTraversalBuilder<ICsiWrapper>
-{
-  private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
-  private readonly IConverterSettingsStore<CsiConversionSettings> _converterSettings;
-  private readonly CsiSendCollectionManager _sendCollectionManager;
-  private readonly IMaterialUnpacker _materialUnpacker;
-  private readonly ISectionUnpacker _sectionUnpacker;
-  private readonly ILogger<CsiRootObjectBuilder> _logger;
-  private readonly ISdkActivityFactory _activityFactory;
-  private readonly ICsiApplicationService _csiApplicationService;
-  private readonly AnalysisResultsExtractor _analysisResultsExtractor;
-
-  public CsiContinuousTraversalBuilder(
-    IRootToSpeckleConverter rootToSpeckleConverter,
-    IConverterSettingsStore<CsiConversionSettings> converterSettings,
-    CsiSendCollectionManager sendCollectionManager,
-    IMaterialUnpacker materialUnpacker,
-    ISectionUnpacker sectionUnpacker,
-    ILogger<CsiRootObjectBuilder> logger,
-    ISdkActivityFactory activityFactory,
-    ICsiApplicationService csiApplicationService,
-    AnalysisResultsExtractor analysisResultsExtractor
-  )
-  {
-    _converterSettings = converterSettings;
-    _sendCollectionManager = sendCollectionManager;
-    _materialUnpacker = materialUnpacker;
-    _sectionUnpacker = sectionUnpacker;
-    _rootToSpeckleConverter = rootToSpeckleConverter;
-    _logger = logger;
-    _activityFactory = activityFactory;
-    _csiApplicationService = csiApplicationService;
-    _analysisResultsExtractor = analysisResultsExtractor;
-  }
-
-  public async Task<RootObjectBuilderResult> Build(
-    IReadOnlyList<ICsiWrapper> csiObjects,
-    string projectId,
-    SendPipeline sendPipeline,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    using var activity = _activityFactory.Start("Build");
-
-    string modelFileName = _csiApplicationService.SapModel.GetModelFilename(false) ?? "Unnamed model";
-    (string forceUnit, string tempUnit) = GetForceAndTemperatureUnits();
-
-    Collection rootObjectCollection = new()
-    {
-      name = modelFileName,
-      ["units"] = _converterSettings.Current.SpeckleUnits,
-      ["forceUnits"] = forceUnit,
-      ["temperatureUnits"] = tempUnit,
-    };
-
-    List<SendConversionResult> results = new(csiObjects.Count);
-    int count = 0;
-
-    using (var _ = _activityFactory.Start("Convert all"))
-    {
-      foreach (ICsiWrapper csiObject in csiObjects)
-      {
-        cancellationToken.ThrowIfCancellationRequested();
-        var result = await ConvertCsiObject(csiObject, rootObjectCollection, sendPipeline);
-        results.Add(result);
-
-        count++;
-        onOperationProgressed.Report(
-          new($"Converting objects... ({count:N0} / {csiObjects.Count:N0})", (double)count / csiObjects.Count)
-        );
-        await Task.Yield();
-      }
-    }
-
-    if (results.All(x => x.Status == Status.ERROR))
-    {
-      throw new SpeckleException("Failed to convert all objects");
-    }
-
-    using (var _ = _activityFactory.Start("Process Proxies"))
-    {
-      rootObjectCollection[ProxyKeys.MATERIAL] = _materialUnpacker.UnpackMaterials().ToList();
-      rootObjectCollection[ProxyKeys.SECTION] = _sectionUnpacker.UnpackSections().ToList();
-    }
-
-    // Extract analysis results (if applicable)
-    var objectSelectionSummary = GetObjectSummary(csiObjects);
-    var selectedCasesAndCombinations = _converterSettings.Current.SelectedLoadCasesAndCombinations;
-    var requestedResultTypes = _converterSettings.Current.SelectedResultTypes;
-
-    if (selectedCasesAndCombinations?.Count > 0)
-    {
-      if (requestedResultTypes == null || requestedResultTypes.Count == 0)
-      {
-        throw new SpeckleException(
-          "Adjust publish settings - no result type input for the requested load cases and combinations"
-        );
-      }
-
-      if (!_csiApplicationService.SapModel.GetModelIsLocked())
-      {
-        throw new SpeckleException("Model unlocked, no access to analysis results");
-      }
-
-      try
-      {
-        var analysisResults = _analysisResultsExtractor.ExtractAnalysisResults(
-          selectedCasesAndCombinations,
-          requestedResultTypes,
-          objectSelectionSummary
-        );
-        rootObjectCollection[RootKeys.ANALYSIS_RESULTS] = analysisResults;
-      }
-      catch (Exception ex)
-      {
-        throw new SpeckleException("Analysis result extraction failed", ex);
-      }
-    }
-
-    // Process root collection and wait for all uploads
-    await sendPipeline.Process(rootObjectCollection);
-    await sendPipeline.WaitForUpload();
-
-    return new RootObjectBuilderResult(rootObjectCollection, results);
-  }
-
-  private async Task<SendConversionResult> ConvertCsiObject(
-    ICsiWrapper csiObject,
-    Collection typeCollection,
-    SendPipeline sendPipeline
-  )
-  {
-    string sourceType = csiObject.ObjectName;
-    string applicationId = csiObject switch
-    {
-      CsiJointWrapper jointWrapper => jointWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      CsiFrameWrapper frameWrapper => frameWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      CsiCableWrapper cableWrapper => cableWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      CsiTendonWrapper tendonWrapper => tendonWrapper.ObjectName,
-      CsiShellWrapper shellWrapper => shellWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      CsiSolidWrapper solidWrapper => solidWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      CsiLinkWrapper linkWrapper => linkWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject)),
-    };
-
-    try
-    {
-      Base converted = _rootToSpeckleConverter.Convert(csiObject);
-
-      var collection = _sendCollectionManager.AddObjectCollectionToRoot(converted, typeCollection);
-
-      // NOTE: this is the main part that differentiate from the main root object builder
-      var reference = await sendPipeline.Process(converted).ConfigureAwait(false);
-      collection.elements.Add(reference);
-
-      return new(Status.SUCCESS, applicationId, sourceType, reference);
-    }
-    catch (NotImplementedException ex)
-    {
-      _logger.LogError(ex, "Failed to convert object {sourceType}", sourceType);
-      return new(Status.WARNING, applicationId, sourceType, null, ex);
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      _logger.LogError(ex, "Failed to convert object {sourceType}", sourceType);
-      return new(Status.ERROR, applicationId, sourceType, null, ex);
-    }
-  }
-
-  private Dictionary<ModelObjectType, List<string>> GetObjectSummary(IReadOnlyList<ICsiWrapper> csiObjects) =>
-    csiObjects
-      .GroupBy(csiObject => csiObject.ObjectType)
-      .ToDictionary(group => group.Key, group => group.Select(obj => obj.Name).ToList());
-
-  private (string, string) GetForceAndTemperatureUnits()
-  {
-    var forceUnit = eForce.NotApplicable;
-    var lengthUnit = eLength.NotApplicable;
-    var temperatureUnit = eTemperature.NotApplicable;
-
-    _converterSettings.Current.SapModel.GetDatabaseUnits_2(ref forceUnit, ref lengthUnit, ref temperatureUnit);
-
-    return (forceUnit.ToString(), temperatureUnit.ToString());
-  }
-}

Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs

@@ -4,16 +4,13 @@ using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.CSiShared.HostApp;
 using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Connectors.CSiShared.Utils;
 using Speckle.Converters.Common;
 using Speckle.Converters.CSiShared;
 using Speckle.Converters.CSiShared.Extensions;
-using Speckle.Converters.CSiShared.Utils;
 using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Pipelines.Progress;
 
 namespace Speckle.Connectors.CSiShared.Builders;
 
@@ -35,23 +32,21 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
   private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
   private readonly IConverterSettingsStore<CsiConversionSettings> _converterSettings;
   private readonly CsiSendCollectionManager _sendCollectionManager;
-  private readonly IMaterialUnpacker _materialUnpacker;
+  private readonly MaterialUnpacker _materialUnpacker;
   private readonly ISectionUnpacker _sectionUnpacker;
   private readonly ILogger<CsiRootObjectBuilder> _logger;
   private readonly ISdkActivityFactory _activityFactory;
   private readonly ICsiApplicationService _csiApplicationService;
-  private readonly AnalysisResultsExtractor _analysisResultsExtractor;
 
   public CsiRootObjectBuilder(
     IRootToSpeckleConverter rootToSpeckleConverter,
     IConverterSettingsStore<CsiConversionSettings> converterSettings,
     CsiSendCollectionManager sendCollectionManager,
-    IMaterialUnpacker materialUnpacker,
+    MaterialUnpacker materialUnpacker,
     ISectionUnpacker sectionUnpacker,
     ILogger<CsiRootObjectBuilder> logger,
     ISdkActivityFactory activityFactory,
-    ICsiApplicationService csiApplicationService,
-    AnalysisResultsExtractor analysisResultsExtractor
+    ICsiApplicationService csiApplicationService
   )
   {
     _converterSettings = converterSettings;
@@ -62,7 +57,6 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
     _logger = logger;
     _activityFactory = activityFactory;
     _csiApplicationService = csiApplicationService;
-    _analysisResultsExtractor = analysisResultsExtractor;
   }
 
   /// <summary>
@@ -76,7 +70,7 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
   /// </remarks>
   public async Task<RootObjectBuilderResult> Build(
     IReadOnlyList<ICsiWrapper> csiObjects,
-    string projectId,
+    SendInfo sendInfo,
     IProgress<CardProgress> onOperationProgressed,
     CancellationToken cancellationToken
   )
@@ -84,15 +78,8 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
     using var activity = _activityFactory.Start("Build");
 
     string modelFileName = _csiApplicationService.SapModel.GetModelFilename(false) ?? "Unnamed model";
-    (string forceUnit, string tempUnit) = GetForceAndTemperatureUnits();
-
-    Collection rootObjectCollection = new()
-    {
-      name = modelFileName,
-      ["units"] = _converterSettings.Current.SpeckleUnits,
-      ["forceUnits"] = forceUnit,
-      ["temperatureUnits"] = tempUnit,
-    };
+    Collection rootObjectCollection =
+      new() { name = modelFileName, ["units"] = _converterSettings.Current.SpeckleUnits };
 
     List<SendConversionResult> results = new(csiObjects.Count);
     int count = 0;
@@ -102,6 +89,8 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
       foreach (ICsiWrapper csiObject in csiObjects)
       {
         cancellationToken.ThrowIfCancellationRequested();
+        using var _2 = _activityFactory.Start("Convert");
+
         var result = ConvertCsiObject(csiObject, rootObjectCollection);
         results.Add(result);
 
@@ -113,7 +102,7 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
 
     if (results.All(x => x.Status == Status.ERROR))
     {
-      throw new SpeckleException("Failed to convert all objects");
+      throw new SpeckleException("Failed to convert all objects.");
     }
 
     using (var _ = _activityFactory.Start("Process Proxies"))
@@ -125,42 +114,6 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
       rootObjectCollection[ProxyKeys.SECTION] = _sectionUnpacker.UnpackSections().ToList();
     }
 
-    // Extract analysis results (if applicable)
-    // NOTE: objectSelectionSummary used to extract results for objects being published ONLY
-    // NOTE: etabs is complicated and we can't get specifics from original selection
-    var objectSelectionSummary = GetObjectSummary(csiObjects);
-    var selectedCasesAndCombinations = _converterSettings.Current.SelectedLoadCasesAndCombinations;
-    var requestedResultTypes = _converterSettings.Current.SelectedResultTypes;
-
-    if (selectedCasesAndCombinations?.Count > 0)
-    {
-      if (requestedResultTypes == null || requestedResultTypes.Count == 0)
-      {
-        throw new SpeckleException(
-          "Adjust publish settings - no result type input for the requested load cases and combinations"
-        );
-      }
-
-      if (!_csiApplicationService.SapModel.GetModelIsLocked())
-      {
-        throw new SpeckleException("Model unlocked, no access to analysis results");
-      }
-
-      try
-      {
-        var analysisResults = _analysisResultsExtractor.ExtractAnalysisResults(
-          selectedCasesAndCombinations,
-          requestedResultTypes,
-          objectSelectionSummary
-        );
-        rootObjectCollection[RootKeys.ANALYSIS_RESULTS] = analysisResults;
-      }
-      catch (Exception ex)
-      {
-        throw new SpeckleException("Analysis result extraction failed", ex);
-      }
-    }
-
     return new RootObjectBuilderResult(rootObjectCollection, results);
   }
 
@@ -179,7 +132,7 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
       CsiShellWrapper shellWrapper => shellWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
       CsiSolidWrapper solidWrapper => solidWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
       CsiLinkWrapper linkWrapper => linkWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
-      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject)),
+      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject))
     };
 
     try
@@ -198,47 +151,13 @@ public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
     // NOTE: CsiTendonWrapper - not typically modelled in ETABS, rather SAFE
     catch (NotImplementedException ex)
     {
-      _logger.LogError(ex, "Failed to convert object {sourceType}", sourceType);
+      _logger.LogError(ex, sourceType);
       return new(Status.WARNING, applicationId, sourceType, null, ex);
     }
     catch (Exception ex) when (!ex.IsFatal())
     {
-      _logger.LogError(ex, "Failed to convert object {sourceType}", sourceType);
+      _logger.LogError(ex, sourceType);
       return new(Status.ERROR, applicationId, sourceType, null, ex);
     }
   }
-
-  /// <summary>
-  /// Generates a summary of object types and their associated names from the collection of CSI wrappers.
-  /// </summary>
-  /// <remarks>
-  /// A summary of object names for each object type is needed for getting analysis results of the selected objects only.
-  /// During object conversion, however, we lose the selection (like a clear selection)(presumably because of other api calls).
-  /// This has to be recreated since GetSelection() return type is bound by the interface.
-  /// The LINQ-based implementation is computationally inexpensive as it operates on an already-loaded collection without additional API calls.
-  /// Also, we don't want to rely on user selection remaining active, what if someone re-publishes using model card cache?
-  /// </remarks>
-  private Dictionary<ModelObjectType, List<string>> GetObjectSummary(IReadOnlyList<ICsiWrapper> csiObjects) =>
-    csiObjects
-      .GroupBy(csiObject => csiObject.ObjectType)
-      .ToDictionary(
-        group => group.Key, // ModelObjectType (FRAME, JOINT, etc.)
-        group => group.Select(obj => obj.Name).ToList() // Extract Name from each ICsiWrapper and convert to List<string>
-      );
-
-  /// <summary>
-  /// Instantiates a Base object and pre-populates it with the models defined force units.
-  /// </summary>
-  /// <returns></returns>
-  /// <exception cref="SpeckleException"></exception>
-  private (string, string) GetForceAndTemperatureUnits()
-  {
-    var forceUnit = eForce.NotApplicable;
-    var lengthUnit = eLength.NotApplicable;
-    var temperatureUnit = eTemperature.NotApplicable;
-
-    _converterSettings.Current.SapModel.GetDatabaseUnits_2(ref forceUnit, ref lengthUnit, ref temperatureUnit);
-
-    return (forceUnit.ToString(), temperatureUnit.ToString());
-  }
 }

Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs

@@ -1,73 +0,0 @@
-using Speckle.Connectors.Common.Caching;
-using Speckle.Connectors.DUI.Models.Card;
-using Speckle.InterfaceGenerator;
-using Speckle.Newtonsoft.Json.Linq;
-using Speckle.Sdk.Common;
-
-namespace Speckle.Connectors.CSiShared.Operations.Send.Settings;
-
-[GenerateAutoInterface]
-public class ToSpeckleSettingsManager : IToSpeckleSettingsManager
-{
-  private readonly ISendConversionCache _sendConversionCache;
-  private readonly Dictionary<string, List<string>?> _loadCaseCombinationCache = new();
-  private readonly Dictionary<string, List<string>?> _resultTypeCache = new();
-
-  public ToSpeckleSettingsManager(ISendConversionCache sendConversionCache)
-  {
-    _sendConversionCache = sendConversionCache;
-  }
-
-  public List<string> GetLoadCasesAndCombinations(SenderModelCard modelCard)
-  {
-    var setting = modelCard.Settings?.FirstOrDefault(s => s.Id == "loadCasesAndCombinations");
-    var returnValue = (setting?.Value as JArray)?.Select(x => x.ToString()).ToList() ?? [];
-
-    if (_loadCaseCombinationCache.TryGetValue(modelCard.ModelCardId.NotNull(), out List<string>? previousValue))
-    {
-      if (!AreListsEqual(previousValue, returnValue))
-      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
-    _loadCaseCombinationCache[modelCard.ModelCardId] = returnValue;
-    return returnValue;
-  }
-
-  public List<string> GetResultTypes(SenderModelCard modelCard)
-  {
-    var setting = modelCard.Settings?.FirstOrDefault(s => s.Id == "resultTypes");
-    var returnValue = (setting?.Value as JArray)?.Select(x => x.ToString()).ToList() ?? [];
-
-    if (_resultTypeCache.TryGetValue(modelCard.ModelCardId.NotNull(), out List<string>? previousValue))
-    {
-      if (!AreListsEqual(previousValue, returnValue))
-      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
-    _resultTypeCache[modelCard.ModelCardId] = returnValue;
-    return returnValue;
-  }
-
-  private static bool AreListsEqual(List<string>? list1, List<string>? list2)
-  {
-    if (list1 == null && list2 == null)
-    {
-      return true;
-    }
-
-    if (list1 == null || list2 == null)
-    {
-      return false;
-    }
-
-    return list1.Count == list2.Count && list1.OrderBy(x => x).SequenceEqual(list2.OrderBy(x => x));
-  }
-
-  private void EvictCacheForModelCard(SenderModelCard modelCard)
-  {
-    var objectIds = modelCard.SendFilter != null ? modelCard.SendFilter.NotNull().RefreshObjectIds() : [];
-    _sendConversionCache.EvictObjects(objectIds);
-  }
-}

Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs

@@ -8,8 +8,6 @@ using Speckle.Connectors.CSiShared.Builders;
 using Speckle.Connectors.CSiShared.Filters;
 using Speckle.Connectors.CSiShared.HostApp;
 using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Connectors.CSiShared.Operations.Send.Settings;
-using Speckle.Connectors.CSiShared.Utils;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
@@ -43,22 +41,16 @@ public static class ServiceRegistration
     services.AddScoped<ISendFilter, CsiSharedSelectionFilter>();
     services.AddScoped<CsiSendCollectionManager>();
     services.AddScoped<IRootObjectBuilder<ICsiWrapper>, CsiRootObjectBuilder>();
-    services.AddScoped<IRootContinuousTraversalBuilder<ICsiWrapper>, CsiContinuousTraversalBuilder>();
     services.AddScoped<SendOperation<ICsiWrapper>>();
 
     services.AddScoped<CsiMaterialPropertyExtractor>();
-    services.AddScoped<CsiResultsExtractorFactory>();
-    services.AddScoped<IMaterialPropertyExtractor, CsiMaterialPropertyExtractor>();
+    services.AddScoped<MaterialUnpacker>();
     services.AddScoped<IFrameSectionPropertyExtractor, CsiFrameSectionPropertyExtractor>();
     services.AddScoped<IShellSectionPropertyExtractor, CsiShellSectionPropertyExtractor>();
-    services.AddScoped<AnalysisResultsExtractor>();
 
     // add converter caches
     services.AddScoped<CsiToSpeckleCacheSingleton>();
 
-    // add settings manager
-    services.AddScoped<ToSpeckleSettingsManager>();
-
     return services;
   }
 }

Connectors/CSi/Speckle.Connectors.CSiShared/Settings/LoadCaseCombinationSetting.cs

@@ -1,13 +0,0 @@
-using Speckle.Connectors.CSiShared.Utils;
-using Speckle.Connectors.DUI.Settings;
-
-namespace Speckle.Connectors.CSiShared.Settings;
-
-public class LoadCaseCombinationSetting(List<string> values, cSapModel sapModel) : ICardSetting
-{
-  public string? Id { get; set; } = "loadCasesAndCombinations";
-  public string? Title { get; set; } = "Load Cases & Combinations";
-  public string? Type { get; set; } = "array";
-  public object? Value { get; set; } = values;
-  public List<string>? Enum { get; set; } = LoadCaseHelper.GetLoadCasesAndCombinations(sapModel);
-}

Connectors/CSi/Speckle.Connectors.CSiShared/Settings/ResultTypeSetting.cs

@@ -1,13 +0,0 @@
-using Speckle.Connectors.DUI.Settings;
-using Speckle.Converters.CSiShared.Utils;
-
-namespace Speckle.Connectors.CSiShared.Settings;
-
-public class ResultTypeSetting(List<string> values) : ICardSetting
-{
-  public string? Id { get; set; } = "resultTypes";
-  public string? Title { get; set; } = "Result Type";
-  public string? Type { get; set; } = "array";
-  public object? Value { get; set; } = values;
-  public List<string>? Enum { get; set; } = ResultsKey.All.OrderBy(x => x).ToList();
-}

Connectors/CSi/Speckle.Connectors.CSiShared/Speckle.Connectors.CSiShared.projitems

@@ -18,10 +18,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedSelectionBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedSendBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Filters\CsiSharedSelectionFilter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\CsiResultsExtractorFactory.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\IApplicationMaterialPropertyExtractor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\IMaterialPropertyExtractor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\IMaterialUnpacker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\MaterialUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiSendCollectionManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\CsiFrameSectionPropertyExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\CsiMaterialPropertyExtractor.cs" />
@@ -29,19 +26,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\IApplicationSectionPropertyExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\ISectionPropertyExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\ISectionUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\CsiContinuousTraversalBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\CsiRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\CsiPluginBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\SpeckleFormBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)GlobalUsing.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiApplicationService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiDocumentModelStore.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ServiceRegistration.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Settings\LoadCaseCombinationSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Settings\ResultTypeSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\LoadCaseHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\AnalysisResultsExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utils\ObjectIdentifiers.cs" />
   </ItemGroup>
   <ItemGroup>

Connectors/CSi/Speckle.Connectors.CSiShared/Utils/AnalysisResultsExtractor.cs

@@ -1,154 +0,0 @@
-using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Converters.CSiShared.Utils;
-using Speckle.Sdk;
-using Speckle.Sdk.Models;
-
-namespace Speckle.Connectors.CSiShared.Utils;
-
-public class AnalysisResultsExtractor
-{
-  private readonly IConverterSettingsStore<CsiConversionSettings> _converterSettingsStore;
-  private readonly CsiResultsExtractorFactory _resultsExtractorFactory;
-
-  public AnalysisResultsExtractor(
-    IConverterSettingsStore<CsiConversionSettings> converterSettingsStore,
-    CsiResultsExtractorFactory resultsExtractorFactory
-  )
-  {
-    _converterSettingsStore = converterSettingsStore;
-    _resultsExtractorFactory = resultsExtractorFactory;
-  }
-
-  /// <summary>
-  /// Extracts complete analysis results including units retrieval, load case configuration, and results extraction.
-  /// Assumes inputs have been validated by caller.
-  /// </summary>
-  public Base ExtractAnalysisResults(
-    List<string> selectedCasesAndCombinations,
-    List<string> requestedResultTypes,
-    Dictionary<ModelObjectType, List<string>> objectSelectionSummary
-  )
-  {
-    // Step 1: create base object that will hold analysis results
-    var analysisResults = new Base();
-
-    // Step 2: configure and validate load cases
-    ConfigureAndValidateSelectedLoadCases(selectedCasesAndCombinations);
-
-    // Step 3: extract results using clean factory pattern
-    ExtractResults(requestedResultTypes, objectSelectionSummary, analysisResults);
-
-    return analysisResults;
-  }
-
-  private void ExtractResults(
-    List<string> requestedResultTypes,
-    Dictionary<ModelObjectType, List<string>> objectSelectionSummary,
-    Base analysisResults
-  )
-  {
-    foreach (var resultType in requestedResultTypes)
-    {
-      var extractor = _resultsExtractorFactory.GetExtractor(resultType);
-      objectSelectionSummary.TryGetValue(extractor.TargetObjectType, out var objectNames);
-      analysisResults[extractor.ResultsKey] = extractor.GetResults(objectNames);
-    }
-  }
-
-  /// <summary>
-  /// Responsible for two things. Firstly, we need to setup the results so that only the requested cases and combinations
-  /// are published. Secondly, we need to ensure that the requested cases and combinations are actually run.
-  /// </summary>
-  private void ConfigureAndValidateSelectedLoadCases(List<string> selectedLoadCases)
-  {
-    // step 1: configure load cases for output
-    ConfigureSelectedLoadCases(selectedLoadCases);
-
-    // step 2: validate they are complete (throws on failure)
-    ValidateSelectedCasesAreComplete(selectedLoadCases);
-  }
-
-  private void ConfigureSelectedLoadCases(List<string> selectedLoadCases)
-  {
-    // deselect all load cases and combos
-    _converterSettingsStore.Current.SapModel.Results.Setup.DeselectAllCasesAndCombosForOutput();
-
-    // ui presents cases and combinations as a flat list. we need to distinguish if the string is a case or combo
-    // do this by seeing if the string is within the list of defined cases
-    // typically defined load cases << defined load combinations, so this approach should be more efficient
-    int numberOfLoadCases = 0;
-    string[] loadCaseNames = [];
-    _converterSettingsStore.Current.SapModel.LoadCases.GetNameList(ref numberOfLoadCases, ref loadCaseNames);
-
-    // set user selected combos to true (i.e. to export)
-    foreach (var selectedLoadCase in selectedLoadCases)
-    {
-      int success = loadCaseNames.Contains(selectedLoadCase)
-        ? _converterSettingsStore.Current.SapModel.Results.Setup.SetCaseSelectedForOutput(selectedLoadCase)
-        : _converterSettingsStore.Current.SapModel.Results.Setup.SetComboSelectedForOutput(selectedLoadCase);
-
-      // ui should only present valid options
-      // `AnalysisResultsExtractor` only fetches load cases and load combinations (not patterns), so this should never throw
-      if (success != 0)
-      {
-        throw new InvalidOperationException($"Failed to set {selectedLoadCase} for output.");
-      }
-    }
-  }
-
-  private void ValidateSelectedCasesAreComplete(List<string> selectedCasesAndCombinations)
-  {
-    // get status for all load cases (combinations not included in this API call)
-    int numberItems = 0;
-    string[] caseNames = [];
-    int[] statuses = [];
-
-    int result = _converterSettingsStore.Current.SapModel.Analyze.GetCaseStatus(
-      ref numberItems,
-      ref caseNames,
-      ref statuses
-    );
-
-    if (result != 0)
-    {
-      throw new SpeckleException("Failed to retrieve load case status from model.");
-    }
-
-    // build lookup dictionary for load cases only
-    var caseStatusLookup = caseNames
-      .Zip(statuses, (name, status) => new { name, status })
-      .ToDictionary(x => x.name, x => x.status);
-
-    // separate selected items into cases and combinations
-    var selectedCases = selectedCasesAndCombinations.Where(item => caseStatusLookup.ContainsKey(item)).ToList();
-    var selectedCombinations = selectedCasesAndCombinations.Except(selectedCases).ToList();
-
-    // validate load cases status
-    var notFinishedCases = new List<string>();
-    foreach (var caseName in selectedCases)
-    {
-      int status = caseStatusLookup[caseName];
-      if (status != 4) // 1 = Not run, 2 = Could not start, 3 = Not finished, 4 = Finished
-      {
-        notFinishedCases.Add($"{caseName}");
-      }
-    }
-
-    // TODO: Validate load combinations status
-    // for now, assume combinations are valid if we can't validate them
-    if (selectedCombinations.Count != 0)
-    {
-      // combinations validation not implemented - assuming they're valid for now
-      // it'll get complicated, we can't get the status of a combination, so we need to check the constituent cases
-    }
-
-    if (notFinishedCases.Count != 0)
-    {
-      string errorMessage =
-        $"Analysis not complete for load cases: {string.Join(", ", notFinishedCases)}. Run analysis first.";
-      throw new SpeckleException(errorMessage);
-    }
-  }
-}

Connectors/CSi/Speckle.Connectors.CSiShared/Utils/LoadCaseHelper.cs

@@ -1,56 +0,0 @@
-namespace Speckle.Connectors.CSiShared.Utils;
-
-public static class LoadCaseHelper
-{
-  public static List<string> GetLoadCasesAndCombinations(cSapModel sapModel)
-  {
-    var loadCasesAndCombos = new List<string>();
-
-    try
-    {
-      // Check if model is loaded to prevent crashes
-      var modelFilename = sapModel.GetModelFilename();
-      if (string.IsNullOrEmpty(modelFilename))
-      {
-        return loadCasesAndCombos; // Return empty list if no model
-      }
-
-      // Get Load Cases
-      int numberItems = 0;
-      string[]? names = null;
-
-      int ret = sapModel.LoadCases.GetNameList(ref numberItems, ref names);
-      if (ret == 0 && names != null)
-      {
-        for (int i = 0; i < numberItems; i++)
-        {
-          loadCasesAndCombos.Add(names[i]);
-        }
-      }
-
-      // Get Load Combinations
-      numberItems = 0;
-      names = null;
-      ret = sapModel.RespCombo.GetNameList(ref numberItems, ref names);
-      if (ret == 0 && names != null)
-      {
-        for (int i = 0; i < numberItems; i++)
-        {
-          loadCasesAndCombos.Add(names[i]);
-        }
-      }
-    }
-    catch (System.Runtime.InteropServices.COMException)
-    {
-      // Return empty list on COM errors to prevent crashes
-      return new List<string>();
-    }
-    catch (System.InvalidOperationException)
-    {
-      // Return empty list on invalid operations to prevent crashes
-      return new List<string>();
-    }
-
-    return loadCasesAndCombos.Distinct().OrderBy(x => x).ToList();
-  }
-}

Connectors/CSi/Speckle.Connectors.ETABS21/Speckle.Connectors.ETABS21.csproj

@@ -1,35 +1,33 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
-    <Platforms>AnyCPU</Platforms>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <ETABSVersion>21</ETABSVersion>
-    <DefineConstants>$(DefineConstants);ETABS21</DefineConstants>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS21\Speckle.Converters.ETABS21.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
-  </ItemGroup>
+    <PropertyGroup>
+      <TargetFramework>net48</TargetFramework>
+      <Platforms>AnyCPU</Platforms>
+      <UseWindowsForms>true</UseWindowsForms>
+      <UseWPF>true</UseWPF>
+      <ETABSVersion>21</ETABSVersion>
+      <DefineConstants>$(DefineConstants);ETABS21</DefineConstants>
+      <EnableDynamicLoading>true</EnableDynamicLoading>
+      <Configurations>Debug;Release;Local</Configurations>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference
-      Include="Speckle.CSI.API"
-      PrivateAssets="all"
-      IncludeAssets="compile; build"
-      VersionOverride="1.30.0"
-    />
-  </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS21\Speckle.Converters.ETABS21.csproj" />
+      <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
+      <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
 
-  <ItemGroup>
-    <Compile Update="Plugin\SpeckleForm.cs" />
-  </ItemGroup>
+    </ItemGroup>
 
-  <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
+    <ItemGroup>
+      <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" VersionOverride="1.30.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Compile Update="Plugin\SpeckleForm.cs" />
+    </ItemGroup>
+
+    <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
+
+    <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
 
-  <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
 </Project>

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

@@ -73,8 +73,8 @@
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
-        "resolved": "9.0.4",
-        "contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
         "dependencies": {
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
@@ -169,29 +169,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w==",
-        "dependencies": {
-          "Microsoft.Bcl.AsyncInterfaces": "9.0.4"
-        }
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -282,8 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -307,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "speckle.converters.etabs21": {
@@ -357,12 +335,35 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

Connectors/CSi/Speckle.Connectors.ETABS22/Speckle.Connectors.ETABS22.csproj

@@ -1,30 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Platforms>AnyCPU</Platforms>
-    <UseWindowsForms>true</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <ETABSVersion>22</ETABSVersion>
-    <DefineConstants>$(DefineConstants);ETABS22;ETABS22_OR_GREATER</DefineConstants>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    <Configurations>Debug;Release;Local</Configurations>
-  </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS22\Speckle.Converters.ETABS22.csproj" />
-    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
-  </ItemGroup>
+    <PropertyGroup>
+      <TargetFramework>net8.0-windows</TargetFramework>
+      <Platforms>AnyCPU</Platforms>
+      <UseWindowsForms>true</UseWindowsForms>
+      <UseWPF>true</UseWPF>
+      <ETABSVersion>22</ETABSVersion>
+      <DefineConstants>$(DefineConstants);ETABS22;ETABS22_OR_GREATER</DefineConstants>
+      <EnableDynamicLoading>true</EnableDynamicLoading>
+      <Configurations>Debug;Release;Local</Configurations>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" />
-  </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\..\..\Converters\CSi\Speckle.Converters.ETABS22\Speckle.Converters.ETABS22.csproj" />
+      <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
+      <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="Plugin\SpeckleForm.cs" />
-  </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="Speckle.CSI.API" PrivateAssets="all" IncludeAssets="compile; build" />
+    </ItemGroup>
 
-  <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
+    <ItemGroup>
+      <Compile Update="Plugin\SpeckleForm.cs" />
+    </ItemGroup>
+
+    <Import Project="..\Speckle.Connectors.CSiShared\Speckle.Connectors.CSiShared.projitems" Label="Shared" />
+
+    <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
 
-  <Import Project="..\Speckle.Connectors.ETABSShared\Speckle.Connectors.ETABSShared.projitems" Label="Shared" />
 </Project>

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

@@ -155,25 +155,6 @@
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
-      "Speckle.Sdk": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "6gmPoWTv7DwqvUae57wCLF93upE9RIjaCZFue9UMY4I6FB8vLbMGfcyiUwnUY551WlGOual15ISS3G15/kMmnw==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.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.15.3"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "Transitive",
-        "resolved": "3.15.3",
-        "contentHash": "VLgyGi1kQNWe0fzRO0U3qnZZUQGDeFacnpn25Yy3esE0qeo4tqa1BrvXPv2ivEZbbhBkkg6+Gd+CztDIyw3Y/w=="
-      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -229,8 +210,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Converters.Common": "[1.0.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )",
+          "Speckle.Sdk": "[3.4.3, )",
+          "Speckle.Sdk.Dependencies": "[3.4.3, )"
         }
       },
       "speckle.connectors.dui": {
@@ -254,7 +236,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.15.3, )"
+          "Speckle.Objects": "[3.4.3, )"
         }
       },
       "speckle.converters.etabs22": {
@@ -304,12 +286,33 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.15.3, )",
-        "resolved": "3.15.3",
-        "contentHash": "zmHnLKR46in0xH5ashD+ENlYUPDktUMZhXYYOb8aWHAG3Zxai2WvmDJtdf7pV9GTafkpR6fCo2EQTeCoY+XXxQ==",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "08BOhVaYUvFP8CgY5fGZJWvswIRsH2EbOBGguJnanx+RZqKYI9XJroGGew+CDfPU1c8ZWl37WX2bbdPhdSP2rQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.15.3"
+          "Speckle.Sdk": "3.4.3"
         }
+      },
+      "Speckle.Sdk": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "21Dg8kMOqUbV7jyhK7N+UwyO7S1++COMR5jU9mm/vx86pkj6pTAifNZMHmuG8/ZnwpBcUCmE4AzvW24mKlgEkg==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.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.4.3"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "CentralTransitive",
+        "requested": "[3.4.3, )",
+        "resolved": "3.4.3",
+        "contentHash": "PyJAt9WAeVLUfxp/l1ZvGw20HAsvfBY/JgZCJmY5doc8lFa/9dhUMBJN/cNsVM5XJK+xdIBoEemgl3SMFwXNcg=="
       }
     }
   }

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsMaterialUnpacker.cs

@@ -1,49 +0,0 @@
-using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
-using Speckle.Sdk.Models.Proxies;
-
-namespace Speckle.Connectors.ETABSShared.HostApp;
-
-public class EtabsMaterialUnpacker : IMaterialUnpacker
-{
-  private readonly CsiToSpeckleCacheSingleton _csiToSpeckleCacheSingleton;
-  private readonly IMaterialPropertyExtractor _csiMaterialPropertyExtractor;
-  private readonly IApplicationMaterialPropertyExtractor _etabsMaterialPropertyExtractor;
-
-  public EtabsMaterialUnpacker(
-    CsiToSpeckleCacheSingleton csiToSpeckleCacheSingleton,
-    IMaterialPropertyExtractor csiMaterialPropertyExtractor,
-    IApplicationMaterialPropertyExtractor etabsMaterialPropertyExtractor
-  )
-  {
-    _csiToSpeckleCacheSingleton = csiToSpeckleCacheSingleton;
-    _csiMaterialPropertyExtractor = csiMaterialPropertyExtractor;
-    _etabsMaterialPropertyExtractor = etabsMaterialPropertyExtractor;
-  }
-
-  public IEnumerable<IProxyCollection> UnpackMaterials()
-  {
-    foreach (var kvp in _csiToSpeckleCacheSingleton.MaterialCache)
-    {
-      string name = kvp.Key;
-      var sectionIds = kvp.Value;
-
-      // get the properties of the material
-      Dictionary<string, object?> properties = [];
-      _csiMaterialPropertyExtractor.ExtractProperties(name, properties);
-      _etabsMaterialPropertyExtractor.ExtractProperties(name, properties);
-
-      // create the material proxy
-      GroupProxy materialProxy = new()
-      {
-        id = name,
-        name = name,
-        applicationId = name,
-        objects = sectionIds,
-        ["properties"] = properties,
-      };
-
-      yield return materialProxy;
-    }
-  }
-}

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSectionUnpacker.cs

@@ -47,26 +47,28 @@ public class EtabsSectionUnpacker : ISectionUnpacker
       string sectionName = entry.Key;
       List<string> frameIds = entry.Value;
 
-      // initialize properties
-      Dictionary<string, object?> properties = [];
+      // Initialize properties outside the if statement
+      Dictionary<string, object?> properties = new Dictionary<string, object?>();
 
-      // Extract properties if valid section name
-      // "None" is weird but api returns that string if an opening, null element etc.
-      if (sectionName != "None" && !string.IsNullOrEmpty(sectionName))
+      // get the properties of the section
+      // openings will have objects assigned to them, but won't have properties
+      // sectionName is initialized with string.Empty, but api ref returns string "None"
+      if (sectionName != "None")
       {
         properties = _propertyExtractor.ExtractFrameSectionProperties(sectionName);
       }
 
-      // create section proxy
-      GroupProxy sectionProxy = new()
-      {
-        id = sectionName,
-        name = sectionName,
-        applicationId = sectionName,
-        objects = frameIds,
-        ["type"] = "Frame Section",
-        ["properties"] = properties,
-      };
+      // create the section proxy
+      GroupProxy sectionProxy =
+        new()
+        {
+          id = sectionName,
+          name = sectionName,
+          applicationId = sectionName,
+          objects = frameIds,
+          ["type"] = "Frame Section", // since sectionProxies are a flat list, need some way to distinguish from shell
+          ["properties"] = properties // openings will just have an empty dict here
+        };
 
       yield return sectionProxy;
     }
@@ -79,8 +81,8 @@ public class EtabsSectionUnpacker : ISectionUnpacker
       string sectionName = entry.Key;
       List<string> frameIds = entry.Value;
 
-      // initialize properties outside the if statement
-      Dictionary<string, object?> properties = [];
+      // Initialize properties outside the if statement
+      Dictionary<string, object?> properties = new Dictionary<string, object?>();
 
       // get the properties of the section
       // openings will have objects assigned to them, but won't have properties
@@ -90,16 +92,17 @@ public class EtabsSectionUnpacker : ISectionUnpacker
         properties = _propertyExtractor.ExtractShellSectionProperties(sectionName);
       }
 
-      // create section proxy
-      GroupProxy sectionProxy = new()
-      {
-        id = sectionName,
-        name = sectionName,
-        applicationId = sectionName,
-        objects = frameIds,
-        ["type"] = "Shell Section", // since sectionProxies are a flat list, need some way to distinguish from frame
-        ["properties"] = properties, // openings will just have an empty dict here
-      };
+      // create the section proxy
+      GroupProxy sectionProxy =
+        new()
+        {
+          id = sectionName,
+          name = sectionName,
+          applicationId = sectionName,
+          objects = frameIds,
+          ["type"] = "Shell Section", // since sectionProxies are a flat list, need some way to distinguish from frame
+          ["properties"] = properties // openings will just have an empty dict here
+        };
 
       yield return sectionProxy;
     }

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSendCollectionManager.cs

@@ -15,17 +15,18 @@ public class EtabsSendCollectionManager : CsiSendCollectionManager
 {
   private const string DEFAULT_LEVEL = "Unassigned";
 
-  private readonly Dictionary<ElementCategory, string> _categoryNames = new()
-  {
-    { ElementCategory.COLUMN, "Columns" },
-    { ElementCategory.BEAM, "Beams" },
-    { ElementCategory.BRACE, "Braces" },
-    { ElementCategory.WALL, "Walls" },
-    { ElementCategory.FLOOR, "Floors" },
-    { ElementCategory.RAMP, "Ramps" },
-    { ElementCategory.JOINT, "Joints" },
-    { ElementCategory.OTHER, "Other" },
-  };
+  private readonly Dictionary<ElementCategory, string> _categoryNames =
+    new()
+    {
+      { ElementCategory.COLUMN, "Columns" },
+      { ElementCategory.BEAM, "Beams" },
+      { ElementCategory.BRACE, "Braces" },
+      { ElementCategory.WALL, "Walls" },
+      { ElementCategory.FLOOR, "Floors" },
+      { ElementCategory.RAMP, "Ramps" },
+      { ElementCategory.JOINT, "Joints" },
+      { ElementCategory.OTHER, "Other" }
+    };
 
   public EtabsSendCollectionManager(IConverterSettingsStore<CsiConversionSettings> converterSettings)
     : base(converterSettings) { }
@@ -107,7 +108,7 @@ public class EtabsSendCollectionManager : CsiSendCollectionManager
       ("Wall", nameof(ModelObjectType.SHELL)) => ElementCategory.WALL,
       ("Floor", nameof(ModelObjectType.SHELL)) => ElementCategory.FLOOR,
       ("Ramp", nameof(ModelObjectType.SHELL)) => ElementCategory.RAMP,
-      _ => ElementCategory.OTHER,
+      _ => ElementCategory.OTHER
     };
   }
 

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsFrameSectionPropertyExtractor.cs

@@ -1,5 +1,4 @@
 using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Connectors.ETABSShared.HostApp.Services;
 using Speckle.Converters.Common;
 using Speckle.Converters.CSiShared;
 using Speckle.Converters.CSiShared.Utils;
@@ -9,96 +8,69 @@ namespace Speckle.Connectors.ETABSShared.HostApp.Helpers;
 /// <summary>
 /// Extracts ETABS-specific frame section properties.
 /// </summary>
-/// <remarks>
-/// The bulk loading strategy is necessary here because we can't know which database table contains which section
-/// beforehand - there are multiple tables like "Frame Section Property Definitions - Steel",
-/// "Frame Section Property Definitions - Concrete", etc.
-/// </remarks>
 public class EtabsFrameSectionPropertyExtractor : IApplicationFrameSectionPropertyExtractor
 {
   private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
-  private readonly EtabsSectionPropertyDefinitionService _definitionService;
 
-  public EtabsFrameSectionPropertyExtractor(
-    IConverterSettingsStore<CsiConversionSettings> settingsStore,
-    EtabsSectionPropertyDefinitionService definitionService
-  )
+  public EtabsFrameSectionPropertyExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
   {
     _settingsStore = settingsStore;
-    _definitionService = definitionService;
   }
 
   /// <summary>
-  /// Gets frame section properties from preloaded database table data
+  /// Gets generalised frame section properties
   /// </summary>
   /// <remarks>
-  /// Property categorization is done heuristically - order matters in the parsing logic.
+  /// Sap2000 doesn't support this method, unfortunately
+  /// Alternative is to account for extraction according to section type - we're talking over 40 section types!
+  /// This way, we get basic information with minimal computational costs.
   /// </remarks>
   public void ExtractProperties(string sectionName, Dictionary<string, object?> properties)
   {
-    // get frame definitions from the service (which uses database table extraction)
-    // this is a fast dictionary lookup since all data is preloaded
-    if (!_definitionService.FrameDefinitions.TryGetValue(sectionName, out var rawDatabaseTableProperties))
+    // Get all frame properties
+    int numberOfNames = 0;
+    string[] names = [];
+    eFramePropType[] propTypes = [];
+    double[] t3 = [],
+      t2 = [],
+      tf = [],
+      tw = [],
+      t2b = [],
+      tfb = [],
+      area = [];
+
+    _settingsStore.Current.SapModel.PropFrame.GetAllFrameProperties_2(
+      ref numberOfNames,
+      ref names,
+      ref propTypes,
+      ref t3,
+      ref t2,
+      ref tf,
+      ref tw,
+      ref t2b,
+      ref tfb,
+      ref area
+    );
+
+    // Find the index of the current section
+    int sectionIndex = Array.IndexOf(names, sectionName);
+
+    if (sectionIndex != -1)
     {
-      return; // no definitions found for this section
-    }
+      // General Data
+      var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+      generalData["Section Shape"] = propTypes[sectionIndex].ToString();
 
-    // define table keys that we don't want to include in the section proxy properties
-    var keysToExclude = new HashSet<string>
-    {
-      "GUID",
-      "Name",
-      "Color",
-      "Notes",
-      "FileName",
-      "FromFile",
-      "SectInFile",
-      "NotAutoFact",
-    };
-
-    // get the section type / shape using the dedicated api query (exception to the database approach)
-    // this specific property isn't available in the database table extraction
-    eFramePropType framePropType = 0;
-    _settingsStore.Current.SapModel.PropFrame.GetTypeOAPI(sectionName, ref framePropType);
-    Dictionary<string, object?> generalProperties = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
-    generalProperties.Add("Section Shape", framePropType.ToString());
-
-    // heuristic property categorization based on key patterns and parse-ability
-    // NOTE: this is gross and quite dangerous 🤨 but beats specific frame prop sect. property extractions imo
-    // order matters here! we check for known string props first, then modifiers, then assume doubles are dimensions
-    foreach (KeyValuePair<string, string> rawDatabaseTableProperty in rawDatabaseTableProperties)
-    {
-      string key = rawDatabaseTableProperty.Key;
-      string value = rawDatabaseTableProperty.Value;
-
-      // skip metadata fields we don't care about
-      if (!keysToExclude.Contains(key))
-      {
-        // material is always a string, grab it first
-        if (key == "Material")
-        {
-          generalProperties.Add(key, value);
-        }
-        // modifier properties end with "Mod" and should be numeric
-        else if (key.EndsWith("Mod") && double.TryParse(value, out double parsedModValue))
-        {
-          Dictionary<string, object?> modificationProperties = properties.EnsureNested(
-            SectionPropertyCategory.MODIFIERS
-          );
-          modificationProperties.Add(key, parsedModValue);
-        }
-        // anything else that parses as a double is assumed to be a section dimension
-        // this covers things like t3, t2, tf, tw, area, etc. without having to enumerate them all
-        else if (double.TryParse(value, out double parsedDimensionValue))
-        {
-          Dictionary<string, object?> sectionDimensions = properties.EnsureNested(
-            SectionPropertyCategory.SECTION_DIMENSIONS
-          );
-          sectionDimensions.Add(key, parsedDimensionValue);
-        }
-        // if it doesn't parse as double and isn't a known string property, we skip it
-        // this is acceptable - we'd rather miss some edge case properties than crash
-      }
+      // Section Dimensions
+      string unit = _settingsStore.Current.SpeckleUnits;
+      var sectionDimensions = properties.EnsureNested(SectionPropertyCategory.SECTION_DIMENSIONS);
+      sectionDimensions.AddWithUnits("t3", t3[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("t2", t2[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("tf", tf[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("tw", tw[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("t2b", t2b[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("tfb", tfb[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("Area", area[sectionIndex], $"{unit}²");
     }
   }
 }

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsMaterialPropertyExtractor.cs

@@ -1,217 +0,0 @@
-using Speckle.Connectors.CSiShared.HostApp.Helpers;
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Converters.CSiShared.Utils;
-
-namespace Speckle.Connectors.ETABS22.HostApp.Helpers;
-
-public class EtabsMaterialPropertyExtractor : IApplicationMaterialPropertyExtractor
-{
-  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
-
-  private readonly Dictionary<int, string?> _ssTypeDict = new()
-  {
-    { 0, "User defined" },
-    { 1, "Parametric - Simple" },
-    { 2, "Parametric - Mander" },
-  };
-
-  private readonly Dictionary<int, string?> _ssHysTypeDict = new()
-  {
-    { 0, "Elastic" },
-    { 1, "Kinematic" },
-    { 2, "Takeda" },
-    { 3, "Pivot" },
-    { 4, "Concrete" },
-    { 5, "BRB Hardening" },
-    { 6, "Degrading" },
-    { 7, "Isotropic" },
-  };
-
-  private const int TEMP = 0;
-
-  public EtabsMaterialPropertyExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
-  {
-    _settingsStore = settingsStore;
-  }
-
-  public void ExtractProperties(string name, Dictionary<string, object?> properties)
-  {
-    // we want to get some of the "other" material property data that is type specific
-    // csi extractor populates "type" string, but api query arguably simpler and more reliable than dict string access
-    int symType = 0;
-    eMatType matType = 0;
-    _settingsStore.Current.SapModel.PropMaterial.GetTypeOAPI(name, ref matType, ref symType);
-
-    // we don't have design data api queries for these, so early return to avoid creating that specific dictionary
-    if (matType is eMatType.NoDesign or eMatType.Aluminum or eMatType.ColdFormed or eMatType.Masonry)
-    {
-      return;
-    }
-
-    // ensure design data specific properties dictionary that will be mutated in switch expression
-    var designData = properties.EnsureNested(SectionPropertyCategory.DESIGN_DATA);
-
-    // can't do a switch expression here because not all enums have an api query (e.g. masonry, aluminium)
-    switch (matType)
-    {
-      case eMatType.Steel:
-        ExtractSteelProperties(name, designData);
-        break;
-      case eMatType.Concrete:
-        ExtractConcreteProperties(name, designData);
-        break;
-      case eMatType.Rebar:
-        ExtractRebarProperties(name, designData);
-        break;
-      case eMatType.Tendon:
-        ExtractTendonProperties(name, designData);
-        break;
-    }
-  }
-
-  private void ExtractSteelProperties(string name, Dictionary<string, object?> designData)
-  {
-    // step 1: stubs for api query
-    int ssType = 0,
-      ssHysType = 0;
-    double fy = 0,
-      fu = 0,
-      eFy = 0,
-      eFu = 0,
-      strainAtHardening = 0,
-      strainAtMaxStress = 0,
-      strainAtRupture = 0;
-
-    // step 2: api query
-    // NOTE: using the "older" method. Not sure if _1 is unsupported in etabs 21
-    // also, _1 doesn't give a lot more MEANINGFUL data
-    _settingsStore.Current.SapModel.PropMaterial.GetOSteel(
-      name,
-      ref fy,
-      ref fu,
-      ref eFy,
-      ref eFu,
-      ref ssType,
-      ref ssHysType,
-      ref strainAtHardening,
-      ref strainAtMaxStress,
-      ref strainAtRupture
-    );
-
-    // step 3: mutate properties dictionary
-    designData["Fy"] = fy;
-    designData["Fu"] = fu;
-    designData["EFy"] = eFy;
-    designData["EFu"] = eFu;
-    designData["SSType"] = _ssTypeDict.TryGetValue(ssType, out string? ssTypeValue) ? ssTypeValue : "";
-    designData["SSHysType"] = _ssHysTypeDict.TryGetValue(ssHysType, out string? ssHysTypeValue) ? ssHysTypeValue : "";
-    designData["StrainAtHardening"] = strainAtHardening;
-    designData["StrainAtMaxStress"] = strainAtMaxStress;
-    designData["StrainAtRupture"] = strainAtRupture;
-    designData["Temp"] = TEMP;
-  }
-
-  private void ExtractConcreteProperties(string name, Dictionary<string, object?> designData)
-  {
-    // step 1: stubs for api query
-    int ssType = 0,
-      ssHysType = 0;
-    bool isLightweight = false;
-    double fc = 0,
-      fcsFactor = 0,
-      strainAtFc = 0,
-      strainUltimate = 0,
-      frictionAngle = 0,
-      dilatationalAngle = 0;
-
-    // step 2: api query
-    // NOTE: using the "older" method. Not sure if _1 or _2 are unsupported in etabs 21
-    // also, _1 or _2 doesn't give a lot more MEANINGFUL data
-    _settingsStore.Current.SapModel.PropMaterial.GetOConcrete(
-      name,
-      ref fc,
-      ref isLightweight,
-      ref fcsFactor,
-      ref ssType,
-      ref ssHysType,
-      ref strainAtFc,
-      ref strainUltimate,
-      ref frictionAngle,
-      ref dilatationalAngle
-    );
-
-    // step 3: mutate properties dictionary
-    designData["Fc"] = fc;
-    designData["FcsFactor"] = fcsFactor;
-    designData["StrainAtFc"] = strainAtFc;
-    designData["StrainUltimate"] = strainUltimate;
-    designData["FrictionAngle"] = frictionAngle;
-    designData["DilatationalAngle"] = dilatationalAngle;
-    designData["IsLightweight"] = isLightweight.ToString();
-    designData["SSType"] = _ssTypeDict.TryGetValue(ssType, out string? ssTypeValue) ? ssTypeValue : "";
-    designData["SSHysType"] = _ssHysTypeDict.TryGetValue(ssHysType, out string? ssHysTypeValue) ? ssHysTypeValue : "";
-    designData["Temp"] = TEMP;
-  }
-
-  private void ExtractRebarProperties(string name, Dictionary<string, object?> designData)
-  {
-    // step 1: stubs for api query
-    bool useCaltransSsDefaults = false;
-    int ssType = 0,
-      ssHysType = 0;
-    double fy = 0,
-      fu = 0,
-      eFy = 0,
-      eFu = 0,
-      strainAtHardening = 0,
-      strainUltimate = 0;
-
-    // step 2: api query
-    // NOTE: using the "older" method. Not sure if _1 is unsupported in etabs 21
-    // also, _1 doesn't give a lot more MEANINGFUL data
-    _settingsStore.Current.SapModel.PropMaterial.GetORebar(
-      name,
-      ref fy,
-      ref fu,
-      ref eFy,
-      ref eFu,
-      ref ssType,
-      ref ssHysType,
-      ref strainAtHardening,
-      ref strainUltimate,
-      ref useCaltransSsDefaults
-    );
-
-    // step 3: mutate properties dictionary
-    designData["Fy"] = fy;
-    designData["Fu"] = fu;
-    designData["EFy"] = eFy;
-    designData["EFu"] = eFu;
-    designData["StrainAtHardening"] = strainAtHardening;
-    designData["StrainUltimate"] = strainUltimate;
-    designData["SSType"] = _ssTypeDict.TryGetValue(ssType, out string? ssTypeValue) ? ssTypeValue : "";
-    designData["SSHysType"] = _ssHysTypeDict.TryGetValue(ssHysType, out string? ssHysTypeValue) ? ssHysTypeValue : "";
-    designData["UseCaltransSsDefaults"] = useCaltransSsDefaults.ToString();
-    designData["Temp"] = TEMP;
-  }
-
-  private void ExtractTendonProperties(string name, Dictionary<string, object?> designData)
-  {
-    // step 1: stubs for api query
-    int ssType = 0,
-      ssHysType = 0;
-    double fy = 0,
-      fu = 0;
-
-    // step 2: api query
-    _settingsStore.Current.SapModel.PropMaterial.GetOTendon(name, ref fy, ref fu, ref ssType, ref ssHysType);
-
-    // step 3: mutate properties dictionary
-    designData["Fy"] = fy;
-    designData["Fu"] = fu;
-    designData["SSType"] = _ssTypeDict.TryGetValue(ssType, out string? ssTypeValue) ? ssTypeValue : "";
-    designData["SSHysType"] = _ssHysTypeDict.TryGetValue(ssHysType, out string? ssHysTypeValue) ? ssHysTypeValue : "";
-    designData["Temp"] = TEMP;
-  }
-}

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsSectionPropertyDefinitionService.cs

@@ -1,105 +0,0 @@
-using Speckle.Converters.Common;
-using Speckle.Converters.CSiShared;
-using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
-
-namespace Speckle.Connectors.ETABSShared.HostApp.Services;
-
-/// <summary>
-/// Loads and caches section property definitions from database tables for both frame and shell sections.
-/// </summary>
-public class EtabsSectionPropertyDefinitionService
-{
-  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
-  public IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> FrameDefinitions { get; }
-  public IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> ShellDefinitions { get; }
-
-  public EtabsSectionPropertyDefinitionService(
-    DatabaseTableExtractor databaseTableExtractor,
-    IConverterSettingsStore<CsiConversionSettings> settingsStore
-  )
-  {
-    _settingsStore = settingsStore;
-
-    var availableTableKeys = GetAvailableTableKeys();
-
-    FrameDefinitions = LoadFrameDefinitions(databaseTableExtractor, availableTableKeys);
-    ShellDefinitions = LoadShellDefinitions(databaseTableExtractor, availableTableKeys);
-  }
-
-  private static IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> LoadFrameDefinitions(
-    DatabaseTableExtractor databaseTableExtractor,
-    string[] availableTableKeys
-  )
-  {
-    var frameTableKeys = GetFrameSectionPropertyDefinitionTableKeys(availableTableKeys);
-    return LoadDefinitionsFromTables(databaseTableExtractor, frameTableKeys);
-  }
-
-  private static IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> LoadShellDefinitions(
-    DatabaseTableExtractor databaseTableExtractor,
-    string[] availableTableKeys
-  )
-  {
-    var shellTableKeys = GetShellSectionPropertyDefinitionTableKeys(availableTableKeys);
-    return LoadDefinitionsFromTables(databaseTableExtractor, shellTableKeys);
-  }
-
-  private static IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> LoadDefinitionsFromTables(
-    DatabaseTableExtractor databaseTableExtractor,
-    IEnumerable<string> tableKeys
-  )
-  {
-    var definitions = new Dictionary<string, IReadOnlyDictionary<string, string>>();
-
-    foreach (string tableKey in tableKeys)
-    {
-      var tableData = databaseTableExtractor.GetTableData(tableKey, "Name");
-      foreach (var row in tableData.Rows)
-      {
-        definitions[row.Key] = row.Value;
-      }
-    }
-
-    return definitions;
-  }
-
-  private static IEnumerable<string> GetFrameSectionPropertyDefinitionTableKeys(string[] availableTableKeys)
-  {
-    var keysToExclude = new HashSet<string>
-    {
-      "Frame Section Property Definitions - Summary",
-      "Frame Section Property Definitions - Concrete Beam Reinforcing",
-      "Frame Section Property Definitions - Concrete Column Reinforcing",
-    };
-
-    return availableTableKeys.Where(key =>
-      key.StartsWith("Frame Section Property Definitions") && !keysToExclude.Contains(key)
-    );
-  }
-
-  private static IEnumerable<string> GetShellSectionPropertyDefinitionTableKeys(string[] availableTableKeys)
-  {
-    var keysToExclude = new HashSet<string> { "Area Section Property Definitions - Summary" };
-
-    return availableTableKeys.Where(key =>
-      key.StartsWith("Area Section Property Definitions") && !keysToExclude.Contains(key)
-    );
-  }
-
-  private string[] GetAvailableTableKeys()
-  {
-    int numberTables = 0;
-    string[] tableKey = [],
-      tableName = [];
-    int[] importType = [];
-
-    _ = _settingsStore.Current.SapModel.DatabaseTables.GetAvailableTables(
-      ref numberTables,
-      ref tableKey,
-      ref tableName,
-      ref importType
-    );
-
-    return tableKey;
-  }
-}

Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsSectionPropertyExtractor.cs

@@ -34,7 +34,7 @@ public class EtabsSectionPropertyExtractor
   /// </summary>
   public Dictionary<string, object?> ExtractFrameSectionProperties(string sectionName)
   {
-    Dictionary<string, object?> properties = [];
+    Dictionary<string, object?> properties = new();
     _csiFrameExtractor.ExtractProperties(sectionName, properties);
     _etabsFrameExtractor.ExtractProperties(sectionName, properties);
     return properties;
@@ -45,7 +45,7 @@ public class EtabsSectionPropertyExtractor
   /// </summary>
   public Dictionary<string, object?> ExtractShellSectionProperties(string sectionName)
   {
-    Dictionary<string, object?> properties = [];
+    Dictionary<string, object?> properties = new();
     _csiShellExtractor.ExtractProperties(sectionName, properties);
     _etabsShellExtractor.ExtractProperties(sectionName, properties);
     return properties;