Merge pull request #797 from specklesystems/dev

Update dev into main

.editorconfig

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

.github/workflows/pr.yml

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

.github/workflows/release.yml

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

Build/Consts.cs

@@ -29,7 +29,8 @@ public static class Consts
         new("Connectors/Autocad/Speckle.Connectors.Autocad2022", "net48"),
         new("Connectors/Autocad/Speckle.Connectors.Autocad2023", "net48"),
         new("Connectors/Autocad/Speckle.Connectors.Autocad2024", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows")
+        new("Connectors/Autocad/Speckle.Connectors.Autocad2025", "net8.0-windows"),
+        new("Connectors/Autocad/Speckle.Connectors.Autocad2026", "net8.0-windows")
       ]
     ),
     new(
@@ -38,7 +39,8 @@ public static class Consts
         new("Connectors/Autocad/Speckle.Connectors.Civil3d2022", "net48"),
         new("Connectors/Autocad/Speckle.Connectors.Civil3d2023", "net48"),
         new("Connectors/Autocad/Speckle.Connectors.Civil3d2024", "net48"),
-        new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows")
+        new("Connectors/Autocad/Speckle.Connectors.Civil3d2025", "net8.0-windows"),
+        new("Connectors/Autocad/Speckle.Connectors.Civil3d2026", "net8.0-windows")
       ]
     ),
     new(
@@ -49,7 +51,8 @@ public static class Consts
         new("Connectors/Navisworks/Speckle.Connectors.Navisworks2022", "net48"),
         new("Connectors/Navisworks/Speckle.Connectors.Navisworks2023", "net48"),
         new("Connectors/Navisworks/Speckle.Connectors.Navisworks2024", "net48"),
-        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2025", "net48")
+        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2025", "net48"),
+        new("Connectors/Navisworks/Speckle.Connectors.Navisworks2026", "net48")
       ]
     ),
     new(

Build/Program.cs

@@ -94,7 +94,7 @@ Target(
   DEEP_CLEAN_LOCAL,
   () =>
   {
-    CleanSolution("Local.sln", "local");
+    CleanSolution("Local.sln", "Local");
   }
 );
 
@@ -239,6 +239,7 @@ Target(
   async () =>
   {
     var version = await Versions.ComputeVersion();
+    var fileVersion = await Versions.ComputeFileVersion();
     foreach (var group in await Affected.GetAffectedProjectGroups())
     {
       Console.WriteLine($"Zipping: {group.HostAppSlug} as {version}");
@@ -280,7 +281,8 @@ Target(
 
     string githubEnv = Environment.GetEnvironmentVariable("GITHUB_ENV") ?? "Unset";
     Console.WriteLine($"GITHUB_ENV: {githubEnv}");
-    File.AppendAllText(githubEnv, $"SPECKLE_VERSION={version}{Environment.NewLine}");
+    File.AppendAllText(githubEnv, $"SEMVER={version}{Environment.NewLine}");
+    File.AppendAllText(githubEnv, $"FILE_VERSION={fileVersion}{Environment.NewLine}");
   }
 );
 

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

@@ -27,7 +27,7 @@ public static class ArcGISConnectorModule
 {
   public static void AddArcGIS(this IServiceCollection serviceCollection)
   {
-    serviceCollection.AddConnectorUtils();
+    serviceCollection.AddConnectors();
     serviceCollection.AddDUI<DefaultThreadContext, ArcGISDocumentStore>();
     serviceCollection.AddDUIView();
 

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

@@ -4,7 +4,6 @@ using Speckle.Connectors.ArcGIS.DependencyInjection;
 using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI;
 using Speckle.Converters.ArcGIS3;
-using Speckle.Sdk.Host;
 using Module = ArcGIS.Desktop.Framework.Contracts.Module;
 
 namespace Speckle.Connectors.ArcGIS;

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

@@ -132,6 +132,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -228,18 +233,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -264,7 +267,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "LibTessDotNet": {
@@ -282,12 +285,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -314,18 +311,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -335,14 +332,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     "net6.0-windows7.0/win-x64": {

Connectors/Autocad/Directory.Build.targets

@@ -23,4 +23,16 @@
     <Message Text="Civil3D Version $(Civil3DVersion)" Importance="high"/>
     <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Civil3d$(Civil3DVersion)\%(RecursiveDir)" SourceFiles="@(Civil3DDLLs)" />
   </Target>
+
+  <PropertyGroup Condition="'$(AutoCADVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Civil3DVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true'">
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
+    <StartArguments>/product C3D</StartArguments>
+  </PropertyGroup>
 </Project>

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

@@ -6,8 +6,6 @@
     <AutoCADVersion>2022</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2022;AUTOCAD2022_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -289,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -301,12 +304,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -339,18 +336,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +357,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -6,8 +6,6 @@
     <AutoCADVersion>2023</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2023;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -289,7 +292,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -301,12 +304,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -339,18 +336,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -360,14 +357,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
+    <AutoCADVersion>2024</AutoCADVersion>
     <PlatformTarget>x64</PlatformTarget>
     <UseWpf>true</UseWpf>
-    <AutoCADVersion>2024</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2024;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -290,7 +293,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -302,12 +305,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -1,15 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <AutoCADVersion>2025</AutoCADVersion>
-    <DefineConstants>$(DefineConstants);AUTOCAD2025;AUTOCAD</DefineConstants>
+    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2025;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER;AUTOCAD2025_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(AutoCADVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -121,6 +121,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -210,18 +215,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -246,7 +249,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -258,12 +261,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -296,18 +293,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -316,14 +313,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <AutoCADVersion>2026</AutoCADVersion>
+    <DefineConstants>$(DefineConstants);AUTOCAD;AUTOCAD2026;AUTOCAD2022_OR_GREATER;AUTOCAD2023_OR_GREATER;AUTOCAD2024_OR_GREATER;AUTOCAD2025_OR_GREATER;AUTOCAD2026_OR_GREATER</DefineConstants>
+    <Configurations>Debug;Release;Local</Configurations>   
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
+  </PropertyGroup>
+  
+  <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

@@ -1,32 +1,7 @@
 {
   "version": 2,
   "dependencies": {
-    "net8.0": {
-      "altcover": {
-        "type": "Direct",
-        "requested": "[8.9.3, )",
-        "resolved": "8.9.3",
-        "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w=="
-      },
-      "FluentAssertions": {
-        "type": "Direct",
-        "requested": "[6.12.1, )",
-        "resolved": "6.12.1",
-        "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==",
-        "dependencies": {
-          "System.Configuration.ConfigurationManager": "4.4.0"
-        }
-      },
-      "Microsoft.NET.Test.Sdk": {
-        "type": "Direct",
-        "requested": "[17.11.1, )",
-        "resolved": "17.11.1",
-        "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==",
-        "dependencies": {
-          "Microsoft.CodeCoverage": "17.11.1",
-          "Microsoft.TestPlatform.TestHost": "17.11.1"
-        }
-      },
+    "net8.0-windows7.0": {
       "Microsoft.NETFramework.ReferenceAssemblies": {
         "type": "Direct",
         "requested": "[1.0.3, )",
@@ -46,62 +21,24 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
-      "Moq": {
-        "type": "Direct",
-        "requested": "[4.20.70, )",
-        "resolved": "4.20.70",
-        "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==",
-        "dependencies": {
-          "Castle.Core": "5.1.1"
-        }
-      },
-      "NUnit": {
-        "type": "Direct",
-        "requested": "[4.1.0, )",
-        "resolved": "4.1.0",
-        "contentHash": "MT/DpAhjtiytzhTgTqIhBuWx4y26PKfDepYUHUM+5uv4TsryHC2jwFo5e6NhWkApCm/G6kZ80dRjdJFuAxq3rg=="
-      },
-      "NUnit.Analyzers": {
-        "type": "Direct",
-        "requested": "[4.2.0, )",
-        "resolved": "4.2.0",
-        "contentHash": "4fJojPkzdoa4nB2+p6U+fITvPnVvwWSnsmiJ/Dl30xqiL3oxNbYvfeSLVd91hOmEjoUqSwN3Z7j1aFedjqWbUA=="
-      },
-      "NUnit3TestAdapter": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "R7e1+a4vuV/YS+ItfL7f//rG+JBvVeVLX4mHzFEZo4W1qEKl8Zz27AqvQSAqo+BtIzUCo4aAJMYa56VXS4hudw=="
-      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
+      "Speckle.AutoCAD.API": {
+        "type": "Direct",
+        "requested": "[2026.0.0, )",
+        "resolved": "2026.0.0",
+        "contentHash": "WlkV81PmbK/ftoM7aGpU6LGosKbePBQej9MO/m63rFMozX89tsitEhE12o58wu7K/4FmRUdAMolYtdK20EDBnw=="
+      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.6, )",
         "resolved": "0.9.6",
         "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
       },
-      "Speckle.Rhino7.Fakes": {
-        "type": "Direct",
-        "requested": "[0.3.1, )",
-        "resolved": "0.3.1",
-        "contentHash": "II0zR/4QfPC/j44zfVTSqplZsd/GXHEa4eKRZFdjHuXnXBcd80uObWAb0C2Wm88KSlKOnSYAeQLEMmPjK5Kw3w==",
-        "dependencies": {
-          "System.Drawing.Common": "8.0.6"
-        }
-      },
-      "Castle.Core": {
-        "type": "Transitive",
-        "resolved": "5.1.1",
-        "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==",
-        "dependencies": {
-          "System.Diagnostics.EventLog": "6.0.0"
-        }
-      },
       "GraphQL.Client": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -138,11 +75,6 @@
         "resolved": "8.0.0",
         "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
       },
-      "Microsoft.CodeCoverage": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA=="
-      },
       "Microsoft.CSharp": {
         "type": "Transitive",
         "resolved": "4.7.0",
@@ -189,6 +121,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -218,33 +155,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Microsoft.TestPlatform.ObjectModel": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==",
-        "dependencies": {
-          "System.Reflection.Metadata": "1.6.0"
-        }
-      },
-      "Microsoft.TestPlatform.TestHost": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==",
-        "dependencies": {
-          "Microsoft.TestPlatform.ObjectModel": "17.11.1",
-          "Newtonsoft.Json": "13.0.1"
-        }
-      },
-      "Microsoft.Win32.SystemEvents": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
-      },
-      "Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.1",
-        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -285,27 +195,6 @@
         "resolved": "4.5.0",
         "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
       },
-      "System.Configuration.ConfigurationManager": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==",
-        "dependencies": {
-          "System.Security.Cryptography.ProtectedData": "4.4.0"
-        }
-      },
-      "System.Diagnostics.EventLog": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw=="
-      },
-      "System.Drawing.Common": {
-        "type": "Transitive",
-        "resolved": "8.0.6",
-        "contentHash": "aSwRnJzz6fZ73JvWMMG0KvBwOnXsBTFtfHLriQyAPrDIZ+NrDfl15GWbO/A35k0dtH77D7jfxzEcFF7RONtU/w==",
-        "dependencies": {
-          "Microsoft.Win32.SystemEvents": "8.0.0"
-        }
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -316,40 +205,61 @@
         "resolved": "5.0.0",
         "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
       },
-      "System.Reflection.Metadata": {
-        "type": "Transitive",
-        "resolved": "1.6.0",
-        "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
-      },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "4.5.1",
         "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
       },
-      "System.Security.Cryptography.ProtectedData": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
+      "speckle.connectors.common": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
+          "Speckle.Connectors.Logging": "[1.0.0, )",
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
+        }
+      },
+      "speckle.connectors.dui": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
+          "Speckle.Connectors.Common": "[1.0.0, )"
+        }
+      },
+      "speckle.connectors.dui.webview": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
+          "Speckle.Connectors.DUI": "[1.0.0, )"
+        }
+      },
+      "speckle.connectors.logging": {
+        "type": "Project"
+      },
+      "speckle.converters.autocad2026": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.AutoCAD.API": "[2026.0.0, )",
+          "Speckle.Connectors.DUI.WebView": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
+        }
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
-      "speckle.testing": {
-        "type": "Project",
-        "dependencies": {
-          "Moq": "[4.20.70, )",
-          "NUnit": "[4.1.0, )"
-        }
-      },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+      "Microsoft.Extensions.DependencyInjection": {
         "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
+        "requested": "[2.2.0, )",
         "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+        }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
@@ -369,6 +279,12 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Microsoft.Web.WebView2": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
+      },
       "Speckle.DoubleNumerics": {
         "type": "CentralTransitive",
         "requested": "[4.1.0, )",
@@ -377,18 +293,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -397,14 +313,27 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
+      }
+    },
+    "net8.0-windows7.0/win-x64": {
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.4",
+        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
+      },
+      "Microsoft.Web.WebView2": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       }
     }
   }

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

@@ -24,7 +24,7 @@ public static class SharedRegistration
 {
   public static void AddAutocadBase(this IServiceCollection serviceCollection)
   {
-    serviceCollection.AddConnectorUtils();
+    serviceCollection.AddConnectors();
     serviceCollection.AddDUI<DefaultThreadContext, AutocadDocumentStore>();
     serviceCollection.AddDUIView();
 

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

@@ -1,10 +1,10 @@
-using Speckle.Sdk.Host;
+using Speckle.Connectors.Common;
 
 namespace Speckle.Connectors.Autocad.Plugin;
 
 public static class AppUtils
 {
-  public static HostApplication App =>
+  public static Speckle.Sdk.Application App =>
 #if CIVIL3D
     HostApplications.Civil3D;
 #elif AUTOCAD
@@ -14,7 +14,9 @@ public static class AppUtils
 #endif
 
   public static HostAppVersion Version =>
-#if AUTOCAD2025 || CIVIL3D2025
+#if AUTOCAD2026 || CIVIL3D2026
+    HostAppVersion.v2026;
+#elif AUTOCAD2025 || CIVIL3D2025
     HostAppVersion.v2025;
 #elif AUTOCAD2024 || CIVIL3D2024
     HostAppVersion.v2024;

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

@@ -1,9 +1,11 @@
-using System.IO;
 using System.Reflection;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Autodesk.Windows;
 using Speckle.Sdk;
+#if !AUTOCAD2025_OR_GREATER && !CIVIL3D2025_OR_GREATER
+using System.IO;
+#endif
 
 namespace Speckle.Connectors.Autocad.Plugin;
 

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

@@ -6,8 +6,6 @@
     <Civil3DVersion>2022</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2022;CIVIL3D2022_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Speckle.AutoCAD.API"  VersionOverride="2022.0.2" ExcludeAssets="runtime"/>

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

@@ -139,6 +139,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -263,18 +268,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -299,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -311,12 +314,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -349,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -370,14 +367,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -6,8 +6,6 @@
     <Civil3DVersion>2023</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2023;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -139,6 +139,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -263,18 +268,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -299,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -311,12 +314,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -349,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -370,14 +367,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -6,8 +6,6 @@
     <Civil3DVersion>2024</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D;CIVIL3D2024;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -139,6 +139,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -263,18 +268,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -299,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -311,12 +314,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -349,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -370,14 +367,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -1,15 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <Civil3DVersion>2025</Civil3DVersion>
     <DefineConstants>$(DefineConstants);CIVIL3D2025;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
-    <StartAction>Program</StartAction>
-    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD $(Civil3DVersion)\acad.exe</StartProgram>
   </PropertyGroup>
   
   <ItemGroup>

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -219,18 +224,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -256,7 +259,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -268,12 +271,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -306,18 +303,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -326,14 +323,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Civil3DVersion>2026</Civil3DVersion>
+    <DefineConstants>$(DefineConstants);CIVIL3D2026;CIVIL3D;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER;CIVIL3D2025_OR_GREATER;CIVIL3D2026_OR_GREATER</DefineConstants>
+    <Configurations>Debug;Release;Local</Configurations>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier> <!-- .NET Core uses this to move native dependencies into a root for runtime selection and usage for non-windows development https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#enablewindowstargeting -->
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
+    <PackageReference Include="Speckle.Civil3d.API" VersionOverride="2026.0.0" ExcludeAssets="runtime"/>
+  </ItemGroup>  
+  
+  <ItemGroup>   
+    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2026\Speckle.Converters.Civil3d2026.csproj" />   
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+  </ItemGroup>
+  
+  <Import Project="..\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
+  
+  <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
+</Project>

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

@@ -1,32 +1,7 @@
 {
   "version": 2,
   "dependencies": {
-    "net8.0": {
-      "altcover": {
-        "type": "Direct",
-        "requested": "[8.9.3, )",
-        "resolved": "8.9.3",
-        "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w=="
-      },
-      "FluentAssertions": {
-        "type": "Direct",
-        "requested": "[6.12.1, )",
-        "resolved": "6.12.1",
-        "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==",
-        "dependencies": {
-          "System.Configuration.ConfigurationManager": "4.4.0"
-        }
-      },
-      "Microsoft.NET.Test.Sdk": {
-        "type": "Direct",
-        "requested": "[17.11.1, )",
-        "resolved": "17.11.1",
-        "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==",
-        "dependencies": {
-          "Microsoft.CodeCoverage": "17.11.1",
-          "Microsoft.TestPlatform.TestHost": "17.11.1"
-        }
-      },
+    "net8.0-windows7.0": {
       "Microsoft.NETFramework.ReferenceAssemblies": {
         "type": "Direct",
         "requested": "[1.0.3, )",
@@ -46,53 +21,33 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
-      "Moq": {
-        "type": "Direct",
-        "requested": "[4.20.70, )",
-        "resolved": "4.20.70",
-        "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==",
-        "dependencies": {
-          "Castle.Core": "5.1.1"
-        }
-      },
-      "NUnit": {
-        "type": "Direct",
-        "requested": "[4.1.0, )",
-        "resolved": "4.1.0",
-        "contentHash": "MT/DpAhjtiytzhTgTqIhBuWx4y26PKfDepYUHUM+5uv4TsryHC2jwFo5e6NhWkApCm/G6kZ80dRjdJFuAxq3rg=="
-      },
-      "NUnit.Analyzers": {
-        "type": "Direct",
-        "requested": "[4.2.0, )",
-        "resolved": "4.2.0",
-        "contentHash": "4fJojPkzdoa4nB2+p6U+fITvPnVvwWSnsmiJ/Dl30xqiL3oxNbYvfeSLVd91hOmEjoUqSwN3Z7j1aFedjqWbUA=="
-      },
-      "NUnit3TestAdapter": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "R7e1+a4vuV/YS+ItfL7f//rG+JBvVeVLX4mHzFEZo4W1qEKl8Zz27AqvQSAqo+BtIzUCo4aAJMYa56VXS4hudw=="
-      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
+      "Speckle.AutoCAD.API": {
+        "type": "Direct",
+        "requested": "[2026.0.0, )",
+        "resolved": "2026.0.0",
+        "contentHash": "WlkV81PmbK/ftoM7aGpU6LGosKbePBQej9MO/m63rFMozX89tsitEhE12o58wu7K/4FmRUdAMolYtdK20EDBnw=="
+      },
+      "Speckle.Civil3D.API": {
+        "type": "Direct",
+        "requested": "[2026.0.0, )",
+        "resolved": "2026.0.0",
+        "contentHash": "JcQvKvA3KC+9hzJiWlaZ3REtvqJV+AFHPIU5J6Xp7JHlNyhnaalN37WXpWIKhNAUwL9ppUBOXMZpQupbFytUwg==",
+        "dependencies": {
+          "Speckle.AutoCAD.API": "2026.0.0"
+        }
+      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.6, )",
         "resolved": "0.9.6",
         "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
       },
-      "Castle.Core": {
-        "type": "Transitive",
-        "resolved": "5.1.1",
-        "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==",
-        "dependencies": {
-          "System.Diagnostics.EventLog": "6.0.0"
-        }
-      },
       "GraphQL.Client": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -129,11 +84,6 @@
         "resolved": "8.0.0",
         "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
       },
-      "Microsoft.CodeCoverage": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA=="
-      },
       "Microsoft.CSharp": {
         "type": "Transitive",
         "resolved": "4.7.0",
@@ -180,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -209,28 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Microsoft.TestPlatform.ObjectModel": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==",
-        "dependencies": {
-          "System.Reflection.Metadata": "1.6.0"
-        }
-      },
-      "Microsoft.TestPlatform.TestHost": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==",
-        "dependencies": {
-          "Microsoft.TestPlatform.ObjectModel": "17.11.1",
-          "Newtonsoft.Json": "13.0.1"
-        }
-      },
-      "Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.1",
-        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -271,19 +204,6 @@
         "resolved": "4.5.0",
         "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
       },
-      "System.Configuration.ConfigurationManager": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==",
-        "dependencies": {
-          "System.Security.Cryptography.ProtectedData": "4.4.0"
-        }
-      },
-      "System.Diagnostics.EventLog": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw=="
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
@@ -294,39 +214,52 @@
         "resolved": "5.0.0",
         "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
       },
-      "System.Reflection.Metadata": {
-        "type": "Transitive",
-        "resolved": "1.6.0",
-        "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
-      },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "4.5.1",
         "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
       },
-      "System.Security.Cryptography.ProtectedData": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      },
       "speckle.connectors.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
+        }
+      },
+      "speckle.connectors.dui": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
+          "Speckle.Connectors.Common": "[1.0.0, )"
+        }
+      },
+      "speckle.connectors.dui.webview": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
+          "Speckle.Connectors.DUI": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
         "type": "Project"
       },
-      "speckle.testing": {
+      "speckle.converters.civil3d2026": {
         "type": "Project",
         "dependencies": {
-          "Moq": "[4.20.70, )",
-          "NUnit": "[4.1.0, )"
+          "Speckle.AutoCAD.API": "[2026.0.0, )",
+          "Speckle.Civil3d.API": "[2026.0.0, )",
+          "Speckle.Connectors.DUI.WebView": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )"
+        }
+      },
+      "speckle.converters.common": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -338,12 +271,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -362,6 +289,12 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Microsoft.Web.WebView2": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
+      },
       "Speckle.DoubleNumerics": {
         "type": "CentralTransitive",
         "requested": "[4.1.0, )",
@@ -370,18 +303,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -390,14 +323,27 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
+      }
+    },
+    "net8.0-windows7.0/win-x64": {
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.4",
+        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
+      },
+      "Microsoft.Web.WebView2": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.1938.49, )",
+        "resolved": "1.0.1938.49",
+        "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       }
     }
   }

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

@@ -7,7 +7,6 @@ using Speckle.Connectors.CSiShared.HostApp;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converters.CSiShared;
-using Speckle.Sdk.Host;
 
 namespace Speckle.Connectors.CSiShared;
 
@@ -36,7 +35,7 @@ public abstract class SpeckleFormBase : Form, ICsiApplicationService
     services.AddCsiConverters();
   }
 
-  protected abstract HostApplication GetHostApplication();
+  protected abstract Speckle.Sdk.Application GetHostApplication();
 
   protected abstract HostAppVersion GetVersion();
 

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

@@ -24,7 +24,7 @@ public static class ServiceRegistration
   {
     services.AddSingleton<IBrowserBridge, BrowserBridge>();
 
-    services.AddConnectorUtils();
+    services.AddConnectors();
     services.AddDUI<DefaultThreadContext, CsiDocumentModelStore>();
     services.AddDUIView();
 

Connectors/CSi/Speckle.Connectors.ETABS21/Plugin/SpeckleForm.cs

@@ -1,5 +1,5 @@
+using Speckle.Connectors.Common;
 using Speckle.Connectors.ETABSShared;
-using Speckle.Sdk.Host;
 
 // NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
 // Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -282,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.etabs21": {
@@ -300,12 +303,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -338,18 +335,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -359,14 +356,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

Connectors/CSi/Speckle.Connectors.ETABS22/Plugin/SpeckleForm.cs

@@ -1,5 +1,5 @@
+using Speckle.Connectors.Common;
 using Speckle.Connectors.ETABSShared;
-using Speckle.Sdk.Host;
 
 // NOTE: Plugin entry point must match the assembly name, otherwise ETABS hits you with a "Not found" error when loading plugin
 // Disabling error below to prioritize DUI3 project structure. Name of cPlugin class cannot be changed

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

@@ -121,6 +121,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -210,18 +215,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -238,7 +241,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.etabs22": {
@@ -256,12 +259,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -294,18 +291,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -314,14 +311,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

Connectors/CSi/Speckle.Connectors.ETABSShared/Plugin/EtabsSpeckleFormBase.cs

@@ -1,12 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
+using Speckle.Connectors.Common;
 using Speckle.Connectors.CSiShared;
-using Speckle.Sdk.Host;
 
 namespace Speckle.Connectors.ETABSShared;
 
 public abstract class EtabsSpeckleFormBase : SpeckleFormBase
 {
-  protected override HostApplication GetHostApplication() => HostApplications.ETABS;
+  protected override Speckle.Sdk.Application GetHostApplication() => HostApplications.ETABS;
 
   protected override void ConfigureServices(IServiceCollection services)
   {

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -282,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.navisworks2020": {
@@ -302,12 +305,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -282,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.navisworks2021": {
@@ -302,12 +305,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -282,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.navisworks2022": {
@@ -302,12 +305,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -282,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.navisworks2023": {
@@ -302,12 +305,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -130,6 +130,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -254,18 +259,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -282,7 +285,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.navisworks2024": {
@@ -302,12 +305,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

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

@@ -136,6 +136,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -260,18 +265,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -288,7 +291,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.navisworks2025": {
@@ -308,12 +311,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -340,18 +337,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -361,14 +358,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {

Connectors/Navisworks/Speckle.Connectors.Navisworks2026/Properties/launchSettings.json

@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Speckle.Connector.Navisworks2026": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Program Files\\Autodesk\\Navisworks Manage 2026\\Roamer.exe",
+      "commandLineArgs": " -licensing AdLM"
+    }
+  }
+}

Connectors/Navisworks/Speckle.Connectors.Navisworks2026/Speckle.Connectors.Navisworks2026.csproj

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <FileAlignment>512</FileAlignment>
+
+    <NavisworksBuildNumber>v23</NavisworksBuildNumber>
+    <NavisworksVersion>2026</NavisworksVersion>
+
+    <DefineConstants>$(DefineConstants);TRACE;NAVIS2026;NAVIS</DefineConstants>
+    <Configurations>Debug;Release;Local</Configurations>
+  </PropertyGroup>
+
+  <Import Project="..\Speckle.Connectors.NavisworksShared\Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+
+  <ItemGroup>
+    <Reference Include="WindowsFormsIntegration"/>
+    <PackageReference Include="Speckle.Navisworks.API" VersionOverride="2026.0.1" ExcludeAssets="runtime"/>
+    <PackageReference Include="Microsoft.Web.WebView2" VersionOverride="1.0.2365.46" />
+    <PackageReference Include="System.Reactive" VersionOverride="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Navisworks\Speckle.Converters.Navisworks2026\Speckle.Converters.Navisworks2026.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Common\Speckle.Connectors.Common.csproj"/>
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj"/>
+  </ItemGroup>
+</Project>

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

@@ -1,39 +1,14 @@
 {
   "version": 2,
   "dependencies": {
-    "net8.0": {
-      "altcover": {
-        "type": "Direct",
-        "requested": "[8.9.3, )",
-        "resolved": "8.9.3",
-        "contentHash": "auKC+pDCkLjfhFkSRaAUBu25BOmlLSqucR7YBs/Lkbdc0XRuJoklWafs1KKp+M+VoJ1f0TeMS6B/FO5IeIcu7w=="
-      },
-      "FluentAssertions": {
-        "type": "Direct",
-        "requested": "[6.12.1, )",
-        "resolved": "6.12.1",
-        "contentHash": "hciWwryyLw3eonfqhFpOMTXyM1/auJChYslEBA+iGJyuBs5O3t/kA8YaeH4iRo/2Fe3ElSYL86C0miivtZ0f3g==",
-        "dependencies": {
-          "System.Configuration.ConfigurationManager": "4.4.0"
-        }
-      },
-      "Microsoft.NET.Test.Sdk": {
-        "type": "Direct",
-        "requested": "[17.11.1, )",
-        "resolved": "17.11.1",
-        "contentHash": "U3Ty4BaGoEu+T2bwSko9tWqWUOU16WzSFkq6U8zve75oRBMSLTBdMAZrVNNz1Tq12aCdDom9fcOcM9QZaFHqFg==",
-        "dependencies": {
-          "Microsoft.CodeCoverage": "17.11.1",
-          "Microsoft.TestPlatform.TestHost": "17.11.1"
-        }
-      },
+    ".NETFramework,Version=v4.8": {
       "Microsoft.NETFramework.ReferenceAssemblies": {
         "type": "Direct",
         "requested": "[1.0.3, )",
         "resolved": "1.0.3",
         "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
         "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
+          "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
         }
       },
       "Microsoft.SourceLink.GitHub": {
@@ -46,32 +21,11 @@
           "Microsoft.SourceLink.Common": "8.0.0"
         }
       },
-      "Moq": {
+      "Microsoft.Web.WebView2": {
         "type": "Direct",
-        "requested": "[4.20.70, )",
-        "resolved": "4.20.70",
-        "contentHash": "4rNnAwdpXJBuxqrOCzCyICXHSImOTRktCgCWXWykuF1qwoIsVvEnR7PjbMk/eLOxWvhmj5Kwt+kDV3RGUYcNwg==",
-        "dependencies": {
-          "Castle.Core": "5.1.1"
-        }
-      },
-      "NUnit": {
-        "type": "Direct",
-        "requested": "[4.1.0, )",
-        "resolved": "4.1.0",
-        "contentHash": "MT/DpAhjtiytzhTgTqIhBuWx4y26PKfDepYUHUM+5uv4TsryHC2jwFo5e6NhWkApCm/G6kZ80dRjdJFuAxq3rg=="
-      },
-      "NUnit.Analyzers": {
-        "type": "Direct",
-        "requested": "[4.2.0, )",
-        "resolved": "4.2.0",
-        "contentHash": "4fJojPkzdoa4nB2+p6U+fITvPnVvwWSnsmiJ/Dl30xqiL3oxNbYvfeSLVd91hOmEjoUqSwN3Z7j1aFedjqWbUA=="
-      },
-      "NUnit3TestAdapter": {
-        "type": "Direct",
-        "requested": "[4.6.0, )",
-        "resolved": "4.6.0",
-        "contentHash": "R7e1+a4vuV/YS+ItfL7f//rG+JBvVeVLX4mHzFEZo4W1qEKl8Zz27AqvQSAqo+BtIzUCo4aAJMYa56VXS4hudw=="
+        "requested": "[1.0.2365.46, )",
+        "resolved": "1.0.2365.46",
+        "contentHash": "8L/Wv1r6NRSYpaaywBE/zcjDShTlTCEqBgsrB0xPQ11umziTtSNTu/rcLVazoQhHfVnQvX/fruMtdJCiPTDuyQ=="
       },
       "PolySharp": {
         "type": "Direct",
@@ -85,21 +39,19 @@
         "resolved": "0.9.6",
         "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
       },
-      "Speckle.Revit2022.Fakes": {
+      "Speckle.Navisworks.API": {
         "type": "Direct",
-        "requested": "[0.3.1, )",
-        "resolved": "0.3.1",
-        "contentHash": "kz/taszZjEUEnqJM4qjRqEYdsrD6s9X1N56SXiB2fUiwc7MeM6H1LZaAdRYM/70tukq8OshL5fiWIQZrXrLaAg==",
-        "dependencies": {
-          "System.Drawing.Common": "8.0.6"
-        }
+        "requested": "[2026.0.1, )",
+        "resolved": "2026.0.1",
+        "contentHash": "IjIxv+EGmEVYquljXMCNxdBY7kGBeMxEecIdXvyzBj3dLLhJjqpmyfA2Yheq4pfK4AmE6LWZ5mQyD+39onApRw=="
       },
-      "Castle.Core": {
-        "type": "Transitive",
-        "resolved": "5.1.1",
-        "contentHash": "rpYtIczkzGpf+EkZgDr9CClTdemhsrwA/W5hMoPjLkRFnXzH44zDLoovXeKtmxb1ykXK9aJVODSpiJml8CTw2g==",
+      "System.Reactive": {
+        "type": "Direct",
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "31kfaW4ZupZzPsI5PVe77VhnvFF55qgma7KZr/E0iFTs6fmdhhG8j0mgEx620iLTey1EynOkEfnyTjtNEpJzGw==",
         "dependencies": {
-          "System.Diagnostics.EventLog": "6.0.0"
+          "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
       "GraphQL.Client": {
@@ -109,6 +61,7 @@
         "dependencies": {
           "GraphQL.Client.Abstractions": "6.0.0",
           "GraphQL.Client.Abstractions.Websocket": "6.0.0",
+          "System.Net.WebSockets.Client.Managed": "1.0.22",
           "System.Reactive": "5.0.0"
         }
       },
@@ -133,16 +86,19 @@
         "resolved": "6.0.0",
         "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA=="
       },
+      "Microsoft.Bcl.AsyncInterfaces": {
+        "type": "Transitive",
+        "resolved": "5.0.0",
+        "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==",
+        "dependencies": {
+          "System.Threading.Tasks.Extensions": "4.5.4"
+        }
+      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "8.0.0",
         "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
       },
-      "Microsoft.CodeCoverage": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "nPJqrcA5iX+Y0kqoT3a+pD/8lrW/V7ayqnEJQsTonSoPz59J8bmoQhcSN4G8+UJ64Hkuf0zuxnfuj2lkHOq4cA=="
-      },
       "Microsoft.CSharp": {
         "type": "Transitive",
         "resolved": "4.7.0",
@@ -189,6 +145,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -208,43 +169,16 @@
           "System.Runtime.CompilerServices.Unsafe": "4.5.1"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
         "type": "Transitive",
         "resolved": "1.0.3",
-        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Microsoft.TestPlatform.ObjectModel": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "E2jZqAU6JeWEVsyOEOrSW1o1bpHLgb25ypvKNB/moBXPVsFYBPd/Jwi7OrYahG50J83LfHzezYI+GaEkpAotiA==",
-        "dependencies": {
-          "System.Reflection.Metadata": "1.6.0"
-        }
-      },
-      "Microsoft.TestPlatform.TestHost": {
-        "type": "Transitive",
-        "resolved": "17.11.1",
-        "contentHash": "DnG+GOqJXO/CkoqlJWeDFTgPhqD/V6VqUIL3vINizCWZ3X+HshCtbbyDdSHQQEjrc2Sl/K3yaxX6s+5LFEdYuw==",
-        "dependencies": {
-          "Microsoft.TestPlatform.ObjectModel": "17.11.1",
-          "Newtonsoft.Json": "13.0.1"
-        }
-      },
-      "Microsoft.Win32.SystemEvents": {
-        "type": "Transitive",
-        "resolved": "8.0.0",
-        "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
-      },
-      "Newtonsoft.Json": {
-        "type": "Transitive",
-        "resolved": "13.0.1",
-        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -256,7 +190,7 @@
         "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==",
         "dependencies": {
           "SQLitePCLRaw.lib.e_sqlite3": "2.1.4",
-          "SQLitePCLRaw.provider.e_sqlite3": "2.1.4"
+          "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4"
         }
       },
       "SQLitePCLRaw.core": {
@@ -272,84 +206,112 @@
         "resolved": "2.1.4",
         "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
       },
-      "SQLitePCLRaw.provider.e_sqlite3": {
+      "SQLitePCLRaw.provider.dynamic_cdecl": {
         "type": "Transitive",
         "resolved": "2.1.4",
-        "contentHash": "CSlb5dUp1FMIkez9Iv5EXzpeq7rHryVNqwJMWnpq87j9zWZexaEMdisDktMsnnrzKM6ahNrsTkjqNodTBPBxtQ==",
+        "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==",
         "dependencies": {
           "SQLitePCLRaw.core": "2.1.4"
         }
       },
+      "System.Buffers": {
+        "type": "Transitive",
+        "resolved": "4.4.0",
+        "contentHash": "AwarXzzoDwX6BgrhjoJsk6tUezZEozOT5Y9QKF94Gl4JK91I4PIIBkBco9068Y9/Dra8Dkbie99kXB8+1BaYKw=="
+      },
       "System.ComponentModel.Annotations": {
         "type": "Transitive",
         "resolved": "4.5.0",
         "contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
       },
-      "System.Configuration.ConfigurationManager": {
-        "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "gWwQv/Ug1qWJmHCmN17nAbxJYmQBM/E94QxKLksvUiiKB1Ld3Sc/eK1lgmbSjDFxkQhVuayI/cGFZhpBSodLrg==",
-        "dependencies": {
-          "System.Security.Cryptography.ProtectedData": "4.4.0"
-        }
-      },
-      "System.Diagnostics.EventLog": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "lcyUiXTsETK2ALsZrX+nWuHSIQeazhqPphLfaRxzdGaG93+0kELqpgEHtwWOlQe7+jSFnKwaCAgL4kjeZCQJnw=="
-      },
-      "System.Drawing.Common": {
-        "type": "Transitive",
-        "resolved": "8.0.6",
-        "contentHash": "aSwRnJzz6fZ73JvWMMG0KvBwOnXsBTFtfHLriQyAPrDIZ+NrDfl15GWbO/A35k0dtH77D7jfxzEcFF7RONtU/w==",
-        "dependencies": {
-          "Microsoft.Win32.SystemEvents": "8.0.0"
-        }
-      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
+        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+        "dependencies": {
+          "System.Buffers": "4.4.0",
+          "System.Numerics.Vectors": "4.4.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        }
       },
-      "System.Reactive": {
+      "System.Net.WebSockets.Client.Managed": {
         "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ=="
+        "resolved": "1.0.22",
+        "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==",
+        "dependencies": {
+          "System.Buffers": "4.4.0",
+          "System.Numerics.Vectors": "4.4.0"
+        }
       },
-      "System.Reflection.Metadata": {
+      "System.Numerics.Vectors": {
         "type": "Transitive",
-        "resolved": "1.6.0",
-        "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
+        "resolved": "4.4.0",
+        "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
-        "resolved": "4.5.1",
-        "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
+        "resolved": "4.5.3",
+        "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
       },
-      "System.Security.Cryptography.ProtectedData": {
+      "System.Threading.Tasks.Extensions": {
         "type": "Transitive",
-        "resolved": "4.4.0",
-        "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
+        "resolved": "4.5.4",
+        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
+        "dependencies": {
+          "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+        }
+      },
+      "speckle.connectors.common": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
+          "Speckle.Connectors.Logging": "[1.0.0, )",
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
+        }
+      },
+      "speckle.connectors.dui": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
+          "Speckle.Connectors.Common": "[1.0.0, )"
+        }
+      },
+      "speckle.connectors.dui.webview": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Web.WebView2": "[1.0.1938.49, )",
+          "Speckle.Connectors.DUI": "[1.0.0, )"
+        }
+      },
+      "speckle.connectors.logging": {
+        "type": "Project"
       },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
-      "speckle.testing": {
+      "speckle.converters.navisworks2026": {
         "type": "Project",
         "dependencies": {
-          "Moq": "[4.20.70, )",
-          "NUnit": "[4.1.0, )"
+          "Speckle.Connectors.DUI": "[1.0.0, )",
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Navisworks.API": "[2026.0.1, )",
+          "System.Reactive": "[6.0.0, )"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+      "Microsoft.Extensions.DependencyInjection": {
         "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
+        "requested": "[2.2.0, )",
         "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+        "contentHash": "MZtBIwfDFork5vfjpJdG5g8wuJFt7d/y3LOSVVtDK/76wlbtz6cjltfKHqLx2TKVqTj5/c41t77m1+h20zqtPA==",
+        "dependencies": {
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
+        }
       },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
@@ -377,34 +339,48 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "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.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
+      }
+    },
+    ".NETFramework,Version=v4.8/win-x64": {
+      "Microsoft.Web.WebView2": {
+        "type": "Direct",
+        "requested": "[1.0.2365.46, )",
+        "resolved": "1.0.2365.46",
+        "contentHash": "8L/Wv1r6NRSYpaaywBE/zcjDShTlTCEqBgsrB0xPQ11umziTtSNTu/rcLVazoQhHfVnQvX/fruMtdJCiPTDuyQ=="
+      },
+      "SQLitePCLRaw.lib.e_sqlite3": {
+        "type": "Transitive",
+        "resolved": "2.1.4",
+        "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg=="
       }
     }
   }

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

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

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

@@ -22,6 +22,7 @@ public class NavisworksSavedSetsFilter : DiscriminatedObject, ISendFilterSelect
 
   public string Id { get; set; } = "navisworksSavedSets";
   public string Name { get; set; } = "Saved Sets";
+  public string Type { get; set; } = "Select";
   public string? Summary { get; set; }
   public bool IsDefault { get; set; }
   public List<string> SelectedObjectIds { get; set; } = [];

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

@@ -9,7 +9,6 @@ using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converter.Navisworks.DependencyInjection;
-using Speckle.Sdk.Host;
 
 namespace Speckle.Connector.Navisworks.Plugin;
 

Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/PackageContents.xml

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

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

@@ -1,4 +1,4 @@
-using Speckle.Sdk.Host;
+using Speckle.Connectors.Common;
 
 namespace Speckle.Connector.Navisworks.Plugin.Tools;
 
@@ -14,7 +14,7 @@ public static class SpeckleV3Tool
   public const string RIBBON_STRINGS = "NavisworksRibbon.name";
   public const string PLUGIN_SUFFIX = ".Speckle";
 
-  public static HostApplication App =>
+  public static Speckle.Sdk.Application App =>
 #if NAVIS
     HostApplications.Navisworks;
 #else

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

@@ -158,6 +158,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -282,18 +287,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
@@ -303,7 +306,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.revit2022": {
@@ -322,12 +325,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -354,11 +351,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Revit.API": {
@@ -369,9 +366,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -381,14 +378,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -158,6 +158,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -282,18 +287,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
@@ -303,7 +306,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.revit2023": {
@@ -322,12 +325,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -354,11 +351,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Revit.API": {
@@ -369,9 +366,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -381,14 +378,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -158,6 +158,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -282,18 +287,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
@@ -303,7 +306,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.revit2024": {
@@ -322,12 +325,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -354,11 +351,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Revit.API": {
@@ -369,9 +366,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
@@ -381,14 +378,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     }
   }

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

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CefSharp.Wpf.NETCore" IncludeAssets="compile" VersionOverride="119.4.30.0" />
+    <PackageReference Include="CefSharp.Wpf.NETCore" NoWarn="NU1903" IncludeAssets="compile" VersionOverride="119.4.30.0" />
     <PackageReference Include="Revit.Async" />
   </ItemGroup>
 

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

@@ -143,6 +143,11 @@
           "Microsoft.Extensions.Configuration": "2.2.0"
         }
       },
+      "Microsoft.Extensions.DependencyInjection.Abstractions": {
+        "type": "Transitive",
+        "resolved": "2.2.0",
+        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
+      },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
         "resolved": "2.2.0",
@@ -232,18 +237,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.7, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )",
+          "Speckle.Sdk": "[3.2.2, )",
+          "Speckle.Sdk.Dependencies": "[3.2.2, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.7, )",
-          "Speckle.Sdk.Dependencies": "[3.1.7, )"
+          "Speckle.Connectors.Common": "[1.0.0, )"
         }
       },
       "speckle.connectors.logging": {
@@ -253,7 +256,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.7, )"
+          "Speckle.Objects": "[3.2.2, )"
         }
       },
       "speckle.converters.revit2025": {
@@ -272,12 +275,6 @@
           "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
         }
       },
-      "Microsoft.Extensions.DependencyInjection.Abstractions": {
-        "type": "CentralTransitive",
-        "requested": "[8.0.0, )",
-        "resolved": "2.2.0",
-        "contentHash": "f9hstgjVmr6rmrfGSpfsVOl2irKAgr1QjrSi3FgnS7kulxband50f2brRLwySAQTADPZeTdow0mpSMcoAdadCw=="
-      },
       "Microsoft.Extensions.Logging": {
         "type": "CentralTransitive",
         "requested": "[2.2.0, )",
@@ -304,11 +301,11 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "Htg6IeMLTTf8fTaOKEKMPZzrseu4NAtVpiZwVtLhg7ZzdndW8WlsvEyFRShK1o3hxlPsQJOA5qfsTvf5fcz/pQ==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "W6HlBPGxh3Ol4fUUKaEsdmK0jGgkNvjmhYdput/PIVsskpSwFTOwHf1xfsfk7+OxGLXJFcCuYVgToSX8U317mw==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.7"
+          "Speckle.Sdk": "3.2.2"
         }
       },
       "Speckle.Revit.API": {
@@ -319,9 +316,9 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "oi6fz5fSsWZ+VQiZukpom/fKHRH++Vlyf8a6rlkYQPj6NAqTIV3Rgthalt7Y7wWxGNRIP4KMdGTXvrN7wqCcjA==",
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "98OHYUKjycsEXrrY3BkwR5EfkoeFD7Yq3GLqpLnQKU3CBXMpjk1sONzX/W1QRhxyxs32zJYJEgqNWpRHgNF7Zg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -330,14 +327,14 @@
           "Microsoft.Extensions.Logging": "2.2.0",
           "Speckle.DoubleNumerics": "4.1.0",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.7"
+          "Speckle.Sdk.Dependencies": "3.2.2"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.7, )",
-        "resolved": "3.1.7",
-        "contentHash": "T7FgbPXh9zI+VkC7f9I5qchtktEhslIOo2xeCm4VKRhImrR7naTmZInQ5MXIZvRfawZlPEg6u0tWzCV1q7ov9g=="
+        "requested": "[3.2.2, )",
+        "resolved": "3.2.2",
+        "contentHash": "hLQgfPC/aVJsrSr1m7vKrw6+IhCXdHFKbwgm6yYftkhaaAykk3cmD1h75MBwZ8Cack5z8zA467CWxPb9KRD5KA=="
       }
     },
     "net8.0-windows7.0/win-x64": {

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

@@ -10,6 +10,7 @@ using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.Revit.Plugin;
 using Speckle.Converters.Common;
+using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Converters.RevitShared.Settings;
 using Speckle.Sdk;
 
@@ -27,6 +28,7 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
   private readonly IServiceProvider _serviceProvider;
   private readonly IRevitConversionSettingsFactory _revitConversionSettingsFactory;
   private readonly ISpeckleApplication _speckleApplication;
+  private readonly RevitToHostCacheSingleton _revitToHostCacheSingleton;
   private ReceiveBindingUICommands Commands { get; }
 
   public RevitReceiveBinding(
@@ -37,7 +39,8 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
     IOperationProgressManager operationProgressManager,
     ILogger<RevitReceiveBinding> logger,
     IRevitConversionSettingsFactory revitConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
+    ISpeckleApplication speckleApplication,
+    RevitToHostCacheSingleton revitToHostCacheSingleton
   )
   {
     Parent = parent;
@@ -48,6 +51,7 @@ internal sealed class RevitReceiveBinding : IReceiveBinding
     _revitConversionSettingsFactory = revitConversionSettingsFactory;
     _speckleApplication = speckleApplication;
     _cancellationManager = cancellationManager;
+    _revitToHostCacheSingleton = revitToHostCacheSingleton;
 
     Commands = new ReceiveBindingUICommands(parent);
   }

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

@@ -206,8 +206,13 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
     var elementsOnMainModel = allElements.Where(el => el is not RevitLinkInstance).ToList();
     var linkedModels = allElements.OfType<RevitLinkInstance>().ToList();
 
-    // create context for main document elements
-    List<DocumentToConvert> documentElementContexts = [new(null, activeUIDoc.Document, elementsOnMainModel)];
+    // should ideally reuse the initialized value from the scoped IConverterSettingsStore<RevitConversionSettings>.
+    // but, it's scoped and to avoid bigger scarier changes I'm re-fetching the setting here (inexpensive operation?)
+    Transform? mainModelTransform = _toSpeckleSettingsManager.GetReferencePointSetting(modelCard);
+    List<DocumentToConvert> documentElementContexts =
+    [
+      new(mainModelTransform, activeUIDoc.Document, elementsOnMainModel)
+    ];
 
     // get the linked models setting - this decision belongs at this level
     bool includeLinkedModels = _toSpeckleSettingsManager.GetLinkedModelsSetting(modelCard);
@@ -226,14 +231,18 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
           continue;
         }
 
-        var transform = linkedModel.GetTotalTransform().Inverse;
+        // transform maps linked model elements into the main model's reference point coordinate system
+        // first apply the user's reference point transform (setting) then adjust for the linked model's placement relative to host.
+        Transform transform = (mainModelTransform ?? Transform.Identity).Multiply(
+          linkedModel.GetTotalTransform().Inverse
+        );
 
         // decision about whether to process elements is made here, not in the handler
         // only collects elements from linked models when the setting is enabled
         if (includeLinkedModels)
         {
           // handler is only responsible for element collection mechanics
-          var linkedElements = _linkedModelHandler.GetLinkedModelElements(modelCard.SendFilter, linkedDoc);
+          var linkedElements = _linkedModelHandler.GetLinkedModelElements(modelCard.SendFilter, linkedDoc, transform);
           linkedDocumentContexts.Add(new(transform, linkedDoc, linkedElements));
         }
         // ⚠️ when disabled, still adds empty contexts to maintain warning generation in RevitRootObjectBuilder
@@ -380,7 +389,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
   /// </summary>
   private async Task CheckFilterExpiration()
   {
-    // NOTE: below code seems like more make sense in terms of performance but it causes unmanaged exception on Revit
+    // NOTE: below code seems like more make sense in terms of performance, but it causes unmanaged exception on Revit
     // using var viewCollector = new FilteredElementCollector(RevitContext.UIApplication?.ActiveUIDocument.Document);
     // var views = viewCollector.OfClass(typeof(View)).Cast<View>().Select(v => v.Id).ToList();
     // var intersection = ChangedObjectIds.Keys.Intersect(views).ToList();

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

@@ -24,7 +24,7 @@ public static class ServiceRegistration
 {
   public static void AddRevit(this IServiceCollection serviceCollection)
   {
-    serviceCollection.AddConnectorUtils();
+    serviceCollection.AddConnectors();
     serviceCollection.AddDUI<RevitThreadContext, RevitDocumentStore>();
     RegisterUiDependencies(serviceCollection);
 
@@ -61,6 +61,7 @@ public static class ServiceRegistration
     serviceCollection.AddScoped<ITransactionManager, TransactionManager>();
     serviceCollection.AddScoped<RevitGroupBaker>();
     serviceCollection.AddScoped<RevitMaterialBaker>();
+    serviceCollection.AddScoped<RevitViewManager>();
     serviceCollection.AddSingleton<RevitUtils>();
     serviceCollection.AddSingleton<IFailuresPreprocessor, HideWarningsFailuresPreprocessor>();
     serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());

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

@@ -4,6 +4,7 @@ using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.RevitShared;
 using Speckle.Connectors.RevitShared.Operations.Send.Filters;
 using Speckle.Converters.RevitShared.Helpers;
+using Speckle.Sdk;
 using Speckle.Sdk.Common;
 
 namespace Speckle.Connectors.Revit.HostApp;
@@ -29,7 +30,7 @@ public class LinkedModelHandler
   /// This method handles the specifics of element collection but doesn't make decisions
   /// about whether the linked model should be processed - that's the caller's responsibility.
   /// </summary>
-  public List<Element> GetLinkedModelElements(ISendFilter sendFilter, Document linkedDocument)
+  public List<Element> GetLinkedModelElements(ISendFilter sendFilter, Document linkedDocument, Transform? transform)
   {
     // send mode → Categories
     if (sendFilter is RevitCategoriesFilter categoryFilter && categoryFilter.SelectedCategories is not null)
@@ -51,7 +52,8 @@ public class LinkedModelHandler
     {
       RevitLinkInstance linkInstance = FindLinkInstanceForDocument(
         linkedDocument.PathName,
-        _revitContext.UIApplication.NotNull().ActiveUIDocument.Document
+        _revitContext.UIApplication.NotNull().ActiveUIDocument.Document,
+        transform
       );
 
 #if REVIT2024_OR_GREATER
@@ -166,13 +168,44 @@ public class LinkedModelHandler
     return collector.WhereElementIsNotElementType().WhereElementIsViewIndependent().ToList();
   }
 
-  private RevitLinkInstance FindLinkInstanceForDocument(string linkedDocumentPath, Document mainDocument)
+  /// <summary>
+  /// Finds a specific RevitLinkInstance that corresponds to a linked document with a matching transform.
+  /// </summary>
+  /// <param name="linkedDocumentPath">The file path of the linked document</param>
+  /// <param name="transform">The transform to match (expected to already be an inverse transform).
+  /// When provided with multiple instances of the same linked document, this is used to find the specific instance.</param>
+  /// <param name="mainDocument">The main Revit document containing the link instances</param>
+  /// <returns>The matching RevitLinkInstance, or the first available instance if no match is found</returns>
+  private RevitLinkInstance FindLinkInstanceForDocument(
+    string linkedDocumentPath,
+    Document mainDocument,
+    Transform? transform
+  )
   {
     using var collector = new FilteredElementCollector(mainDocument);
-    return collector
+    var linkInstances = collector
       .OfClass(typeof(RevitLinkInstance))
       .Cast<RevitLinkInstance>()
-      .FirstOrDefault(link => link.GetLinkDocument()?.PathName == linkedDocumentPath)
-      .NotNull();
+      .Where(link => link.GetLinkDocument()?.PathName == linkedDocumentPath)
+      .ToList();
+
+    // if no transform or only one instance, just return the first
+    if (transform == null || linkInstances.Count <= 1)
+    {
+      return linkInstances.FirstOrDefault()
+        ?? throw new SpeckleException($"No link instance found for {linkedDocumentPath}");
+    }
+
+    // a match consists of not only the linked document path name but the transformation too (think linked instances)
+    // precompute our target hash once
+    string targetHash = GetTransformHash(transform);
+
+    // directly find the matching instance
+    var matchingInstance = linkInstances.FirstOrDefault(link =>
+      GetTransformHash(link.GetTotalTransform().Inverse) == targetHash
+    );
+
+    // return matching with a fallback to first (main) instance in case something goes funky with the hash
+    return matchingInstance ?? linkInstances.First();
   }
 }

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

@@ -0,0 +1,32 @@
+using Autodesk.Revit.DB;
+
+namespace Speckle.Connectors.Revit.HostApp;
+
+/// <summary>
+/// Handles Revit Views per Send/Receive, e.g. determines whether the View is supported for specific operation.
+/// </summary>
+public class RevitViewManager
+{
+  /// <summary>
+  /// Determine if the View is supported for Receive operation. Currently only 3d view or horizontal 2d views are supported.
+  /// Views like Section, Elevation, ViewSheet etc. are not supported
+  /// </summary>
+  public bool IsSupportedReceiveView(View activeView)
+  {
+    switch (activeView.ViewType)
+    {
+      case ViewType.ThreeD:
+      case ViewType.FloorPlan:
+      case ViewType.AreaPlan:
+      case ViewType.CeilingPlan:
+        return true;
+      case ViewType.Detail:
+        return IsHorizontalView(activeView);
+
+      default:
+        return false;
+    }
+  }
+
+  private bool IsHorizontalView(View activeView) => Math.Abs(activeView.ViewDirection.Z - 1) < 0.00001;
+}

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

@@ -13,7 +13,25 @@ public static class SupportedCategoriesUtils
   /// <returns></returns>
   public static bool IsSupportedCategory(Category? category)
   {
-    if (category is null || !category.IsVisibleInUI)
+    if (category is null)
+    {
+      return false;
+    }
+
+    // stacked walls are "not visible in the ui" whereas they clearly are.
+    // see [CNX-1301: Revit Stacked Walls are not sending](https://linear.app/speckle/issue/CNX-1301/revit-stacked-walls-are-not-sending)
+#if REVIT2023_OR_GREATER
+    if (category.BuiltInCategory == BuiltInCategory.OST_StackedWalls)
+    {
+      return true;
+    }
+#else
+    if (category.Name == "Stacked Walls")
+    {
+      return true;
+    }
+#endif
+    if (!category.IsVisibleInUI) //&& category.BuiltInCategory != BuiltInCategory.OST_StackedWalls)
     {
       return false;
     }

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

@@ -61,6 +61,17 @@ public sealed class RevitHostObjectBuilder(
     CancellationToken cancellationToken
   )
   {
+    // TODO: formalise getting transform info from rootObject. this dict access is gross.
+    Autodesk.Revit.DB.Transform? referencePointTransform = null;
+    if (
+      rootObject.DynamicPropertyKeys.Contains(ReferencePointHelper.REFERENCE_POINT_TRANSFORM_KEY)
+      && rootObject[ReferencePointHelper.REFERENCE_POINT_TRANSFORM_KEY] is Dictionary<string, object> transformDict
+      && transformDict.TryGetValue("transform", out var transformValue)
+    )
+    {
+      referencePointTransform = ReferencePointHelper.GetTransformFromRootObject(transformValue);
+    }
+
     var baseGroupName = $"Project {projectName}: Model {modelName}"; // TODO: unify this across connectors!
 
     onOperationProgressed.Report(new("Converting", null));
@@ -110,7 +121,17 @@ public sealed class RevitHostObjectBuilder(
     {
       using var _ = activityFactory.Start("Baking objects");
       transactionManager.StartTransaction(true, "Baking objects");
-      conversionResults = BakeObjects(localToGlobalMaps, onOperationProgressed, cancellationToken);
+      using (
+        converterSettings.Push(currentSettings =>
+          currentSettings with
+          {
+            ReferencePointTransform = referencePointTransform
+          }
+        )
+      )
+      {
+        conversionResults = BakeObjects(localToGlobalMaps, onOperationProgressed, cancellationToken);
+      }
       transactionManager.CommitTransaction();
     }
 

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

@@ -16,6 +16,7 @@ public class RevitCategoriesFilter : DiscriminatedObject, ISendFilter, IRevitSen
   private Document? _doc;
   public string Id { get; set; } = "revitCategories";
   public string Name { get; set; } = "Categories";
+  public string Type { get; set; } = "Custom";
   public string? Summary { get; set; }
   public bool IsDefault { get; set; }
   public List<string> SelectedObjectIds { get; set; } = new();

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

@@ -12,6 +12,7 @@ public class RevitViewsFilter : DiscriminatedObject, ISendFilter, IRevitSendFilt
   private Document? _doc;
   public string Id { get; set; } = "revitViews";
   public string Name { get; set; } = "Views";
+  public string Type { get; set; } = "Custom";
   public string? Summary { get; set; }
   public bool IsDefault { get; set; }
   public string? SelectedView { get; set; }

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

@@ -241,6 +241,13 @@ public class RevitRootObjectBuilder(
     // NOTE: these are currently not used anywhere, we'll skip them until someone calls for it back
     // rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions;
 
+    // we want to store transform data for chosen reference point setting
+    if (converterSettings.Current.ReferencePointTransform is Transform transform)
+    {
+      var transformMatrix = ReferencePointHelper.CreateTransformDataForRootObject(transform);
+      rootObject[ReferencePointHelper.REFERENCE_POINT_TRANSFORM_KEY] = transformMatrix;
+    }
+
     return new RootObjectBuilderResult(rootObject, results);
   }
 }

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

@@ -174,9 +174,6 @@ public class ToSpeckleSettingsManager : IToSpeckleSettingsManager
 
         case ReferencePointType.InternalOrigin:
           break;
-
-        default:
-          break;
       }
 
       return referencePointTransform;

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

@@ -3,7 +3,6 @@ using System.IO;
 using System.Reflection;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Autodesk.Revit.ApplicationServices;
 using Autodesk.Revit.UI;
 using CefSharp;
 using Microsoft.Extensions.DependencyInjection;
@@ -101,7 +100,7 @@ internal sealed class RevitCefPlugin : IRevitPlugin
 
   private void OnApplicationInitialized(object? sender, Autodesk.Revit.DB.Events.ApplicationInitializedEventArgs e)
   {
-    var uiApplication = new UIApplication(sender as Application);
+    var uiApplication = new UIApplication(sender as Autodesk.Revit.ApplicationServices.Application);
     _revitContext.UIApplication = uiApplication;
 
     // POC: might be worth to interface this out, we shall see...

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

@@ -7,7 +7,6 @@ using Speckle.Connectors.DUI;
 using Speckle.Connectors.Revit.DependencyInjection;
 using Speckle.Converters.RevitShared;
 using Speckle.Sdk;
-using Speckle.Sdk.Host;
 
 namespace Speckle.Connectors.Revit.Plugin;
 

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

@@ -25,6 +25,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\LinkedModelHandler.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitMaterialBaker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\SupportedCategoriesUtils.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitViewManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\HideWarningsFailuresPreprocessor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\IdStorageSchema.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\IStorageSchema.cs" />

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/BaseComponents/SpeckleScopedTaskCapableComponent.cs

@@ -1,25 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Grasshopper8.Registration;
-
-namespace Speckle.Connectors.Grasshopper8.Components.BaseComponents;
-
-public abstract class SpeckleScopedTaskCapableComponent<TInput, TOutput>(
-  string name,
-  string nickname,
-  string description,
-  string category,
-  string subCategory
-) : SpeckleTaskCapableComponent<TInput, TOutput>(name, nickname, description, category, subCategory)
-{
-  protected override Task<TOutput> PerformTask(TInput input, CancellationToken cancellationToken = default)
-  {
-    /*using*/var scope = PriorityLoader.Container.CreateScope(); // NOTE: this component does not work as intended in e.g the receive component; the scope gets disposed before the task completes.
-    return PerformScopedTask(input, scope, cancellationToken);
-  }
-
-  protected abstract Task<TOutput> PerformScopedTask(
-    TInput input,
-    IServiceScope scope,
-    CancellationToken cancellationToken = default
-  );
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/BaseComponents/SpeckleTaskCapableComponent.cs

@@ -1,60 +0,0 @@
-using Grasshopper.Kernel;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.Grasshopper8.Components.BaseComponents;
-
-public abstract class SpeckleTaskCapableComponent<TInput, TOutput>(
-  string name,
-  string nickname,
-  string description,
-  string category,
-  string subCategory
-) : GH_TaskCapableComponent<TOutput>(name, nickname, description, category, subCategory)
-{
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    //TODO: We're missing activity and logging here. Will enable it for all inherited classes.
-
-    if (InPreSolve)
-    {
-      // Collect the data and create the task
-      try
-      {
-        var input = GetInput(da);
-        TaskList.Add(PerformTask(input, CancelToken));
-      }
-      catch (SpeckleException e)
-      {
-        Console.WriteLine(e);
-      }
-      return;
-    }
-
-    if (!GetSolveResults(da, out TOutput result))
-    {
-      // INFO: This will run synchronously. Useful for Rhino.Compute runs, but can also be enabled by user.
-      try
-      {
-        TInput input = GetInput(da);
-        var syncResult = PerformTask(input).Result;
-        result = syncResult;
-      }
-      catch (SpeckleException e)
-      {
-        Console.WriteLine(e);
-        return;
-      }
-    }
-
-    if (result is not null)
-    {
-      SetOutput(da, result);
-    }
-  }
-
-  protected abstract TInput GetInput(IGH_DataAccess da);
-
-  protected abstract void SetOutput(IGH_DataAccess da, TOutput result);
-
-  protected abstract Task<TOutput> PerformTask(TInput input, CancellationToken cancellationToken = default);
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Collections/CollectionPathsSelector.cs

@@ -1,71 +0,0 @@
-using Grasshopper.Kernel.Types;
-using Speckle.Connectors.Grasshopper8.Components.BaseComponents;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Collections;
-
-public class CollectionPathsSelector : ValueSet<IGH_Goo>
-{
-  public CollectionPathsSelector()
-    : base(
-      "Collection Paths Selector",
-      "Paths",
-      "Allows you to select a set of collection paths for filtering",
-      "Speckle",
-      "Collections"
-    ) { }
-
-  public override Guid ComponentGuid => new Guid("65FC4D58-2209-41B6-9B22-BE51C8B28604");
-
-  protected override void LoadVolatileData()
-  {
-    var collections = VolatileData
-      .AllData(true)
-      .OfType<SpeckleCollectionWrapperGoo>()
-      .Select(goo => goo.Value)
-      .ToList();
-    if (collections.Count == 0)
-    {
-      return;
-    }
-
-    // NOTE: supporting multiple collections? maybe? not really?
-    var paths = new List<string>();
-    foreach (SpeckleCollectionWrapper col in collections)
-    {
-      paths.AddRange(GetPaths(col.Collection));
-    }
-    m_data.AppendRange(paths.Select(s => new GH_String(s)));
-  }
-
-  private List<string> GetPaths(Collection c)
-  {
-    var currentPath = new List<string>();
-    var allPaths = new HashSet<string>();
-
-    void GetPathsInternal(Collection col)
-    {
-      currentPath.Add(col.name);
-      var subCols = col.elements.OfType<SpeckleCollectionWrapper>().ToList();
-
-      // NOTE: here we're basically outputting only paths that correspond to a collection
-      // that has values inside of it.
-      if (subCols.Count != col.elements.Count)
-      {
-        allPaths.Add(string.Join(Constants.LAYER_PATH_DELIMITER, currentPath));
-      }
-
-      foreach (var subCol in subCols)
-      {
-        GetPathsInternal(subCol.Collection);
-      }
-      currentPath.RemoveAt(currentPath.Count - 1);
-    }
-
-    GetPathsInternal(c);
-
-    return allPaths.ToList();
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Collections/CreateCollection.cs

@@ -1,178 +0,0 @@
-using System.Collections.ObjectModel;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Parameters;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.HostApp.Extras;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Collections;
-
-#pragma warning disable CA1711
-public class CreateCollection : GH_Component, IGH_VariableParameterComponent
-#pragma warning restore CA1711
-{
-  public override Guid ComponentGuid => new("BDCE743E-7BDB-479B-AA81-19854AB5A254");
-
-  protected override Bitmap Icon => BitmapBuilder.CreateCircleIconBitmap("cC");
-
-  private readonly DebounceDispatcher _debounceDispatcher = new();
-
-  public CreateCollection()
-    : base("Create collection", "Create collection", "Creates a new collection", "Speckle", "Collections") { }
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    var p = CreateParameter(GH_ParameterSide.Input, 0);
-    pManager.AddParameter(p);
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddGenericParameter("Layer", "L", "Collection that was created", GH_ParamAccess.tree);
-  }
-
-  protected override void SolveInstance(IGH_DataAccess dataAccess)
-  {
-    string rootName = "Unnamed";
-    Collection rootCollection = new() { name = rootName, applicationId = InstanceGuid.ToString() };
-    SpeckleCollectionWrapper rootSpeckleCollectionWrapper = new(rootCollection, new() { rootName }, null);
-
-    foreach (var inputParam in Params.Input)
-    {
-      var data = inputParam.VolatileData.AllData(true).ToList();
-      if (data.Count == 0)
-      {
-        continue;
-      }
-
-      var inputCollections = data.OfType<SpeckleCollectionWrapperGoo>().Empty().ToList();
-      var inputNonCollections = data.Where(t => t is not SpeckleCollectionWrapperGoo).Empty().ToList();
-      if (inputCollections.Count != 0 && inputNonCollections.Count != 0)
-      {
-        // TODO: error out! we want to disallow setting objects and collections in the same parent collection
-        AddRuntimeMessage(
-          GH_RuntimeMessageLevel.Error,
-          $"Parameter {inputParam.NickName} should not contain both objects and collections."
-        );
-        return;
-      }
-
-      List<string> childPath = new() { rootName };
-      childPath.Add(inputParam.NickName);
-      Collection childCollection = new(inputParam.NickName) { applicationId = inputParam.InstanceGuid.ToString() };
-      SpeckleCollectionWrapper childSpeckleCollectionWrapper =
-        new(childCollection, childPath, null) { Topology = GrasshopperHelpers.GetParamTopology(inputParam) };
-
-      // if on this port we're only receiving collections, we should become "pass-through" to not create
-      // needless nesting
-      if (inputCollections.Count == data.Count)
-      {
-        var nameTest = new HashSet<string>();
-        foreach (SpeckleCollectionWrapperGoo collection in inputCollections)
-        {
-          // update the speckle collection path
-          collection.Value.Path = new ObservableCollection<string>(childPath);
-
-          foreach (
-            string subCollectionName in collection
-              .Value.Collection.elements.OfType<SpeckleCollectionWrapper>()
-              .Select(v => v.Collection.name)
-          )
-          {
-            var hasNotSeenNameBefore = nameTest.Add(subCollectionName);
-            if (!hasNotSeenNameBefore)
-            {
-              AddRuntimeMessage(
-                GH_RuntimeMessageLevel.Error,
-                $"Duplicate collection name found: {subCollectionName} in input parameter {inputParam.NickName}. Please ensure collection names are unique per nesting level.\n See https://speckle.docs/grashopper/collections"
-              );
-              return;
-            }
-          }
-
-          childSpeckleCollectionWrapper.Collection.elements.AddRange(collection.Value.Collection.elements);
-        }
-
-        rootSpeckleCollectionWrapper.Collection.elements.Add(childSpeckleCollectionWrapper);
-        continue;
-      }
-
-      foreach (var obj in data)
-      {
-        SpeckleObjectWrapperGoo wrapperGoo = new();
-        if (wrapperGoo.CastFrom(obj))
-        {
-          wrapperGoo.Value.Path = childPath;
-          wrapperGoo.Value.Parent = childSpeckleCollectionWrapper;
-          childSpeckleCollectionWrapper.Collection.elements.Add(wrapperGoo.Value);
-        }
-      }
-
-      rootSpeckleCollectionWrapper.Collection.elements.Add(childSpeckleCollectionWrapper);
-    }
-
-    dataAccess.SetData(0, new SpeckleCollectionWrapperGoo(rootSpeckleCollectionWrapper));
-  }
-
-  public bool CanInsertParameter(GH_ParameterSide side, int index)
-  {
-    return side == GH_ParameterSide.Input;
-  }
-
-  public bool CanRemoveParameter(GH_ParameterSide side, int index)
-  {
-    return side == GH_ParameterSide.Input;
-  }
-
-  public IGH_Param CreateParameter(GH_ParameterSide side, int index)
-  {
-    var myParam = new Param_GenericObject
-    {
-      Name = $"Layer {Params.Input.Count + 1}",
-      MutableNickName = true,
-      Optional = true,
-      Access = GH_ParamAccess.tree // always tree
-    };
-
-    myParam.NickName = myParam.Name;
-    myParam.Optional = true;
-    return myParam;
-  }
-
-  public bool DestroyParameter(GH_ParameterSide side, int index)
-  {
-    return side == GH_ParameterSide.Input;
-  }
-
-  public void VariableParameterMaintenance()
-  {
-    // TODO?
-  }
-
-  public override void AddedToDocument(GH_Document document)
-  {
-    base.AddedToDocument(document);
-    Params.ParameterChanged += (sender, args) =>
-    {
-      if (args.ParameterSide == GH_ParameterSide.Output)
-      {
-        return;
-      }
-      switch (args.OriginalArguments.Type)
-      {
-        case GH_ObjectEventType.NickName:
-          // This means the user is typing characters, debounce until it stops for 400ms before expiring the solution.
-          // Prevents UI from locking too soon while writing new names for inputs.
-          args.Parameter.Name = args.Parameter.NickName;
-          _debounceDispatcher.Debounce(500, e => ExpireSolution(true));
-          break;
-        case GH_ObjectEventType.NickNameAccepted:
-          args.Parameter.Name = args.Parameter.NickName;
-          ExpireSolution(true);
-          break;
-      }
-    };
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Collections/ExpandCollection.cs

@@ -1,268 +0,0 @@
-using System.Collections;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Parameters;
-using Rhino.Geometry;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Collections;
-
-#pragma warning disable CA1711
-public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
-#pragma warning restore CA1711
-{
-  public override Guid ComponentGuid => new("69BC8CFB-A72F-4A83-9263-F3399DDA2E5E");
-
-  protected override Bitmap Icon => BitmapBuilder.CreateCircleIconBitmap("eC");
-
-  public ExpandCollection()
-    : base("Expand Collection", "expand", "Expands a new collection", "Speckle", "Collections") { }
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(
-      new SpeckleCollectionParam(GH_ParamAccess.item),
-      "Data",
-      "D",
-      "The data you want to expand",
-      GH_ParamAccess.item
-    );
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager) { }
-
-  private List<SpeckleObjectWrapper> _previewObjects = new();
-
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    SpeckleCollectionWrapperGoo res = new();
-    da.GetData(0, ref res);
-    var c = res.Value;
-    if (c is null)
-    {
-      return;
-    }
-    Name = c.Collection.name;
-    NickName = c.Collection.name;
-
-    var objects = c
-      .Collection.elements.Where(el => el is not SpeckleCollectionWrapper)
-      .OfType<SpeckleObjectWrapper>()
-      .Select(o => new SpeckleObjectWrapperGoo(o))
-      .ToList();
-    var collections = c
-      .Collection.elements.Where(el => el is SpeckleCollectionWrapper)
-      .OfType<SpeckleCollectionWrapper>()
-      .ToList();
-
-    var outputParams = new List<OutputParamWrapper>();
-    if (objects.Count != 0)
-    {
-      var param = new Param_GenericObject()
-      {
-        Name = "Inner objects",
-        NickName = "Inner Objs",
-        Description =
-          "Some collections may contain a mix of objects and other collections. Here we output the atomic objects from within this collection.",
-        Access = GH_ParamAccess.list
-      };
-
-      outputParams.Add(new OutputParamWrapper(param, objects, null));
-    }
-
-    foreach (SpeckleCollectionWrapper collection in collections)
-    {
-      // skip empty
-      if (collection.Collection.elements.Count == 0)
-      {
-        continue;
-      }
-
-      var hasInnerCollections = collection.Collection.elements.Any(el => el is SpeckleCollectionWrapper);
-      var topology = collection.Topology; // Note: this is a reminder for the future
-      var nickName = collection.Collection.name;
-      if (collection.Collection.name.Length > 16)
-      {
-        nickName = collection.Collection.name[..3];
-        nickName += "..." + collection.Collection.name[^3..];
-      }
-
-      var param = new Param_GenericObject()
-      {
-        Name = collection.Collection.name,
-        NickName = nickName,
-        Access = hasInnerCollections
-          ? GH_ParamAccess.item
-          : topology is null
-            ? GH_ParamAccess.list
-            : GH_ParamAccess.tree // we will directly set objects out; note access can be list or tree based on whether it will be a path based collection
-      };
-      if (!hasInnerCollections)
-      {
-        _previewObjects.AddRange(collection.Collection.elements.Cast<SpeckleObjectWrapper>());
-      }
-
-      outputParams.Add(
-        new OutputParamWrapper(
-          param,
-          hasInnerCollections
-            ? new SpeckleCollectionWrapperGoo(collection)
-            : collection
-              .Collection.elements.OfType<SpeckleObjectWrapper>()
-              .Select(o => new SpeckleObjectWrapperGoo(o))
-              .ToList(),
-          topology
-        )
-      );
-    }
-
-    if (da.Iteration == 0 && OutputMismatch(outputParams))
-    {
-      OnPingDocument()
-        .ScheduleSolution(
-          5,
-          _ =>
-          {
-            CreateOutputs(outputParams);
-          }
-        );
-    }
-    else
-    {
-      _previewObjects = new();
-
-      FlattenForPreview(c.Collection);
-      for (int i = 0; i < outputParams.Count; i++)
-      {
-        var outParam = Params.Output[i];
-        var outParamWrapper = outputParams[i];
-        switch (outParam.Access)
-        {
-          case GH_ParamAccess.item:
-            da.SetData(i, outParamWrapper.Values);
-            break;
-          case GH_ParamAccess.list:
-            da.SetDataList(i, outParamWrapper.Values as IList);
-            break;
-          case GH_ParamAccess.tree:
-            //TODO: means we need to convert the collection to a tree
-            var topo = outParamWrapper.Topology.NotNull();
-            var values = outParamWrapper.Values as IList;
-            var tree = GrasshopperHelpers.CreateDataTreeFromTopologyAndItems(topo, values.NotNull());
-            da.SetDataTree(i, tree);
-            break;
-        }
-      }
-    }
-  }
-
-  private BoundingBox _clippingBox;
-  public override BoundingBox ClippingBox => _clippingBox;
-
-  private void FlattenForPreview(Collection c)
-  {
-    _clippingBox = new BoundingBox();
-    foreach (var element in c.elements)
-    {
-      if (element is Collection subCol)
-      {
-        FlattenForPreview(subCol);
-      }
-
-      if (element is SpeckleObjectWrapper sg)
-      {
-        _previewObjects.Add(sg);
-        var box = sg.GeometryBase.GetBoundingBox(false);
-        _clippingBox.Union(box);
-      }
-    }
-  }
-
-  // public override void DrawViewportWires(IGH_PreviewArgs args) => base.DrawViewportWires(args);
-  public override void DrawViewportMeshes(IGH_PreviewArgs args)
-  {
-    if (_previewObjects.Count == 0)
-    {
-      return;
-    }
-    var isSelected = args.Document.SelectedObjects().Contains(this);
-    foreach (var elem in _previewObjects)
-    {
-      elem.DrawPreview(args, isSelected);
-    }
-  }
-
-  private bool OutputMismatch(List<OutputParamWrapper> outputParams)
-  {
-    if (Params.Output.Count != outputParams.Count)
-    {
-      return true;
-    }
-
-    var count = 0;
-    foreach (var newParam in outputParams)
-    {
-      var oldParam = Params.Output[count];
-      if (
-        oldParam.NickName != newParam.Param.NickName
-        || oldParam.Name != newParam.Param.Name
-        || oldParam.Access != newParam.Param.Access
-      )
-      {
-        return true;
-      }
-      count++;
-    }
-
-    return false;
-  }
-
-  private void CreateOutputs(List<OutputParamWrapper> outputParams)
-  {
-    // TODO: better, nicer handling of creation/removal
-    while (Params.Output.Count > 0)
-    {
-      Params.UnregisterOutputParameter(Params.Output[^1]);
-    }
-
-    foreach (var newParam in outputParams)
-    {
-      var param = new Param_GenericObject
-      {
-        Name = newParam.Param.Name,
-        NickName = newParam.Param.NickName,
-        MutableNickName = false,
-        Access = newParam.Param.Access
-      };
-      Params.RegisterOutputParam(param);
-    }
-
-    Params.OnParametersChanged();
-    VariableParameterMaintenance();
-    ExpireSolution(false);
-  }
-
-  public void VariableParameterMaintenance() { }
-
-  public bool CanInsertParameter(GH_ParameterSide side, int index) => false;
-
-  public bool CanRemoveParameter(GH_ParameterSide side, int index) => false;
-
-  public IGH_Param CreateParameter(GH_ParameterSide side, int index)
-  {
-    var myParam = new Param_GenericObject
-    {
-      Name = GH_ComponentParamServer.InventUniqueNickname("ABCD", Params.Input),
-      MutableNickName = true,
-      Optional = true
-    };
-    myParam.NickName = myParam.Name;
-    return myParam;
-  }
-
-  public bool DestroyParameter(GH_ParameterSide side, int index) => side == GH_ParameterSide.Output;
-}
-
-public record OutputParamWrapper(Param_GenericObject Param, object Values, string? Topology);

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Collections/FilterObjectsByCollectionPaths.cs

@@ -1,103 +0,0 @@
-using Grasshopper.Kernel;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Collections;
-
-/// <summary>
-/// Given a collection and a path, this component will output the objects in the corresponding collection.
-/// Note: This component does not flatten the selected collection - if it contains sub collections those will not
-/// be outputted.
-///
-/// To extract those objects out, you should select that specific sub path as well.
-/// </summary>
-public class FilterObjectsByCollectionPaths : GH_Component
-{
-  public override Guid ComponentGuid => new("77CAEE94-F0B9-4611-897C-71F2A22BA311");
-
-  public FilterObjectsByCollectionPaths()
-    : base(
-      "FilterObjectsByCollectionPaths",
-      "ocF",
-      "Filters model objects by their collection path",
-      "Speckle",
-      "Collections"
-    ) { }
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(
-      new SpeckleCollectionParam(),
-      "Collection",
-      "C",
-      "Collection to filter objects from",
-      GH_ParamAccess.item
-    );
-    pManager.AddTextParameter("Path", "P", "Collection path to filter by", GH_ParamAccess.item);
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddParameter(
-      new SpeckleObjectParam(),
-      "Objects",
-      "O",
-      "The contents of the selected collection",
-      GH_ParamAccess.tree
-    );
-  }
-
-  protected override void SolveInstance(IGH_DataAccess dataAccess)
-  {
-    string path = "";
-    dataAccess.GetData(1, ref path);
-
-    if (string.IsNullOrEmpty(path))
-    {
-      return;
-    }
-
-    SpeckleCollectionWrapperGoo collectionWrapperGoo = new();
-    dataAccess.GetData(0, ref collectionWrapperGoo);
-
-    if (collectionWrapperGoo.Value == null)
-    {
-      return;
-    }
-
-    SpeckleCollectionWrapper targetCollectionWrapper = FindCollection(collectionWrapperGoo.Value, path);
-    if (string.IsNullOrEmpty(targetCollectionWrapper.Topology))
-    {
-      dataAccess.SetDataList(0, targetCollectionWrapper.Collection.elements);
-    }
-    else
-    {
-      var tree = GrasshopperHelpers.CreateDataTreeFromTopologyAndItems(
-        targetCollectionWrapper.Topology,
-        targetCollectionWrapper.Collection.elements
-      );
-      dataAccess.SetDataTree(0, tree);
-    }
-  }
-
-  private SpeckleCollectionWrapper FindCollection(SpeckleCollectionWrapper root, string unifiedPath)
-  {
-    // POC: SpeckleCollections now have a full list<string> path prop on them always. Is this easier to use?
-    List<string> paths = unifiedPath.Split([Constants.LAYER_PATH_DELIMITER], StringSplitOptions.None).Skip(1).ToList();
-    SpeckleCollectionWrapper currentCollectionWrapper = root;
-    while (paths.Count != 0)
-    {
-      currentCollectionWrapper = currentCollectionWrapper
-        .Collection.elements.OfType<SpeckleCollectionWrapper>()
-        .First(col => col.Collection.name == paths.First());
-      paths.RemoveAt(0);
-      if (paths.Count == 0)
-      {
-        return currentCollectionWrapper;
-      }
-    }
-
-    throw new SpeckleException("Did not find collection");
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/ComponentUtils.cs

@@ -1,23 +0,0 @@
-namespace Speckle.Connectors.Grasshopper8.Components;
-
-// NOTE: The number of spaces determines the order in which they display in the ribbon (nice hack)
-public static class ComponentCategories
-{
-  public const string OPERATIONS = "    Operations";
-  public const string MODELS = "   Model Management";
-  public const string PARAMETERS = "Parameters";
-  public const string COLLECTIONS = "  Collections";
-  public const string PRIMARY_RIBBON = "Speckle";
-  public const string OBJECTS = " Objects";
-}
-
-public enum ComponentState
-{
-  Cancelled,
-  Expired,
-  NeedsInput,
-  Receiving,
-  Ready,
-  Sending,
-  UpToDate
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/GhContextMenuButton.cs

@@ -1,19 +0,0 @@
-using Grasshopper.Kernel;
-
-namespace Speckle.Connectors.Grasshopper8.Components;
-
-public class GhContextMenuButton(
-  string name,
-  string nickname,
-  string description,
-  Func<ToolStripDropDown, bool>? populateMenuAction = null
-) : GH_DocumentObject(name, nickname, description, "Speckle", "UI")
-{
-  public bool Enabled { get; set; } = true;
-
-  public override void CreateAttributes() => Attributes = new GhContextMenuButtonAttributes(this);
-
-  public override Guid ComponentGuid => new("B01FFD91-F4EC-4332-A9AA-F917AEDAA51D");
-
-  public override bool AppendMenuItems(ToolStripDropDown menu) => populateMenuAction?.Invoke(menu) ?? false;
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/GhContextMenuButtonAttributes.cs

@@ -1,39 +0,0 @@
-using Grasshopper.GUI;
-using Grasshopper.GUI.Canvas;
-using Grasshopper.Kernel;
-
-namespace Speckle.Connectors.Grasshopper8.Components;
-
-public class GhContextMenuButtonAttributes(GhContextMenuButton owner) : GH_Attributes<GhContextMenuButton>(owner)
-{
-  protected override void Render(GH_Canvas canvas, Graphics graphics, GH_CanvasChannel channel)
-  {
-    base.Render(canvas, graphics, channel);
-    if (channel != GH_CanvasChannel.Objects)
-    {
-      return; // No wires or other layers are being drawn in this component.
-    }
-
-    using var button1 = GH_Capsule.CreateTextCapsule(
-      Bounds,
-      Bounds,
-      Owner.Enabled ? GH_Palette.Black : GH_Palette.Grey,
-      Owner.Name,
-      2,
-      0
-    );
-    button1.Render(graphics, Parent.Selected, false, false);
-  }
-
-  public override GH_ObjectResponse RespondToMouseUp(GH_Canvas sender, GH_CanvasMouseEvent e)
-  {
-    if (!Owner.Enabled && e.Button == MouseButtons.Right)
-    {
-      // Prevents canvas from triggering the right-click behaviour, and showing the context menu.
-      return GH_ObjectResponse.Handled;
-    }
-
-    // Allowing event to bubble up to canvas will handle the event and show the context menu.
-    return base.RespondToMouseUp(sender, e);
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/Receive/GrasshopperCollectionRebuilder.cs

@@ -1,71 +0,0 @@
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations.Receive;
-
-internal sealed class GrasshopperCollectionRebuilder
-{
-  public SpeckleCollectionWrapper RootCollectionWrapper { get; }
-
-  // a cache of collection path (no delimiter) to the speckle collection
-  private readonly Dictionary<string, SpeckleCollectionWrapper> _cache = new();
-
-  public GrasshopperCollectionRebuilder(Collection baseCollection)
-  {
-    Collection newCollection = new() { name = baseCollection.name, applicationId = baseCollection.applicationId };
-    RootCollectionWrapper = new SpeckleCollectionWrapper(newCollection, new() { baseCollection.name }, null);
-  }
-
-  public void AppendSpeckleGrasshopperObject(
-    SpeckleObjectWrapper speckleGrasshopperObjectWrapper,
-    List<Collection> collectionPath
-  )
-  {
-    var collection = GetOrCreateSpeckleCollectionFromPath(collectionPath);
-    collection.Collection.elements.Add(speckleGrasshopperObjectWrapper);
-  }
-
-  public SpeckleCollectionWrapper GetOrCreateSpeckleCollectionFromPath(List<Collection> path)
-  {
-    // first check if cache already has this collection
-    string fullPath = string.Concat(path);
-    if (_cache.TryGetValue(fullPath, out SpeckleCollectionWrapper col))
-    {
-      return col;
-    }
-
-    // otherwise, iterate through the path and create speckle collections as needed
-    SpeckleCollectionWrapper previousCollectionWrapper = RootCollectionWrapper;
-    List<string> currentLayerPath = new();
-    foreach (var collection in path)
-    {
-      var collectionName = collection.name;
-      currentLayerPath.Add(collectionName);
-      string key = string.Concat(currentLayerPath);
-
-      // check cache
-      if (_cache.TryGetValue(key, out SpeckleCollectionWrapper currentCol))
-      {
-        previousCollectionWrapper = currentCol;
-        continue;
-      }
-
-      // create and cache if needed
-      Collection newCollection = new() { name = collectionName };
-      SpeckleCollectionWrapper newSpeckleCollectionWrapper = new(newCollection, currentLayerPath, null);
-
-      if (collection["topology"] is string topology)
-      {
-        newSpeckleCollectionWrapper.Topology = topology;
-        newCollection["topology"] = topology;
-      }
-
-      _cache[key] = newSpeckleCollectionWrapper;
-      previousCollectionWrapper.Collection.elements.Add(newSpeckleCollectionWrapper);
-
-      previousCollectionWrapper = newSpeckleCollectionWrapper;
-    }
-
-    return previousCollectionWrapper;
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/Receive/ReceiveAsyncComponent.cs

@@ -1,725 +0,0 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using Grasshopper.GUI;
-using Grasshopper.GUI.Canvas;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Attributes;
-using GrasshopperAsyncComponent;
-using Microsoft.Extensions.DependencyInjection;
-using Rhino;
-using Rhino.Geometry;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Operations.Receive;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Connectors.Grasshopper8.Registration;
-using Speckle.Sdk;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Models;
-using Speckle.Sdk.Common.Exceptions;
-using Speckle.Sdk.Credentials;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Extensions;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations.Receive;
-
-[Guid("1587DF34-83E5-4AFE-B42E-F7C5C37ECD68")]
-public class ReceiveAsyncComponent : GH_AsyncComponent
-{
-  public ReceiveAsyncComponent()
-    : base(
-      "Async Receive",
-      "aR",
-      "Receive objects async from speckle",
-      ComponentCategories.PRIMARY_RIBBON,
-      ComponentCategories.OPERATIONS
-    )
-  {
-    BaseWorker = new ReceiveComponentWorker(this);
-    Attributes = new ReceiveAsyncComponentAttributes(this);
-  }
-
-  public override Guid ComponentGuid => GetType().GUID;
-
-  protected override Bitmap Icon => BitmapBuilder.CreateSquareIconBitmap("aR");
-
-  public string InputType { get; set; }
-  public bool AutoReceive { get; set; }
-  public bool ReceiveOnOpen { get; set; }
-  public string ReceivedVersionId { get; set; }
-  public ComponentState CurrentComponentState { get; set; } = ComponentState.NeedsInput;
-  public bool JustPastedIn { get; set; }
-  public string LastVersionDate { get; set; }
-  public string LastInfoMessage { get; set; }
-  public HostApp.SpeckleUrlModelResource? UrlModelResource { get; set; }
-
-  // DI props
-  public Client ApiClient { get; private set; }
-  public GrasshopperReceiveOperation ReceiveOperation { get; private set; }
-  public RootObjectUnpacker RootObjectUnpacker { get; private set; }
-  public static IServiceScope? Scope { get; private set; }
-  public AccountService AccountManager { get; private set; }
-  public IClientFactory ClientFactory { get; private set; }
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam(GH_ParamAccess.item));
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddParameter(
-      new SpeckleCollectionParam(GH_ParamAccess.item),
-      "Model",
-      "model",
-      "The model object for the received version",
-      GH_ParamAccess.item
-    );
-  }
-
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    da.DisableGapLogic();
-
-    // Dependency Injection
-    Scope = PriorityLoader.Container.CreateScope();
-    ReceiveOperation = Scope.ServiceProvider.GetRequiredService<GrasshopperReceiveOperation>();
-    RootObjectUnpacker = Scope.ServiceProvider.GetService<RootObjectUnpacker>();
-    AccountManager = Scope.ServiceProvider.GetRequiredService<AccountService>();
-    ClientFactory = Scope.ServiceProvider.GetRequiredService<IClientFactory>();
-
-    // We need to call this always in here to be able to react and set events :/
-    ParseInput(da);
-
-    if (
-      (
-        AutoReceive
-        || CurrentComponentState == ComponentState.Ready
-        || CurrentComponentState == ComponentState.Receiving
-      ) && !JustPastedIn
-    )
-    {
-      CurrentComponentState = ComponentState.Receiving;
-
-      // Delegate control to parent async component.
-      base.SolveInstance(da);
-      return;
-    }
-
-    if (JustPastedIn)
-    {
-      // This ensures that we actually do a run. The worker will check and determine if it needs to pull an existing object or not.
-      OnDisplayExpired(true);
-      base.SolveInstance(da);
-    }
-    else
-    {
-      CurrentComponentState = ComponentState.Expired;
-      Message = "Expired";
-      OnDisplayExpired(true);
-    }
-  }
-
-  public override void AppendAdditionalMenuItems(ToolStripDropDown menu)
-  {
-    base.AppendAdditionalMenuItems(menu);
-
-    Menu_AppendSeparator(menu);
-    if (InputType == "Model")
-    {
-      var autoReceiveMi = Menu_AppendItem(
-        menu,
-        "Load automatically",
-        (s, e) =>
-        {
-          AutoReceive = !AutoReceive;
-          RhinoApp.InvokeOnUiThread(
-            (Action)
-              delegate
-              {
-                OnDisplayExpired(true);
-              }
-          );
-        },
-        true,
-        AutoReceive
-      );
-      autoReceiveMi.ToolTipText =
-        "Toggle automatic loading. If set, any new version will be loaded instantly. This only is applicable when receiving from a model url.";
-    }
-    else
-    {
-      var autoReceiveMi = Menu_AppendItem(menu, "Automatic loading is disabled because you have specified a version.");
-      autoReceiveMi.ToolTipText = "To enable automatic loading, select a model without selecting a specific version.";
-    }
-
-    var receivOnOpenMi = Menu_AppendItem(
-      menu,
-      "Load when Document opened",
-      (sender, args) =>
-      {
-        ReceiveOnOpen = !ReceiveOnOpen;
-        RhinoApp.InvokeOnUiThread(
-          (Action)
-            delegate
-            {
-              OnDisplayExpired(true);
-            }
-        );
-      },
-      !AutoReceive,
-      AutoReceive || ReceiveOnOpen
-    );
-    receivOnOpenMi.ToolTipText =
-      "The node will automatically perform a load operation as soon as the document is open, or the node is copy/pasted into a new document.";
-
-    Menu_AppendSeparator(menu);
-
-    if (CurrentComponentState == ComponentState.Receiving)
-    {
-      Menu_AppendItem(
-        menu,
-        "Cancel Load",
-        (s, e) =>
-        {
-          CurrentComponentState = ComponentState.Expired;
-          RequestCancellation();
-        }
-      );
-    }
-  }
-
-  private void HandleNewCommit()
-  {
-    Message = "Expired";
-    CurrentComponentState = ComponentState.Expired;
-    AddRuntimeMessage(GH_RuntimeMessageLevel.Remark, $"There is a newer version available for this {InputType}");
-    RhinoApp.InvokeOnUiThread(
-      (Action)
-        delegate
-        {
-          if (AutoReceive)
-          {
-            ExpireSolution(true);
-          }
-          else
-          {
-            OnDisplayExpired(true);
-          }
-        }
-    );
-  }
-
-  public override void RemovedFromDocument(GH_Document document)
-  {
-    RequestCancellation();
-    Scope?.Dispose();
-    base.RemovedFromDocument(document);
-  }
-
-  public override void DocumentContextChanged(GH_Document document, GH_DocumentContext context)
-  {
-    switch (context)
-    {
-      case GH_DocumentContext.Loaded:
-      {
-        // Will execute every time a document becomes active (from background or opening file.).
-        if (UrlModelResource != null)
-        {
-          Task.Run(async () =>
-          {
-            // Ensure fresh instance of client.
-            ResetApiClient(UrlModelResource);
-
-            // Get last commit from the branch
-            var b = UrlModelResource.GetReceiveInfo(ApiClient);
-            await b;
-
-            // Compare version ids. If they don't match, notify user or fetch data if in auto mode
-            if (b.Result.SelectedVersionId != ReceivedVersionId)
-            {
-              HandleNewCommit();
-            }
-
-            OnDisplayExpired(true);
-          });
-        }
-
-        break;
-      }
-      case GH_DocumentContext.Unloaded:
-        // Will execute every time a document becomes inactive (in background or closing file.)
-        // Correctly dispose of the client when changing documents to prevent subscription handlers being called in background.
-        CurrentComponentState = ComponentState.Expired;
-        RequestCancellation();
-        ApiClient?.Dispose();
-        break;
-    }
-
-    base.DocumentContextChanged(document, context);
-  }
-
-  private void ParseInput(IGH_DataAccess da)
-  {
-    HostApp.SpeckleUrlModelResource? dataInput = null;
-    da.GetData(0, ref dataInput);
-    if (dataInput is null)
-    {
-      UrlModelResource = null;
-      TriggerAutoSave();
-      return;
-    }
-
-    // set the type of url input
-    switch (dataInput)
-    {
-      case SpeckleUrlModelVersionResource:
-        InputType = "Version";
-        AutoReceive = false;
-        LastInfoMessage = "";
-        ResetApiClient(dataInput);
-        return;
-      case SpeckleUrlModelResource:
-        InputType = "Model";
-        // handled in do work
-        break;
-      default:
-        InputType = "Invalid";
-        break;
-    }
-
-    if (UrlModelResource != null && UrlModelResource.Equals(dataInput) && !JustPastedIn)
-    {
-      return;
-    }
-
-    UrlModelResource = dataInput;
-
-    ResetApiClient(UrlModelResource);
-  }
-
-  private void ApiClient_OnVersionCreated(object sender, ProjectVersionsUpdatedMessage e)
-  {
-    HandleNewCommit();
-  }
-
-  public void ResetApiClient(SpeckleUrlModelResource urlResource)
-  {
-    try
-    {
-      // TODO: Get any account for this server, as we don't have a mechanism yet to pass accountIds through
-      Account account = AccountManager.GetAccountWithServerUrlFallback("", new Uri(urlResource.Server));
-      if (account is null)
-      {
-        throw new SpeckleAccountManagerException($"No default account was found");
-      }
-
-      ApiClient?.Dispose();
-      ApiClient = ClientFactory.Create(account);
-      ApiClient.Subscription.CreateProjectVersionsUpdatedSubscription(urlResource.ProjectId).Listeners +=
-        ApiClient_OnVersionCreated;
-    }
-    catch (Exception e) when (!e.IsFatal())
-    {
-      AddRuntimeMessage(GH_RuntimeMessageLevel.Error, e.ToFormattedString());
-    }
-  }
-}
-
-public class ReceiveComponentWorker : WorkerInstance
-{
-  public ReceiveComponentWorker(GH_Component p)
-    : base(p) { }
-
-  public Base Root { get; set; }
-  public SpeckleUrlModelResource? UrlModelResource { get; set; }
-  public SpeckleCollectionWrapperGoo Result { get; set; }
-  private List<(GH_RuntimeMessageLevel, string)> RuntimeMessages { get; } = new();
-
-  public override WorkerInstance Duplicate()
-  {
-    return new ReceiveComponentWorker(Parent);
-  }
-
-  public override void GetData(IGH_DataAccess da, GH_ComponentParamServer p)
-  {
-    UrlModelResource = ((ReceiveAsyncComponent)Parent).UrlModelResource;
-  }
-
-  public override void SetData(IGH_DataAccess da)
-  {
-    if (CancellationToken.IsCancellationRequested)
-    {
-      return;
-    }
-
-    foreach (var (level, message) in RuntimeMessages)
-    {
-      Parent.AddRuntimeMessage(level, message);
-    }
-
-    var parent = (ReceiveAsyncComponent)Parent;
-
-    parent.CurrentComponentState = ComponentState.UpToDate;
-
-    parent.JustPastedIn = false;
-
-    if (Result == null)
-    {
-      return;
-    }
-
-    da.SetData(0, Result);
-  }
-
-#pragma warning disable CA1506
-  public override void DoWork(Action<string, double> reportProgress, Action done)
-  {
-    var receiveComponent = (ReceiveAsyncComponent)Parent;
-
-    try
-    {
-      if (UrlModelResource is null)
-      {
-        throw new InvalidOperationException("Url Resource was null");
-      }
-
-      // Means it's a copy paste of an empty non-init component; set the record and exit fast unless ReceiveOnOpen is true.
-      if (receiveComponent.JustPastedIn && !receiveComponent.AutoReceive)
-      {
-        receiveComponent.JustPastedIn = false;
-        if (!receiveComponent.ReceiveOnOpen)
-        {
-          return;
-        }
-
-        receiveComponent.CurrentComponentState = ComponentState.Receiving;
-        RhinoApp.InvokeOnUiThread(
-          (Action)
-            delegate
-            {
-              receiveComponent.OnDisplayExpired(true);
-            }
-        );
-      }
-
-      var t = Task.Run(async () =>
-      {
-        // Step 1 - RECEIVE FROM SERVER
-        var receiveInfo = await UrlModelResource
-          .GetReceiveInfo(receiveComponent.ApiClient, CancellationToken)
-          .ConfigureAwait(false);
-
-        var progress = new Progress<CardProgress>(p =>
-        {
-          reportProgress(Id, p.Progress ?? 0);
-          //eceiveComponent.Message = $"{p.Status}";
-        });
-
-        if (CancellationToken.IsCancellationRequested)
-        {
-          return;
-        }
-
-        if (receiveInfo == null)
-        {
-          done();
-          return;
-        }
-
-        Root = await receiveComponent
-          .ReceiveOperation.ReceiveCommitObject(receiveInfo, progress, CancellationToken)
-          .ConfigureAwait(false);
-
-        if (CancellationToken.IsCancellationRequested)
-        {
-          return;
-        }
-
-        // Step 2 - CONVERT
-        //receiveComponent.Message = $"Unpacking...";
-        var localToGlobalUnpacker = new LocalToGlobalUnpacker();
-        var traversalContextUnpacker = new TraversalContextUnpacker();
-        var unpackedRoot = receiveComponent.RootObjectUnpacker.Unpack(Root);
-
-        // "flatten" block instances
-        var localToGlobalMaps = localToGlobalUnpacker.Unpack(
-          unpackedRoot.DefinitionProxies,
-          unpackedRoot.ObjectsToConvert.ToList()
-        );
-
-        // TODO: unpack colors and render materials
-
-        var collectionRebuilder = new GrasshopperCollectionRebuilder(
-          (Root as Collection) ?? new Collection() { name = "unnamed" }
-        );
-
-        int count = 0;
-        int total = localToGlobalMaps.Count;
-
-        foreach (var map in localToGlobalMaps)
-        {
-          try
-          {
-            List<GeometryBase> converted = Convert(map.AtomicObject);
-            var path = traversalContextUnpacker.GetCollectionPath(map.TraversalContext).ToList();
-
-            foreach (var matrix in map.Matrix)
-            {
-              var mat = GrasshopperHelpers.MatrixToTransform(matrix, "meters");
-              converted.ForEach(res => res.Transform(mat));
-            }
-
-            // get the collection
-            SpeckleCollectionWrapper objectCollection = collectionRebuilder.GetOrCreateSpeckleCollectionFromPath(path);
-
-            // get the name and properties
-            SpecklePropertyGroupGoo propertyGroup = new();
-            string name = "";
-            if (map.AtomicObject is Speckle.Objects.Data.DataObject da)
-            {
-              propertyGroup.CastFrom(da.properties);
-              name = da.name;
-            }
-            else
-            {
-              if (map.AtomicObject["properties"] is Dictionary<string, object?> props)
-              {
-                propertyGroup.CastFrom(props);
-              }
-
-              if (map.AtomicObject["name"] is string n)
-              {
-                name = n;
-              }
-            }
-
-            // create objects for every value in converted. This is where one to many is not handled very nicely.
-            foreach (var geometryBase in converted)
-            {
-              var gh = new SpeckleObjectWrapper()
-              {
-                Base = map.AtomicObject,
-                Path = path.Select(p => p.name).ToList(),
-                Parent = objectCollection,
-                GeometryBase = geometryBase,
-                Properties = propertyGroup,
-                Name = name
-              };
-
-              collectionRebuilder.AppendSpeckleGrasshopperObject(gh, path);
-            }
-          }
-          catch (ConversionException)
-          {
-            // TODO
-          }
-          //reportProgress(Id, (double)count / total);
-          count++;
-        }
-
-        Result = new SpeckleCollectionWrapperGoo(collectionRebuilder.RootCollectionWrapper);
-
-        // DONE
-        done();
-      });
-      t.Wait();
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      RuntimeMessages.Add((GH_RuntimeMessageLevel.Error, ex.ToFormattedString()));
-      done();
-    }
-  }
-#pragma warning restore CA1506
-
-  private List<GeometryBase> Convert(Base input)
-  {
-    var result = ToSpeckleConversionContext.ToHostConverter.Convert(input);
-
-    if (result is GeometryBase geometry)
-    {
-      return [geometry];
-    }
-    if (result is List<GeometryBase> geometryList)
-    {
-      return geometryList;
-    }
-    if (result is IEnumerable<(GeometryBase, Base)> fallbackConversionResult)
-    {
-      // note special handling for proxying render materials OR we don't care about revit
-      return fallbackConversionResult.Select(t => t.Item1).ToList();
-    }
-
-    throw new SpeckleException("Failed to convert input to rhino");
-  }
-}
-
-public class ReceiveAsyncComponentAttributes : GH_ComponentAttributes
-{
-  private bool _selected;
-
-  private class SpeckleComponentButton
-  {
-    public int Height { get; set; } = 26;
-    public Rectangle ButtonBounds { get; set; }
-    public GH_Palette Palette { get; set; }
-    public string Text { get; set; }
-  }
-
-  private List<SpeckleComponentButton> Buttons { get; set; }
-
-  public ReceiveAsyncComponentAttributes(GH_Component owner)
-    : base(owner)
-  {
-    Buttons = new List<SpeckleComponentButton>()
-    {
-      new SpeckleComponentButton()
-      {
-        Text = "Select project",
-        Palette = GH_Palette.Blue,
-        Height = 18
-      },
-      new SpeckleComponentButton()
-      {
-        Text = "Select model",
-        Palette = GH_Palette.Blue,
-        Height = 18
-      },
-      new SpeckleComponentButton()
-      {
-        Text = "Select version",
-        Palette = GH_Palette.Blue,
-        Height = 18
-      },
-      new SpeckleComponentButton() { Text = "Test 2", Palette = GH_Palette.Black },
-    };
-  }
-
-  public override bool Selected
-  {
-    get => _selected;
-    set => _selected = value;
-  }
-
-  protected override void Layout()
-  {
-    base.Layout();
-
-    var baseRec = GH_Convert.ToRectangle(Bounds);
-
-    for (int i = 0; i < Buttons.Count; i++)
-    {
-      var button = Buttons[i];
-
-      var buttonBounds = i == 0 ? baseRec : Buttons[i - 1].ButtonBounds;
-      buttonBounds.Y = buttonBounds.Bottom;
-      buttonBounds.Height = button.Height;
-      buttonBounds.Width = baseRec.Width;
-      button.ButtonBounds = buttonBounds;
-      baseRec.Height += button.Height;
-      Bounds = baseRec;
-    }
-  }
-
-  protected override void Render(GH_Canvas canvas, Graphics graphics, GH_CanvasChannel channel)
-  {
-    base.Render(canvas, graphics, channel);
-
-    var state = ((ReceiveAsyncComponent)Owner).CurrentComponentState;
-
-    if (channel == GH_CanvasChannel.Objects)
-    {
-      // if (((ReceiveAsyncComponent)Owner).AutoReceive)
-      // {
-      //   var autoReceiveButton = GH_Capsule.CreateTextCapsule(
-      //     ButtonBounds,
-      //     ButtonBounds,
-      //     GH_Palette.Blue,
-      //     "Auto Receive",
-      //     2,
-      //     0
-      //   );
-      //
-      //   autoReceiveButton.Render(graphics, Selected, Owner.Locked, false);
-      //   autoReceiveButton.Dispose();
-      // }
-      // else
-      // {
-      //   var palette =
-      //     state == ComponentState.Expired || state == ComponentState.UpToDate || state == ComponentState.Cancelled
-      //       ? GH_Palette.Black
-      //       : GH_Palette.Transparent;
-      //   var text = state != ComponentState.Receiving ? "Receive" : "Receiving...";
-      //
-      //   var button = GH_Capsule.CreateTextCapsule(
-      //     ButtonBounds,
-      //     ButtonBounds,
-      //     palette,
-      //     text,
-      //     2,
-      //     state == ComponentState.Expired ? 10 : 0
-      //   );
-      //   button.Render(graphics, Selected, Owner.Locked, false);
-      //   button.Dispose();
-      // }
-
-      foreach (var button in Buttons)
-      {
-        using var b = GH_Capsule.CreateTextCapsule(
-          button.ButtonBounds,
-          button.ButtonBounds,
-          button.Palette,
-          button.Text,
-          2,
-          0
-        );
-        b.Render(graphics, Selected, Owner.Locked, false);
-      }
-    }
-  }
-
-  public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_CanvasMouseEvent e)
-  {
-    if (e.Button != MouseButtons.Left)
-    {
-      return base.RespondToMouseDown(sender, e);
-    }
-
-    foreach (var button in Buttons)
-    {
-      if (((RectangleF)button.ButtonBounds).Contains(e.CanvasLocation))
-      {
-        Debug.WriteLine($"Button was pressed: {button.Text}");
-        return GH_ObjectResponse.Handled;
-      }
-    }
-
-    return base.RespondToMouseDown(sender, e);
-
-    // if (!((RectangleF)ButtonBounds).Contains(e.CanvasLocation))
-    // {
-    //   return base.RespondToMouseDown(sender, e);
-    // }
-    //
-    // if (((ReceiveAsyncComponent)Owner).CurrentComponentState == ComponentState.Receiving)
-    // {
-    //   return GH_ObjectResponse.Handled;
-    // }
-    //
-    // if (((ReceiveAsyncComponent)Owner).AutoReceive)
-    // {
-    //   ((ReceiveAsyncComponent)Owner).AutoReceive = false;
-    //   Owner.OnDisplayExpired(true);
-    //   return GH_ObjectResponse.Handled;
-    // }
-    //
-    // // TODO: check if owner has null account/client, and call the reset thing SYNC
-    // ((ReceiveAsyncComponent)Owner).CurrentComponentState = ComponentState.Ready;
-    // Owner.ExpireSolution(true);
-    // return GH_ObjectResponse.Handled;
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/Receive/ReceiveComponent.cs

@@ -1,208 +0,0 @@
-using Grasshopper.Kernel;
-using Microsoft.Extensions.DependencyInjection;
-using Rhino.Geometry;
-using Speckle.Connectors.Common.Instances;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Common.Operations.Receive;
-using Speckle.Connectors.Grasshopper8.Components.BaseComponents;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Operations.Receive;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Common.Exceptions;
-using Speckle.Sdk.Credentials;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations.Receive;
-
-public class ReceiveComponentOutput
-{
-  public SpeckleCollectionWrapperGoo RootObject { get; set; }
-}
-
-public class ReceiveComponent : SpeckleScopedTaskCapableComponent<SpeckleUrlModelResource, ReceiveComponentOutput>
-{
-  public ReceiveComponent()
-    : base(
-      "Receive from Speckle",
-      "RFS",
-      "Receive objects from speckle",
-      ComponentCategories.PRIMARY_RIBBON,
-      ComponentCategories.OPERATIONS
-    ) { }
-
-  public override Guid ComponentGuid => new("74954F59-B1B7-41FD-97DE-4C6B005F2801");
-  protected override Bitmap Icon => BitmapBuilder.CreateSquareIconBitmap("R");
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam(GH_ParamAccess.item));
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddParameter(
-      new SpeckleCollectionParam(GH_ParamAccess.item),
-      "Model",
-      "model",
-      "The model object for the received version",
-      GH_ParamAccess.item
-    );
-  }
-
-  protected override SpeckleUrlModelResource GetInput(IGH_DataAccess da)
-  {
-    SpeckleUrlModelResource? url = null;
-    da.GetData(0, ref url);
-    if (url is null)
-    {
-      throw new SpeckleException("Speckle url is null");
-    }
-
-    return url;
-  }
-
-  protected override void SetOutput(IGH_DataAccess da, ReceiveComponentOutput result)
-  {
-    da.SetData(0, result.RootObject);
-    Message = "Done";
-  }
-
-  protected override async Task<ReceiveComponentOutput> PerformScopedTask(
-    SpeckleUrlModelResource input,
-    IServiceScope scope,
-    CancellationToken cancellationToken = default
-  )
-  {
-    // TODO: Resolving dependencies here may be overkill in most cases. Must re-evaluate.
-    var accountManager = scope.ServiceProvider.GetRequiredService<AccountService>();
-    var clientFactory = scope.ServiceProvider.GetRequiredService<IClientFactory>();
-    var receiveOperation = scope.ServiceProvider.GetRequiredService<GrasshopperReceiveOperation>();
-
-    // Do the thing 👇🏼
-
-    // TODO: Get any account for this server, as we don't have a mechanism yet to pass accountIds through
-    var account = accountManager.GetAccountWithServerUrlFallback("", new Uri(input.Server));
-
-    if (account is null)
-    {
-      throw new SpeckleAccountManagerException($"No default account was found");
-    }
-
-    using var client = clientFactory.Create(account);
-    var receiveInfo = await input.GetReceiveInfo(client, cancellationToken).ConfigureAwait(false);
-
-    var progress = new Progress<CardProgress>(_ =>
-    {
-      // TODO: Progress only makes sense in non-blocking async receive, which is not supported yet.
-      // Message = $"{progress.Status}: {progress.Progress}";
-    });
-
-    var root = await receiveOperation
-      .ReceiveCommitObject(receiveInfo, progress, cancellationToken)
-      .ConfigureAwait(false);
-
-    // We need to rethink these lovely unpackers, there's a bit too many of 'em
-    var rootObjectUnpacker = scope.ServiceProvider.GetService<RootObjectUnpacker>();
-    var localToGlobalUnpacker = new LocalToGlobalUnpacker();
-    var traversalContextUnpacker = new TraversalContextUnpacker();
-
-    var unpackedRoot = rootObjectUnpacker.Unpack(root);
-
-    // "flatten" block instances
-    var localToGlobalMaps = localToGlobalUnpacker.Unpack(
-      unpackedRoot.DefinitionProxies,
-      unpackedRoot.ObjectsToConvert.ToList()
-    );
-
-    var collectionRebuilder = new GrasshopperCollectionRebuilder(
-      (root as Collection) ?? new Collection() { name = "unnamed" }
-    );
-
-    foreach (var map in localToGlobalMaps)
-    {
-      try
-      {
-        List<GeometryBase> converted = Convert(map.AtomicObject);
-        List<Collection> path = traversalContextUnpacker.GetCollectionPath(map.TraversalContext).ToList();
-
-        foreach (var matrix in map.Matrix)
-        {
-          var mat = GrasshopperHelpers.MatrixToTransform(matrix, "meters");
-          converted.ForEach(res => res.Transform(mat));
-        }
-
-        // get the collection
-        SpeckleCollectionWrapper objectCollection = collectionRebuilder.GetOrCreateSpeckleCollectionFromPath(path);
-
-        // get the name and properties
-        SpecklePropertyGroupGoo propertyGroup = new();
-        string name = "";
-        if (map.AtomicObject is Speckle.Objects.Data.DataObject da)
-        {
-          propertyGroup.CastFrom(da.properties);
-          name = da.name;
-        }
-        else
-        {
-          if (map.AtomicObject["properties"] is Dictionary<string, object?> props)
-          {
-            propertyGroup.CastFrom(props);
-          }
-
-          if (map.AtomicObject["name"] is string n)
-          {
-            name = n;
-          }
-        }
-
-        // create objects for every value in converted. This is where one to many is not handled very nicely.
-        foreach (var geometryBase in converted)
-        {
-          var gh = new SpeckleObjectWrapper()
-          {
-            Base = map.AtomicObject,
-            Path = path.Select(p => p.name).ToList(),
-            Parent = objectCollection,
-            GeometryBase = geometryBase,
-            Properties = propertyGroup,
-            Name = name
-          };
-
-          collectionRebuilder.AppendSpeckleGrasshopperObject(gh, path);
-        }
-      }
-      catch (ConversionException)
-      {
-        // TODO
-      }
-    }
-
-    // var x = new SpeckleCollectionGoo { Value = collGen.RootCollection };
-    var goo = new SpeckleCollectionWrapperGoo(collectionRebuilder.RootCollectionWrapper);
-    return new ReceiveComponentOutput { RootObject = goo };
-  }
-
-  private List<GeometryBase> Convert(Base input)
-  {
-    var result = ToSpeckleConversionContext.ToHostConverter.Convert(input);
-
-    if (result is GeometryBase geometry)
-    {
-      return [geometry];
-    }
-    if (result is List<GeometryBase> geometryList)
-    {
-      return geometryList;
-    }
-    if (result is List<(GeometryBase, Base)> fallbackConversionResult)
-    {
-      // note special handling for proxying render materials OR we don't care about revit
-      return fallbackConversionResult.Select(t => t.Item1).ToList();
-    }
-
-    throw new SpeckleException("Failed to convert input to rhino");
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/Send/SendAsyncComponent.cs

@@ -1,503 +0,0 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Timers;
-using Grasshopper.GUI;
-using Grasshopper.GUI.Canvas;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Attributes;
-using GrasshopperAsyncComponent;
-using Microsoft.Extensions.DependencyInjection;
-using Rhino;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Connectors.Grasshopper8.Registration;
-using Speckle.Converters.Common;
-using Speckle.Converters.Rhino;
-using Speckle.Sdk;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Credentials;
-using Speckle.Sdk.Models.Extensions;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations.Send;
-
-[Guid("52481972-7867-404F-8D9F-E1481183F355")]
-public class SendAsyncComponent : GH_AsyncComponent
-{
-  public SendAsyncComponent()
-    : base(
-      "Async Send",
-      "aS",
-      "Send objects async to speckle",
-      ComponentCategories.PRIMARY_RIBBON,
-      ComponentCategories.OPERATIONS
-    )
-  {
-    BaseWorker = new SendComponentWorker(this);
-    Attributes = new SendAsyncComponentAttributes(this);
-  }
-
-  public override Guid ComponentGuid => GetType().GUID;
-
-  protected override Bitmap Icon => BitmapBuilder.CreateSquareIconBitmap("aS");
-
-  public ComponentState CurrentComponentState { get; set; } = ComponentState.NeedsInput;
-  public bool AutoSend { get; set; }
-  public bool JustPastedIn { get; set; }
-  public double OverallProgress { get; set; }
-  public string? Url { get; set; }
-  public Client ApiClient { get; set; }
-  public HostApp.SpeckleUrlModelResource? UrlModelResource { get; set; }
-  public SpeckleCollectionWrapperGoo? RootCollectionWrapper { get; set; }
-
-  public SpeckleUrlModelResource? OutputParam { get; set; }
-  public SendOperation<SpeckleCollectionWrapperGoo> SendOperation { get; private set; }
-  public static IServiceScope? Scope { get; set; }
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam());
-    pManager.AddParameter(
-      new SpeckleCollectionParam(GH_ParamAccess.item),
-      "Model",
-      "model",
-      "The collection model object to send",
-      GH_ParamAccess.item
-    );
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam());
-  }
-
-  public override void AppendAdditionalMenuItems(ToolStripDropDown menu)
-  {
-    static void Open(string url)
-    {
-      var psi = new ProcessStartInfo { FileName = url, UseShellExecute = true };
-      Process.Start(psi);
-    }
-
-    base.AppendAdditionalMenuItems(menu);
-
-    Menu_AppendSeparator(menu);
-
-    var autoSendMi = Menu_AppendItem(
-      menu,
-      "Send automatically",
-      (s, e) =>
-      {
-        AutoSend = !AutoSend;
-        RhinoApp.InvokeOnUiThread(
-          (Action)
-            delegate
-            {
-              OnDisplayExpired(true);
-            }
-        );
-      },
-      true,
-      AutoSend
-    );
-    autoSendMi.ToolTipText =
-      "Toggle automatic data sending. If set, any change in any of the input parameters of this component will start sending.\n Please be aware that if a new send starts before an old one is finished, the previous operation is cancelled.";
-
-    if (Url != null)
-    {
-      Menu_AppendSeparator(menu);
-
-      Menu_AppendItem(menu, $"View created version online ↗", (s, e) => Open(Url));
-    }
-
-    Menu_AppendSeparator(menu);
-
-    if (CurrentComponentState == ComponentState.Sending)
-    {
-      Menu_AppendItem(
-        menu,
-        "Cancel Send",
-        (s, e) =>
-        {
-          CurrentComponentState = ComponentState.Expired;
-          RequestCancellation();
-        }
-      );
-    }
-  }
-
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    // Dependency Injection
-    Scope = PriorityLoader.Container.CreateScope();
-    SendOperation = Scope.ServiceProvider.GetRequiredService<SendOperation<SpeckleCollectionWrapperGoo>>();
-    var rhinoConversionSettingsFactory = Scope.ServiceProvider.GetRequiredService<IRhinoConversionSettingsFactory>();
-    Scope
-      .ServiceProvider.GetRequiredService<IConverterSettingsStore<RhinoConversionSettings>>()
-      .Initialize(rhinoConversionSettingsFactory.Create(RhinoDoc.ActiveDoc));
-
-    var accountManager = Scope.ServiceProvider.GetRequiredService<AccountService>();
-    var clientFactory = Scope.ServiceProvider.GetRequiredService<IClientFactory>();
-
-    // We need to call this always in here to be able to react and set events :/
-    ParseInput(da, accountManager, clientFactory);
-
-    if (
-      (AutoSend || CurrentComponentState == ComponentState.Ready || CurrentComponentState == ComponentState.Sending)
-      && !JustPastedIn
-    )
-    {
-      CurrentComponentState = ComponentState.Sending;
-
-      // Delegate control to parent async component.
-      base.SolveInstance(da);
-      return;
-    }
-
-    if (JustPastedIn)
-    {
-      // Set output data in a "first run" event. Note: we are not persisting the actual "sent" object as it can be very big.
-      base.SolveInstance(da);
-      return;
-    }
-    else
-    {
-      da.SetData(0, OutputParam);
-      CurrentComponentState = ComponentState.Expired;
-      Message = "Expired";
-      OnDisplayExpired(true);
-    }
-  }
-
-  public override void RemovedFromDocument(GH_Document document)
-  {
-    RequestCancellation();
-    Scope?.Dispose();
-    base.RemovedFromDocument(document);
-  }
-
-  public override void DisplayProgress(object sender, ElapsedEventArgs e)
-  {
-    if (Workers.Count == 0)
-    {
-      return;
-    }
-
-    Message = "";
-    var total = 0.0;
-    foreach (var kvp in ProgressReports)
-    {
-      Message += $"{kvp.Key}: {kvp.Value}\n";
-      total += kvp.Value;
-    }
-
-    OverallProgress = total / ProgressReports.Keys.Count;
-
-    RhinoApp.InvokeOnUiThread(
-      (Action)
-        delegate
-        {
-          OnDisplayExpired(true);
-        }
-    );
-  }
-
-  public override void DocumentContextChanged(GH_Document document, GH_DocumentContext context)
-  {
-    switch (context)
-    {
-      case GH_DocumentContext.Loaded:
-        OnDisplayExpired(true);
-        break;
-
-      case GH_DocumentContext.Unloaded:
-        // Will execute every time a document becomes inactive (in background or closing file.)
-        //Correctly dispose of the client when changing documents to prevent subscription handlers being called in background.
-        RequestCancellation();
-        break;
-    }
-
-    base.DocumentContextChanged(document, context);
-  }
-
-  private void ParseInput(IGH_DataAccess da, AccountService accountManager, IClientFactory clientFactory)
-  {
-    HostApp.SpeckleUrlModelResource? dataInput = null;
-    da.GetData(0, ref dataInput);
-    if (dataInput is null)
-    {
-      UrlModelResource = null;
-      TriggerAutoSave();
-      return;
-    }
-
-    UrlModelResource = dataInput;
-    try
-    {
-      // TODO: Get any account for this server, as we don't have a mechanism yet to pass accountIds through
-      Account account = accountManager.GetAccountWithServerUrlFallback("", new Uri(dataInput.Server));
-      if (account is null)
-      {
-        throw new SpeckleAccountManagerException($"No default account was found");
-      }
-
-      ApiClient?.Dispose();
-      ApiClient = clientFactory.Create(account);
-    }
-    catch (Exception e) when (!e.IsFatal())
-    {
-      AddRuntimeMessage(GH_RuntimeMessageLevel.Error, e.ToFormattedString());
-    }
-
-    SpeckleCollectionWrapperGoo rootCollectionWrapper = new();
-    da.GetData(1, ref rootCollectionWrapper);
-    if (rootCollectionWrapper is null)
-    {
-      RootCollectionWrapper = null;
-      TriggerAutoSave();
-      return;
-    }
-    RootCollectionWrapper = rootCollectionWrapper;
-  }
-}
-
-public class SendComponentWorker : WorkerInstance
-{
-  public SendComponentWorker(GH_Component p)
-    : base(p) { }
-
-  private Stopwatch _stopwatch;
-  public SpeckleUrlModelResource? OutputParam { get; set; }
-  private List<(GH_RuntimeMessageLevel, string)> RuntimeMessages { get; } = new();
-
-  public override WorkerInstance Duplicate()
-  {
-    return new SendComponentWorker(Parent);
-  }
-
-  public override void GetData(IGH_DataAccess da, GH_ComponentParamServer p)
-  {
-    _stopwatch = new Stopwatch();
-    _stopwatch.Start();
-  }
-
-  public override void SetData(IGH_DataAccess da)
-  {
-    _stopwatch.Stop();
-
-    if (((SendAsyncComponent)Parent).JustPastedIn)
-    {
-      ((SendAsyncComponent)Parent).JustPastedIn = false;
-      da.SetData(0, ((SendAsyncComponent)Parent).OutputParam);
-      return;
-    }
-
-    if (CancellationToken.IsCancellationRequested)
-    {
-      ((SendAsyncComponent)Parent).CurrentComponentState = ComponentState.Expired;
-      return;
-    }
-
-    foreach (var (level, message) in RuntimeMessages)
-    {
-      Parent.AddRuntimeMessage(level, message);
-    }
-
-    da.SetData(0, OutputParam);
-
-    ((SendAsyncComponent)Parent).CurrentComponentState = ComponentState.UpToDate;
-    ((SendAsyncComponent)Parent).OutputParam = OutputParam; // ref the outputs in the parent too, so we can serialise them on write/read
-    ((SendAsyncComponent)Parent).OverallProgress = 0;
-
-    var hasWarnings = RuntimeMessages.Count > 0;
-    if (!hasWarnings)
-    {
-      Parent.AddRuntimeMessage(
-        GH_RuntimeMessageLevel.Remark,
-        $"Successfully sent {((SendAsyncComponent)Parent).RootCollectionWrapper?.Value.GetTotalChildrenCount()} objects to Speckle."
-      );
-      Parent.AddRuntimeMessage(
-        GH_RuntimeMessageLevel.Remark,
-        $"Send duration: {_stopwatch.ElapsedMilliseconds / 1000f}s"
-      );
-    }
-  }
-
-  public override void DoWork(Action<string, double> reportProgress, Action done)
-  {
-    var sendComponent = (SendAsyncComponent)Parent;
-
-    if (sendComponent.JustPastedIn)
-    {
-      done();
-      return;
-    }
-
-    if (CancellationToken.IsCancellationRequested)
-    {
-      sendComponent.CurrentComponentState = ComponentState.Expired;
-      return;
-    }
-
-    try
-    {
-      SpeckleUrlModelResource? urlModelResource = sendComponent.UrlModelResource;
-      if (urlModelResource is null)
-      {
-        throw new InvalidOperationException("Url Resource was null");
-      }
-
-      SpeckleCollectionWrapperGoo? rootCollectionWrapper = sendComponent.RootCollectionWrapper;
-      if (rootCollectionWrapper is null)
-      {
-        throw new InvalidOperationException("Root Collection was null");
-      }
-
-      var t = Task.Run(async () =>
-      {
-        if (CancellationToken.IsCancellationRequested)
-        {
-          sendComponent.CurrentComponentState = ComponentState.Expired;
-          return;
-        }
-
-        // Step 1 - SEND TO SERVER
-        var sendInfo = await urlModelResource
-          .GetSendInfo(sendComponent.ApiClient, CancellationToken)
-          .ConfigureAwait(false);
-
-        var progress = new Progress<CardProgress>(p =>
-        {
-          reportProgress(Id, p.Progress ?? 0);
-          //sendComponent.Message = $"{p.Status}";
-        });
-
-        var result = await sendComponent
-          .SendOperation.Execute(
-            new List<SpeckleCollectionWrapperGoo>() { rootCollectionWrapper },
-            sendInfo,
-            progress,
-            CancellationToken
-          )
-          .ConfigureAwait(false);
-
-        // TODO: need the created version id here from the send result, not the rootobj id
-        SpeckleUrlModelVersionResource? createdVersion =
-          new(sendInfo.ServerUrl.ToString(), sendInfo.ProjectId, sendInfo.ModelId, result.RootObjId);
-        OutputParam = createdVersion;
-        sendComponent.Url = $"{createdVersion.Server}projects/{sendInfo.ProjectId}/models/{sendInfo.ModelId}"; // TODO: missing "@VersionId"
-
-        // DONE
-        done();
-      });
-      t.Wait();
-    }
-    catch (Exception ex) when (!ex.IsFatal())
-    {
-      RuntimeMessages.Add((GH_RuntimeMessageLevel.Error, ex.ToFormattedString()));
-      done();
-    }
-  }
-}
-
-public class SendAsyncComponentAttributes : GH_ComponentAttributes
-{
-  private bool _selected;
-
-  public SendAsyncComponentAttributes(GH_Component owner)
-    : base(owner) { }
-
-  private Rectangle ButtonBounds { get; set; }
-
-  public override bool Selected
-  {
-    get => _selected;
-    set => _selected = value;
-  }
-
-  protected override void Layout()
-  {
-    base.Layout();
-
-    var baseRec = GH_Convert.ToRectangle(Bounds);
-    baseRec.Height += 26;
-
-    var btnRec = baseRec;
-    btnRec.Y = btnRec.Bottom - 26;
-    btnRec.Height = 26;
-    btnRec.Inflate(-2, -2);
-
-    Bounds = baseRec;
-    ButtonBounds = btnRec;
-  }
-
-  protected override void Render(GH_Canvas canvas, Graphics graphics, GH_CanvasChannel channel)
-  {
-    base.Render(canvas, graphics, channel);
-
-    var state = ((SendAsyncComponent)Owner).CurrentComponentState;
-
-    if (channel == GH_CanvasChannel.Objects)
-    {
-      if (((SendAsyncComponent)Owner).AutoSend)
-      {
-        var autoSendButton = GH_Capsule.CreateTextCapsule(
-          ButtonBounds,
-          ButtonBounds,
-          GH_Palette.Blue,
-          "Auto Send",
-          2,
-          0
-        );
-
-        autoSendButton.Render(graphics, Selected, Owner.Locked, false);
-        autoSendButton.Dispose();
-      }
-      else
-      {
-        var palette =
-          state == ComponentState.Expired || state == ComponentState.UpToDate
-            ? GH_Palette.Black
-            : GH_Palette.Transparent;
-
-        var text = state == ComponentState.Sending ? "Sending..." : "Send";
-
-        var button = GH_Capsule.CreateTextCapsule(
-          ButtonBounds,
-          ButtonBounds,
-          palette,
-          text,
-          2,
-          state == ComponentState.Expired ? 10 : 0
-        );
-        button.Render(graphics, Selected, Owner.Locked, false);
-        button.Dispose();
-      }
-    }
-  }
-
-  public override GH_ObjectResponse RespondToMouseDown(GH_Canvas sender, GH_CanvasMouseEvent e)
-  {
-    if (e.Button == MouseButtons.Left)
-    {
-      if (((RectangleF)ButtonBounds).Contains(e.CanvasLocation))
-      {
-        if (((SendAsyncComponent)Owner).AutoSend)
-        {
-          ((SendAsyncComponent)Owner).AutoSend = false;
-          Owner.OnDisplayExpired(true);
-          return GH_ObjectResponse.Handled;
-        }
-        if (((SendAsyncComponent)Owner).CurrentComponentState == ComponentState.Sending)
-        {
-          return GH_ObjectResponse.Handled;
-        }
-        ((SendAsyncComponent)Owner).CurrentComponentState = ComponentState.Ready;
-        Owner.ExpireSolution(true);
-        return GH_ObjectResponse.Handled;
-      }
-    }
-
-    return base.RespondToMouseDown(sender, e);
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/Send/SendComponent.cs

@@ -1,153 +0,0 @@
-using System.Diagnostics;
-using Grasshopper.Kernel;
-using Microsoft.Extensions.DependencyInjection;
-using Rhino;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Grasshopper8.Components.BaseComponents;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Converters.Common;
-using Speckle.Converters.Rhino;
-using Speckle.Sdk;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Credentials;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations.Send;
-
-public class SendComponentInput
-{
-  public SpeckleUrlModelResource Resource { get; }
-  public SpeckleCollectionWrapperGoo Input { get; }
-
-  public SendComponentInput(SpeckleUrlModelResource resource, SpeckleCollectionWrapperGoo input)
-  {
-    Resource = resource;
-    Input = input;
-  }
-}
-
-public class SendComponentOutput(SpeckleUrlModelResource resource)
-{
-  public SpeckleUrlModelResource Resource { get; } = resource;
-}
-
-public class SendComponent : SpeckleScopedTaskCapableComponent<SendComponentInput, SendComponentOutput>
-{
-  public SendComponent()
-    : base(
-      "Send to Speckle",
-      "STS",
-      "Send objects to speckle",
-      ComponentCategories.PRIMARY_RIBBON,
-      ComponentCategories.OPERATIONS
-    ) { }
-
-  public override Guid ComponentGuid => new("0CF0D173-BDF0-4AC2-9157-02822B90E9FB");
-
-  public string? Url { get; private set; }
-
-  protected override Bitmap Icon => BitmapBuilder.CreateSquareIconBitmap("S");
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam());
-    pManager.AddParameter(
-      new SpeckleCollectionParam(GH_ParamAccess.item),
-      "Model",
-      "model",
-      "The collection model object to send",
-      GH_ParamAccess.item
-    );
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam());
-  }
-
-  protected override SendComponentInput GetInput(IGH_DataAccess da)
-  {
-    if (da.Iteration != 0)
-    {
-      throw new SpeckleException("No more than 1 resource allowed");
-    }
-
-    SpeckleUrlModelResource? resource = null;
-    if (!da.GetData(0, ref resource))
-    {
-      throw new SpeckleException("Failed to get resource");
-    }
-
-    SpeckleCollectionWrapperGoo rootCollectionWrapper = new();
-    da.GetData(1, ref rootCollectionWrapper);
-
-    return new SendComponentInput(resource.NotNull(), rootCollectionWrapper);
-  }
-
-  protected override void SetOutput(IGH_DataAccess da, SendComponentOutput result)
-  {
-    da.SetData(0, result.Resource);
-  }
-
-  public override void AppendAdditionalMenuItems(ToolStripDropDown menu)
-  {
-    base.AppendAdditionalMenuItems(menu);
-
-    Menu_AppendSeparator(menu);
-    if (Url != null)
-    {
-      Menu_AppendSeparator(menu);
-
-      Menu_AppendItem(menu, $"View created version online ↗", (s, e) => Open(Url));
-    }
-
-    static void Open(string url)
-    {
-      var psi = new ProcessStartInfo { FileName = url, UseShellExecute = true };
-      Process.Start(psi);
-    }
-  }
-
-  protected override async Task<SendComponentOutput> PerformScopedTask(
-    SendComponentInput input,
-    IServiceScope scope,
-    CancellationToken cancellationToken = default
-  )
-  {
-    var rhinoConversionSettingsFactory = scope.ServiceProvider.GetRequiredService<IRhinoConversionSettingsFactory>();
-    scope
-      .ServiceProvider.GetRequiredService<IConverterSettingsStore<RhinoConversionSettings>>()
-      .Initialize(rhinoConversionSettingsFactory.Create(RhinoDoc.ActiveDoc));
-
-    var accountManager = scope.ServiceProvider.GetRequiredService<AccountService>();
-    var clientFactory = scope.ServiceProvider.GetRequiredService<IClientFactory>();
-    var sendOperation = scope.ServiceProvider.GetRequiredService<SendOperation<SpeckleCollectionWrapperGoo>>();
-
-    // TODO: Get any account for this server, as we don't have a mechanism yet to pass accountIds through
-    var account = accountManager.GetAccountWithServerUrlFallback("", new Uri(input.Resource.Server));
-
-    if (account is null)
-    {
-      throw new SpeckleAccountManagerException($"No default account was found");
-    }
-
-    var progress = new Progress<CardProgress>(_ =>
-    {
-      // TODO: Progress only makes sense in non-blocking async receive, which is not supported yet.
-      // Message = $"{progress.Status}: {progress.Progress}";
-    });
-
-    using var client = clientFactory.Create(account);
-    var sendInfo = await input.Resource.GetSendInfo(client, cancellationToken).ConfigureAwait(false);
-    var result = await sendOperation
-      .Execute(new List<SpeckleCollectionWrapperGoo>() { input.Input }, sendInfo, progress, cancellationToken)
-      .ConfigureAwait(false);
-
-    SpeckleUrlLatestModelVersionResource createdVersionResource =
-      new(sendInfo.ServerUrl.ToString(), sendInfo.ProjectId, sendInfo.ModelId);
-    Url = $"{createdVersionResource.Server}projects/{sendInfo.ProjectId}/models/{sendInfo.ModelId}"; // TODO: missing "@VersionId"
-
-    return new SendComponentOutput(createdVersionResource);
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/SpeckleSelectModelComponent.cs

@@ -1,507 +0,0 @@
-using GH_IO.Serialization;
-using Grasshopper.Kernel;
-using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Common.Operations;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Connectors.Grasshopper8.Registration;
-using Speckle.Sdk;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Models;
-using Speckle.Sdk.Credentials;
-using Version = Speckle.Sdk.Api.GraphQL.Models.Version;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations;
-
-public class SpeckleSelectModelComponent : GH_Component
-{
-  private Project? _project;
-  private Model? _model;
-  private Version? _version;
-  private Account? _account;
-
-  private bool _justPastedIn;
-
-  private string? _storedUserId;
-  private string? _storedServer;
-  private string? _storedProjectId;
-  private string? _storedModelId;
-  private string? _storedVersionId;
-
-  private readonly AccountService _accountService;
-  private readonly AccountManager _accountManager;
-  private readonly IClientFactory _clientFactory;
-
-  public ResourceCollection<Project>? LastFetchedProjects { get; set; }
-  public ResourceCollection<Model>? LastFetchedModels { get; set; }
-  public ResourceCollection<Version>? LastFetchedVersions { get; set; }
-
-  public GhContextMenuButton ProjectContextMenuButton { get; set; }
-  public GhContextMenuButton ModelContextMenuButton { get; set; }
-  public GhContextMenuButton VersionContextMenuButton { get; set; }
-
-  protected override Bitmap Icon => BitmapBuilder.CreateSquareIconBitmap("URL");
-
-  public SpeckleSelectModelComponent()
-    : base("Speckle Model URL", "URL", "User selectable model from speckle", "Speckle", "Models")
-  {
-    ProjectContextMenuButton = new GhContextMenuButton(
-      "Select Project",
-      "Select Project",
-      "Right-click to select project",
-      PopulateProjectMenu
-    );
-    ModelContextMenuButton = new GhContextMenuButton(
-      "Select Model",
-      "Select Project",
-      "Right-click to select a model",
-      PopulateModelMenu
-    );
-    VersionContextMenuButton = new GhContextMenuButton(
-      "Select Version",
-      "Select Version",
-      "Right-click to select a version",
-      PopulateVersionMenu
-    );
-
-    Attributes = new SpeckleSelectModelComponentAttributes(this);
-    _accountService = PriorityLoader.Container.GetRequiredService<AccountService>();
-    _accountManager = PriorityLoader.Container.GetRequiredService<AccountManager>();
-    _clientFactory = PriorityLoader.Container.GetRequiredService<IClientFactory>();
-    var account = _accountManager.GetDefaultAccount();
-    OnAccountSelected(account);
-  }
-
-  private bool PopulateVersionMenu(ToolStripDropDown menu)
-  {
-    if (LastFetchedVersions is null)
-    {
-      Menu_AppendItem(menu, "No versions were fetched");
-      return true;
-    }
-
-    if (LastFetchedVersions.items.Count == 0)
-    {
-      Menu_AppendItem(menu, "Model has no versions");
-      return true;
-    }
-
-    Menu_AppendItem(menu, "Search...", null, null, false, false);
-    Menu_AppendSeparator(menu);
-    Menu_AppendItem(
-      menu,
-      "Latest Version",
-      (_, _) => OnVersionSelected(null),
-      null,
-      _version != null,
-      _version == null
-    );
-
-    foreach (var version in LastFetchedVersions.items)
-    {
-      var desc = string.IsNullOrEmpty(version.message) ? "No description" : version.message;
-
-      Menu_AppendItem(
-        menu,
-        $"{version.id} - {desc}",
-        (_, _) => OnVersionSelected(version),
-        null,
-        _version?.id != version.id,
-        _version?.id == version.id
-      );
-    }
-
-    return true;
-  }
-
-  private bool PopulateModelMenu(ToolStripDropDown menu)
-  {
-    if (LastFetchedModels == null)
-    {
-      Menu_AppendItem(menu, "No models were fetched");
-      return true;
-    }
-
-    if (LastFetchedModels.items.Count == 0)
-    {
-      Menu_AppendItem(menu, "Project has no models");
-      return true;
-    }
-
-    Menu_AppendItem(menu, "Search...", null, null, false, false);
-    Menu_AppendSeparator(menu);
-
-    foreach (var model in LastFetchedModels.items)
-    {
-      var desc = string.IsNullOrEmpty(model.description) ? "No description" : model.description;
-
-      Menu_AppendItem(
-        menu,
-        $"{model.name} - {desc}",
-        (_, _) => OnModelSelected(model),
-        null,
-        _model?.id != model.id,
-        _model?.id == model.id
-      );
-    }
-
-    return true;
-  }
-
-  private bool PopulateProjectMenu(ToolStripDropDown menu)
-  {
-    if (LastFetchedProjects == null)
-    {
-      Menu_AppendItem(menu, "No projects were fetched");
-      return true;
-    }
-
-    Menu_AppendItem(menu, "Search...", null, null, false, false);
-    Menu_AppendSeparator(menu);
-
-    foreach (var project in LastFetchedProjects.items)
-    {
-      var desc = string.IsNullOrEmpty(project.description) ? "No description" : project.description;
-      Menu_AppendItem(
-        menu,
-        $"{project.name} - {desc}",
-        (_, _) => OnProjectSelected(project),
-        _project?.id != project.id,
-        _project?.id == project.id
-      );
-    }
-
-    return true;
-  }
-
-  private void OnAccountSelected(Account? account, bool expire = true, bool redraw = true)
-  {
-    _account = account;
-    Message = _account != null ? $"{_account.serverInfo.url}\n{_account.userInfo.email}" : null;
-    LastFetchedProjects = null;
-    OnProjectSelected(null, expire, redraw);
-  }
-
-  private void OnProjectSelected(Project? project, bool expire = true, bool redraw = true)
-  {
-    _project = project;
-    var suffix = ProjectContextMenuButton.Enabled
-      ? "Right-click to select another project."
-      : "Selection is disabled due to component input.";
-    if (_project != null)
-    {
-      ProjectContextMenuButton.Name = _project.name;
-      ProjectContextMenuButton.NickName = _project.id;
-      ProjectContextMenuButton.Description = $"{_project.description ?? "No description"}\n\n{suffix}";
-    }
-    else
-    {
-      ProjectContextMenuButton.Name = "Select Project";
-      ProjectContextMenuButton.NickName = "Project";
-      ProjectContextMenuButton.Description = "Right-click to select project";
-    }
-    LastFetchedModels = null;
-    OnModelSelected(null, expire, redraw);
-  }
-
-  private void OnModelSelected(Model? model, bool expire = true, bool redraw = true)
-  {
-    _model = model;
-    var suffix = ModelContextMenuButton.Enabled
-      ? "Right-click to select another model."
-      : "Selection is disabled due to component input.";
-    if (_model != null)
-    {
-      ModelContextMenuButton.Name = _model.name;
-      ModelContextMenuButton.NickName = _model.id;
-      ModelContextMenuButton.Description = $"{_model.description ?? "No description"}\n\n{suffix}";
-    }
-    else
-    {
-      ModelContextMenuButton.Name = "Select Model";
-      ModelContextMenuButton.NickName = "Model";
-      ModelContextMenuButton.Description = "Right-click to select model";
-    }
-    LastFetchedVersions = null;
-    OnVersionSelected(null, expire, redraw);
-  }
-
-  private void OnVersionSelected(Version? version, bool expire = true, bool redraw = true)
-  {
-    _version = version;
-    var suffix = VersionContextMenuButton.Enabled
-      ? "Right-click to select another version."
-      : "Selection is disabled due to component input.";
-    if (_version != null)
-    {
-      VersionContextMenuButton.Name = _version.id;
-      VersionContextMenuButton.NickName = _version.id;
-      VersionContextMenuButton.Description = $"{_version.message ?? "No message"}\n\n{suffix}";
-    }
-    else if (_model != null)
-    {
-      VersionContextMenuButton.NickName = "Latest Version";
-      VersionContextMenuButton.Name = "Latest Version";
-      VersionContextMenuButton.Description = "Gets the latest version from the selected model";
-    }
-    else
-    {
-      VersionContextMenuButton.Name = "Select Version";
-      VersionContextMenuButton.NickName = "Version";
-      VersionContextMenuButton.Description = "Right-click to select version";
-    }
-    if (expire)
-    {
-      ExpirePreview(redraw);
-      ExpireSolution(true);
-    }
-  }
-
-  public override Guid ComponentGuid => new("9638B3B5-C469-4570-B69F-686D8DA5C48D");
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    var urlIndex = pManager.AddTextParameter("Speckle Url", "Url", "Speckle URL", GH_ParamAccess.item);
-    pManager[urlIndex].Optional = true;
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddParameter(new SpeckleUrlModelResourceParam());
-  }
-
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    // Deal with inputs
-    string? urlInput = null;
-
-    // OPTION 1: Component has input wire connected
-    if (da.GetData(0, ref urlInput))
-    {
-      //Lock button interactions before anything else, to ensure any input (even invalid ones) lock the state.
-      SetComponentButtonsState(false);
-
-      if (urlInput == null || string.IsNullOrEmpty(urlInput))
-      {
-        AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "Input url was empty or null");
-        return;
-      }
-
-      try
-      {
-        var resource = SolveInstanceWithUrlInput(urlInput);
-        da.SetData(0, resource);
-      }
-      catch (SpeckleException e)
-      {
-        AddRuntimeMessage(GH_RuntimeMessageLevel.Error, e.Message);
-      }
-      return; // Fast exit!
-    }
-
-    // OPTION 2: Component is running with no wires connected to input.
-
-    // Unlock button interactions when no input data is provided (no wires connected)
-    SetComponentButtonsState(true);
-
-    if (_justPastedIn && _storedUserId != null && !string.IsNullOrEmpty(_storedUserId))
-    {
-      try
-      {
-        var account = _accountManager.GetAccount(_storedUserId);
-        OnAccountSelected(account, false);
-      }
-      catch (SpeckleAccountManagerException e)
-      {
-        // Swallow and move onto checking server.
-        Console.WriteLine(e);
-      }
-
-      if (_storedServer != null && _account == null)
-      {
-        var account = _accountService.GetAccountWithServerUrlFallback(_storedUserId ?? "", new Uri(_storedServer));
-        OnAccountSelected(account, false);
-      }
-    }
-
-    // Validate backing data
-    if (_account == null)
-    {
-      AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "Please select an account in the right click menu");
-      ProjectContextMenuButton.Enabled = false;
-      ModelContextMenuButton.Enabled = false;
-      VersionContextMenuButton.Enabled = false;
-      return;
-    }
-
-    Client client = _clientFactory.Create(_account);
-
-    LastFetchedProjects = client.ActiveUser.GetProjects(10, null, null).Result;
-    ProjectContextMenuButton.Enabled = true;
-
-    if (_justPastedIn && !string.IsNullOrEmpty(_storedProjectId))
-    {
-      var project = client.Project.Get(_storedProjectId!).Result;
-      OnProjectSelected(project, false);
-    }
-
-    if (_project == null)
-    {
-      ModelContextMenuButton.Enabled = false;
-      VersionContextMenuButton.Enabled = false;
-      return;
-    }
-
-    LastFetchedModels = client.Project.GetWithModels(_project.id, 10).Result.models;
-    ModelContextMenuButton.Enabled = true;
-
-    if (_justPastedIn && !string.IsNullOrEmpty(_storedModelId))
-    {
-      var model = client.Model.Get(_storedModelId!, _project.id).Result;
-      OnModelSelected(model, false);
-    }
-
-    if (_model == null)
-    {
-      VersionContextMenuButton.Enabled = false;
-      return;
-    }
-
-    LastFetchedVersions = client.Model.GetWithVersions(_model.id, _project.id, 10).Result.versions;
-    VersionContextMenuButton.Enabled = true;
-
-    if (_justPastedIn && !string.IsNullOrEmpty(_storedVersionId))
-    {
-      var version = client.Version.Get(_storedVersionId!, _project.id).Result;
-      OnVersionSelected(version);
-    }
-    if (_version == null)
-    {
-      // If no version selected, output `latest` resource
-      da.SetData(0, new SpeckleUrlLatestModelVersionResource(_account.serverInfo.url, _project.id, _model.id));
-      return;
-    }
-
-    // If all data points are selected, output specific version.
-    da.SetData(0, new SpeckleUrlModelVersionResource(_account.serverInfo.url, _project.id, _model.id, _version.id));
-  }
-
-  protected override void AfterSolveInstance()
-  {
-    // If the component runs once till the end, then it's no longer "just pasted in".
-    _justPastedIn = false;
-    base.AfterSolveInstance();
-  }
-
-  private void SetComponentButtonsState(bool enabled)
-  {
-    ProjectContextMenuButton.Enabled = enabled;
-    ModelContextMenuButton.Enabled = enabled;
-    VersionContextMenuButton.Enabled = enabled;
-  }
-
-  private SpeckleUrlModelResource SolveInstanceWithUrlInput(string urlInput)
-  {
-    // When input is provided, lock interaction of buttons so only text is shown (no context menu)
-    // Should perform validation, fill in all internal data of the component (project, model, version, account)
-    // Should notify user if any of this goes wrong.
-
-    var resources = SpeckleResourceBuilder.FromUrlString(urlInput);
-    if (resources.Length == 0)
-    {
-      throw new SpeckleException($"Input url string was empty");
-    }
-
-    if (resources.Length > 1)
-    {
-      throw new SpeckleException($"Input multi-model url is not supported");
-    }
-
-    var resource = resources.First();
-
-    var account = _accountService.GetAccountWithServerUrlFallback(string.Empty, new Uri(resource.Server));
-    OnAccountSelected(account, false);
-
-    if (_account == null)
-    {
-      throw new SpeckleException("No account found for server URL");
-    }
-
-    Client client = _clientFactory.Create(_account);
-
-    var project = client.Project.Get(resource.ProjectId).Result;
-    OnProjectSelected(project, false);
-
-    switch (resource)
-    {
-      case SpeckleUrlLatestModelVersionResource latestVersionResource:
-        var model = client.Model.Get(latestVersionResource.ModelId, latestVersionResource.ProjectId).Result;
-        OnModelSelected(model, false);
-        break;
-      case SpeckleUrlModelVersionResource versionResource:
-        var m = client.Model.Get(versionResource.ModelId, versionResource.ProjectId).Result;
-        OnModelSelected(m, false);
-        var v = client.Version.Get(versionResource.VersionId, versionResource.ProjectId).Result;
-        OnVersionSelected(v, false);
-        break;
-      case SpeckleUrlModelObjectResource:
-        throw new SpeckleException("Object URLs are not supported");
-      default:
-        throw new SpeckleException("Unknown Speckle resource type");
-    }
-
-    return resource;
-  }
-
-  public override void AppendAdditionalMenuItems(ToolStripDropDown menu)
-  {
-    base.AppendAdditionalMenuItems(menu);
-    var accountsMenu = Menu_AppendItem(menu, "Account");
-
-    foreach (var account in _accountManager.GetAccounts())
-    {
-      Menu_AppendItem(
-        accountsMenu.DropDown,
-        account.ToString(),
-        (_, _) => OnAccountSelected(account),
-        null,
-        _account?.id != account.id,
-        _account?.id == account.id
-      );
-    }
-  }
-
-  public override bool Write(GH_IWriter writer)
-  {
-    var baseRes = base.Write(writer);
-    writer.SetString("Server", _account?.serverInfo.url);
-    writer.SetString("User", _account?.id);
-    writer.SetString("Project", _project?.id);
-    writer.SetString("Model", _model?.id);
-    writer.SetString("Version", _version?.id);
-
-    return baseRes;
-  }
-
-  public override bool Read(GH_IReader reader)
-  {
-    var readRes = base.Read(reader);
-
-    reader.TryGetString("Server", ref _storedServer);
-    reader.TryGetString("User", ref _storedUserId);
-    reader.TryGetString("Project", ref _storedProjectId);
-    reader.TryGetString("Model", ref _storedModelId);
-    reader.TryGetString("Version", ref _storedVersionId);
-
-    _justPastedIn = true;
-    return readRes;
-  }
-
-  public override void ExpirePreview(bool redraw)
-  {
-    ProjectContextMenuButton.ExpirePreview(redraw);
-    ModelContextMenuButton.ExpirePreview(redraw);
-    VersionContextMenuButton.ExpirePreview(redraw);
-    base.ExpirePreview(redraw);
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Operations/SpeckleSelectModelComponentAttributes.cs

@@ -1,97 +0,0 @@
-using Grasshopper.GUI.Canvas;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Attributes;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Operations;
-
-public class SpeckleSelectModelComponentAttributes : GH_ComponentAttributes
-{
-  private readonly SpeckleSelectModelComponent _typedOwner;
-
-  public SpeckleSelectModelComponentAttributes(IGH_Component component)
-    : base(component)
-  {
-    _typedOwner = (SpeckleSelectModelComponent)component;
-  }
-
-  public override void AppendToAttributeTree(List<IGH_Attributes> attributes)
-  {
-    base.AppendToAttributeTree(attributes);
-    _typedOwner.ProjectContextMenuButton.Attributes?.AppendToAttributeTree(attributes);
-    _typedOwner.ModelContextMenuButton.Attributes?.AppendToAttributeTree(attributes);
-    _typedOwner.VersionContextMenuButton.Attributes?.AppendToAttributeTree(attributes);
-  }
-
-  private void InitialiseAttributes()
-  {
-    if (_typedOwner.ProjectContextMenuButton.Attributes == null)
-    {
-      _typedOwner.ProjectContextMenuButton.Attributes = new GhContextMenuButtonAttributes(
-        _typedOwner.ProjectContextMenuButton
-      )
-      {
-        Parent = this,
-      };
-    }
-
-    if (_typedOwner.ModelContextMenuButton.Attributes == null)
-    {
-      _typedOwner.ModelContextMenuButton.Attributes = new GhContextMenuButtonAttributes(
-        _typedOwner.ModelContextMenuButton
-      )
-      {
-        Parent = this,
-        Pivot = Pivot
-      };
-    }
-
-    if (_typedOwner.VersionContextMenuButton.Attributes == null)
-    {
-      _typedOwner.VersionContextMenuButton.Attributes = new GhContextMenuButtonAttributes(
-        _typedOwner.VersionContextMenuButton
-      )
-      {
-        Parent = this,
-        Pivot = Pivot
-      };
-    }
-  }
-
-  protected override void Layout()
-  {
-    base.Layout();
-    var baseRec = GH_Convert.ToRectangle(Bounds);
-    baseRec.Height += 26 * 3;
-
-    var btnRec = baseRec;
-    btnRec.Y = baseRec.Bottom - 26 * 3;
-    btnRec.Height = 26;
-    btnRec.Inflate(-2, -2);
-
-    var btnRec2 = btnRec;
-    btnRec2.Y = btnRec.Bottom + 2;
-
-    var btnRec3 = btnRec;
-    btnRec3.Y = btnRec2.Bottom + 2;
-
-    Bounds = baseRec;
-    InitialiseAttributes();
-    // Both pivot and bounds require updating to proper render buttons on location
-    _typedOwner.ProjectContextMenuButton.Attributes.Pivot = btnRec.Location;
-    _typedOwner.ProjectContextMenuButton.Attributes.Bounds = btnRec;
-    _typedOwner.ModelContextMenuButton.Attributes.Pivot = btnRec2.Location;
-    _typedOwner.ModelContextMenuButton.Attributes.Bounds = btnRec2;
-    _typedOwner.VersionContextMenuButton.Attributes.Pivot = btnRec3.Location;
-    _typedOwner.VersionContextMenuButton.Attributes.Bounds = btnRec3;
-  }
-
-  protected override void Render(GH_Canvas canvas, Graphics graphics, GH_CanvasChannel channel)
-  {
-    base.Render(canvas, graphics, channel);
-    // Draw custom buttons and dropdowns
-
-    _typedOwner.ProjectContextMenuButton.Attributes.RenderToCanvas(canvas, channel);
-    _typedOwner.ModelContextMenuButton.Attributes.RenderToCanvas(canvas, channel);
-    _typedOwner.VersionContextMenuButton.Attributes.RenderToCanvas(canvas, channel);
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Properties/CreateSpeckleObject.cs

@@ -1,89 +0,0 @@
-using System.Runtime.InteropServices;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Types;
-using Rhino.Geometry;
-using Speckle.Connectors.Grasshopper8.HostApp;
-using Speckle.Connectors.Grasshopper8.Parameters;
-using Speckle.Sdk.Models;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Properties;
-
-[Guid("F9418610-ACAE-4417-B010-19EBEA6A121F")]
-public class CreateSpeckleObject : GH_Component
-{
-  public CreateSpeckleObject()
-    : base(
-      "Create Speckle Object",
-      "CSO",
-      "Creates a Speckle Object",
-      ComponentCategories.PRIMARY_RIBBON,
-      ComponentCategories.OBJECTS
-    ) { }
-
-  public override Guid ComponentGuid => GetType().GUID;
-
-  protected override Bitmap Icon => BitmapBuilder.CreateCircleIconBitmap("cO");
-
-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
-    pManager.AddGenericParameter("Geometry", "G", "The geometry of the new Speckle Object", GH_ParamAccess.item);
-
-    pManager.AddTextParameter("Name", "N", "Name of the new Speckle Object", GH_ParamAccess.item);
-    Params.Input[1].Optional = true;
-
-    pManager.AddParameter(
-      new SpecklePropertyGroupParam(),
-      "Properties",
-      "P",
-      "The properties of the new Speckle Object",
-      GH_ParamAccess.item
-    );
-    Params.Input[2].Optional = true;
-
-    // TODO: add render material and color
-  }
-
-  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
-  {
-    pManager.AddGenericParameter("Speckle Object", "SO", "The created Speckle Object", GH_ParamAccess.item);
-  }
-
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    object gooGeometry = new();
-    da.GetData(0, ref gooGeometry);
-    GeometryBase geometry = ((IGH_GeometricGoo)gooGeometry).GeometricGooToGeometryBase();
-
-    string name = "";
-    da.GetData(1, ref name);
-
-    SpecklePropertyGroupGoo properties = new();
-    da.GetData(2, ref properties);
-
-    // convert the properties
-    Dictionary<string, object?> props = new();
-    properties.CastTo(ref props);
-
-    // convert the geometries
-    Base converted = ToSpeckleConversionContext.ToSpeckleConverter.Convert(geometry);
-
-    Objects.Data.DataObject grasshopperObject =
-      new()
-      {
-        name = name,
-        displayValue = new() { converted },
-        properties = props
-      };
-
-    SpeckleObjectWrapper so =
-      new()
-      {
-        Base = grasshopperObject,
-        GeometryBase = geometry,
-        Properties = properties,
-        Name = name
-      };
-
-    da.SetData(0, new SpeckleObjectWrapperGoo(so));
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Properties/FilterPropertiesByPropertyGroupPaths.cs

@@ -1,208 +0,0 @@
-using Grasshopper;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Data;
-using Grasshopper.Kernel.Parameters;
-using Speckle.Connectors.Grasshopper8.Parameters;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Properties;
-
-public class FilterPropertiesByPropertyGroupPaths : GH_Component, IGH_VariableParameterComponent
-{
-  /// <summary>
-  /// Gets the unique ID for this component. Do not change this ID after release.
-  /// </summary>
-  public override Guid ComponentGuid => new Guid("BF517D60-B853-4C61-9574-AD8A718B995B");
-
-  public FilterPropertiesByPropertyGroupPaths()
-    : base(
-      "FilterPropertiesByPropertyGroupPaths",
-      "pgF",
-      "Filters object properties by their property group path",
-      "Speckle",
-      "Properties"
-    ) { }
-
-  protected override void RegisterInputParams(GH_Component.GH_InputParamManager pManager)
-  {
-    pManager.AddParameter(
-      new SpeckleObjectParam(),
-      "Objects",
-      "O",
-      "Speckle Objects to filter properties from",
-      GH_ParamAccess.list
-    );
-    pManager.AddTextParameter("Paths", "P", "Property Group paths to filter by", GH_ParamAccess.list);
-  }
-
-  protected override void RegisterOutputParams(GH_Component.GH_OutputParamManager pManager)
-  {
-    // pManager.AddParameter(      new SpecklePropertyParam(),      "Properties",      "P",      "The properties of the selected Object",      GH_ParamAccess.tree    );
-  }
-
-  protected override void SolveInstance(IGH_DataAccess da)
-  {
-    List<string> paths = new();
-    da.GetDataList(1, paths);
-
-    if (paths.Count == 0)
-    {
-      return;
-    }
-
-    List<SpeckleObjectWrapperGoo> objectWrapperGoos = new();
-    da.GetDataList(0, objectWrapperGoos);
-
-    if (objectWrapperGoos.Count == 0)
-    {
-      return;
-    }
-
-    // we're creating an output param for every property path selected
-    // we're creating a branch in the output tree for every object for that property
-
-    List<OutputParamWrapper> outputParams = new();
-    foreach (string path in paths)
-    {
-      // create the output for this path
-      DataTree<object?> paramResult = new();
-      Param_GenericObject param =
-        new()
-        {
-          Name = path,
-          NickName = path,
-          Access = GH_ParamAccess.tree
-        };
-
-      // get the branch and property value for each input object
-      for (int i = 0; i < objectWrapperGoos.Count; i++)
-      {
-        // create the result branch for this object
-        SpeckleObjectWrapperGoo objectGoo = objectWrapperGoos[i];
-        GH_Path objectPath = new GH_Path(i);
-
-        SpecklePropertyGroupGoo properties = objectGoo.Value.Properties;
-        if (properties.Value.Count == 0)
-        {
-          paramResult.Add(null, objectPath);
-          continue;
-        }
-
-        SpecklePropertyGoo objectProperty = FindProperty(properties, path);
-        paramResult.Add(string.IsNullOrEmpty((string)objectProperty.Value) ? null : objectProperty.Value, objectPath);
-      }
-
-      outputParams.Add(new OutputParamWrapper(param, paramResult));
-    }
-
-    if (da.Iteration == 0 && OutputMismatch(outputParams))
-    {
-      OnPingDocument()
-        .ScheduleSolution(
-          5,
-          _ =>
-          {
-            CreateOutputs(outputParams);
-          }
-        );
-    }
-    else
-    {
-      for (int i = 0; i < outputParams.Count; i++)
-      {
-        var outParam = Params.Output[i];
-        var outParamWrapper = outputParams[i];
-        switch (outParam.Access)
-        {
-          case GH_ParamAccess.item:
-            da.SetData(i, outParamWrapper.Values);
-            break;
-          case GH_ParamAccess.tree:
-            da.SetDataTree(i, (DataTree<object?>)outParamWrapper.Values);
-            break;
-        }
-      }
-    }
-  }
-
-  private SpecklePropertyGoo FindProperty(SpecklePropertyGroupGoo root, string unifiedPath)
-  {
-    if (!root.Value.TryGetValue(unifiedPath, out SpecklePropertyGoo currentGoo))
-    {
-      return new() { Path = unifiedPath, Value = "" };
-    }
-
-    return currentGoo;
-  }
-
-  private bool OutputMismatch(List<OutputParamWrapper> outputParams)
-  {
-    if (Params.Output.Count != outputParams.Count)
-    {
-      return true;
-    }
-
-    var count = 0;
-    foreach (var newParam in outputParams)
-    {
-      var oldParam = Params.Output[count];
-      if (
-        oldParam.NickName != newParam.Param.NickName
-        || oldParam.Name != newParam.Param.Name
-        || oldParam.Access != newParam.Param.Access
-      )
-      {
-        return true;
-      }
-      count++;
-    }
-
-    return false;
-  }
-
-  private void CreateOutputs(List<OutputParamWrapper> outputParams)
-  {
-    // TODO: better, nicer handling of creation/removal
-    while (Params.Output.Count > 0)
-    {
-      Params.UnregisterOutputParameter(Params.Output[^1]);
-    }
-
-    foreach (var newParam in outputParams)
-    {
-      var param = new Param_GenericObject
-      {
-        Name = newParam.Param.Name,
-        NickName = newParam.Param.NickName,
-        MutableNickName = false,
-        Access = newParam.Param.Access
-      };
-      Params.RegisterOutputParam(param);
-    }
-
-    Params.OnParametersChanged();
-    VariableParameterMaintenance();
-    ExpireSolution(false);
-  }
-
-  public bool CanInsertParameter(GH_ParameterSide side, int index) => false;
-
-  public bool CanRemoveParameter(GH_ParameterSide side, int index) => false;
-
-  public IGH_Param CreateParameter(GH_ParameterSide side, int index)
-  {
-    var myParam = new Param_GenericObject
-    {
-      Name = GH_ComponentParamServer.InventUniqueNickname("ABCD", Params.Input),
-      MutableNickName = true,
-      Optional = true
-    };
-    myParam.NickName = myParam.Name;
-    return myParam;
-  }
-
-  public bool DestroyParameter(GH_ParameterSide side, int index) => side == GH_ParameterSide.Output;
-
-  public void VariableParameterMaintenance() { }
-}
-
-public record OutputParamWrapper(Param_GenericObject Param, object Values);

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Components/Properties/PropertyGroupPathsSelector.cs

@@ -1,61 +0,0 @@
-using Grasshopper.Kernel.Types;
-using Grasshopper.Rhinoceros.Model;
-using Speckle.Connectors.Common.Extensions;
-using Speckle.Connectors.Grasshopper8.Components.BaseComponents;
-using Speckle.Connectors.Grasshopper8.Parameters;
-
-namespace Speckle.Connectors.Grasshopper8.Components.Properties;
-
-public class PropertyGroupPathsSelector : ValueSet<IGH_Goo>
-{
-  public PropertyGroupPathsSelector()
-    : base(
-      "Property Group Paths Selector",
-      "Paths",
-      "Allows you to select a set of property group paths for filtering",
-      "Speckle",
-      "Properties"
-    ) { }
-
-  public override Guid ComponentGuid => new Guid("8882BE3A-81F1-4416-B420-58D69E4CC8F1");
-
-  protected override void LoadVolatileData()
-  {
-    var objectPropertyGroups = VolatileData
-      .AllData(true)
-      .OfType<SpeckleObjectWrapperGoo>()
-      .Select(goo => goo.Value.Properties.Value)
-      .ToList();
-
-    // support model objects direct piping also
-    if (objectPropertyGroups.Count != VolatileData.DataCount)
-    {
-      var modelObjects = VolatileData
-        .AllData(true)
-        .OfType<ModelObject>()
-        .Select(mo => new SpeckleObjectWrapperGoo(mo).Value.Properties.Value)
-        .ToList();
-      objectPropertyGroups.AddRange(modelObjects);
-    }
-
-    if (objectPropertyGroups.Count == 0)
-    {
-      return;
-    }
-
-    var paths = GetPropertyPaths(objectPropertyGroups);
-    m_data.AppendRange(paths.Select(s => new GH_String(s)));
-  }
-
-  private static List<string> GetPropertyPaths(List<Dictionary<string, SpecklePropertyGoo>> objectPropertyGroups)
-  {
-    var result = new HashSet<string>();
-    foreach (var dict in objectPropertyGroups)
-    {
-      result.AddRange(
-        dict.Keys.Where(k => !(k.EndsWith(".name") || k.EndsWith(".units") || k.EndsWith(".internalDefinitionName")))
-      );
-    }
-    return result.ToList();
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/BitmapBuilder.cs

@@ -1,113 +0,0 @@
-using System.Drawing.Drawing2D;
-
-namespace Speckle.Connectors.Grasshopper8.HostApp;
-
-public static class BitmapBuilder
-{
-  public static Bitmap CreateSquareIconBitmap(string text, int width = 24, int height = 24)
-  {
-    Bitmap bitmap = new(width, height);
-    using Graphics graphics = Graphics.FromImage(bitmap);
-
-    // Enable high-quality rendering
-    graphics.SmoothingMode = SmoothingMode.AntiAlias;
-
-    // Set background to transparent
-    graphics.Clear(Color.Transparent);
-
-    // Rectangle with a 1px offset
-    Rectangle squareRect = new(1, 1, width - 2, height - 2);
-
-    using (Brush blueBrush = new SolidBrush(Color.Blue))
-    {
-      graphics.FillRectangle(blueBrush, squareRect);
-    }
-
-    // Draw white letters in the center
-    using (Font font = new("Arial", 8, FontStyle.Bold, GraphicsUnit.Pixel))
-    using (Brush whiteBrush = new SolidBrush(Color.White))
-    {
-      StringFormat format = new() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
-
-      graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
-      graphics.DrawString(text, font, whiteBrush, new RectangleF(1, 1, width - 2, height - 2), format);
-    }
-
-    return bitmap;
-  }
-
-  public static Bitmap CreateCircleIconBitmap(string text, int width = 24, int height = 24)
-  {
-    Bitmap bitmap = new(width, height);
-    using Graphics graphics = Graphics.FromImage(bitmap);
-
-    // Enable high-quality rendering
-    graphics.SmoothingMode = SmoothingMode.AntiAlias;
-
-    // Set background to transparent
-    graphics.Clear(Color.Transparent);
-
-    // Rectangle with a 1px offset
-    Rectangle squareRect = new(1, 1, width - 2, height - 2);
-
-    using (Brush blueBrush = new SolidBrush(Color.Blue))
-    {
-      graphics.FillEllipse(blueBrush, squareRect);
-    }
-
-    // Draw white letters in the center
-    using (Font font = new("Arial", 8, FontStyle.Bold, GraphicsUnit.Pixel))
-    using (Brush whiteBrush = new SolidBrush(Color.White))
-    {
-      StringFormat format = new() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
-
-      graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
-      graphics.DrawString(text, font, whiteBrush, new RectangleF(1, 1, width - 2, height - 2), format);
-    }
-
-    return bitmap;
-  }
-
-  public static Bitmap CreateHexagonalBitmap(string text, int width = 24, int height = 24)
-  {
-    Bitmap bitmap = new(width, height);
-    using Graphics graphics = Graphics.FromImage(bitmap);
-
-    // Enable high-quality rendering
-    graphics.SmoothingMode = SmoothingMode.AntiAlias;
-
-    // Set background to transparent
-    graphics.Clear(Color.Transparent);
-
-    // Calculate hexagon points centered within the bitmap
-    float side = (width - 2) / 2.236f; // 2.236f approximates 4 / √3 for regular hex dimensions
-    float h = side * (float)Math.Sqrt(3) / 2;
-    float centerX = width / 2f;
-    float centerY = height / 2f;
-
-    Point[] hexagonPoints =
-    [
-      new((int)(centerX - side / 2), (int)(centerY - h)),
-      new((int)(centerX + side / 2), (int)(centerY - h)),
-      new((int)(centerX + side), (int)centerY),
-      new((int)(centerX + side / 2), (int)(centerY + h)),
-      new((int)(centerX - side / 2), (int)(centerY + h)),
-      new((int)(centerX - side), (int)centerY)
-    ];
-
-    using (Brush blueBrush = new SolidBrush(Color.Blue))
-    {
-      graphics.FillPolygon(blueBrush, hexagonPoints);
-    }
-
-    // Draw white letters in the center
-    using Font font = new("Monospace", 10, FontStyle.Bold, GraphicsUnit.Pixel);
-    using Brush whiteBrush = new SolidBrush(Color.White);
-    StringFormat format = new() { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center };
-
-    graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
-    graphics.DrawString(text, font, whiteBrush, new RectangleF(0, 1, width, height), format);
-
-    return bitmap;
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/Extras/DebounceDispatcher.cs

@@ -1,136 +0,0 @@
-using System.Windows.Threading;
-
-namespace Speckle.Connectors.Grasshopper8.HostApp.Extras;
-
-/// <summary>
-/// Provides Debounce() and Throttle() methods.
-/// Use these methods to ensure that events aren't handled too frequently.
-///
-/// Throttle() ensures that events are throttled by the interval specified.
-/// Only the last event in the interval sequence of events fires.
-///
-/// Debounce() fires an event only after the specified interval has passed
-/// in which no other pending event has fired. Only the last event in the
-/// sequence is fired.
-/// </summary>
-public class DebounceDispatcher
-{
-  private DispatcherTimer? _timer;
-  private DateTime TimerStarted { get; set; } = DateTime.UtcNow.AddYears(-1);
-
-  /// <summary>
-  /// Debounce an event by resetting the event timeout every time the event is
-  /// fired. The behavior is that the Action passed is fired only after events
-  /// stop firing for the given timeout period.
-  ///
-  /// Use Debounce when you want events to fire only after events stop firing
-  /// after the given interval timeout period.
-  ///
-  /// Wrap the logic you would normally use in your event code into
-  /// the  Action you pass to this method to debounce the event.
-  /// Example: https://gist.github.com/RickStrahl/0519b678f3294e27891f4d4f0608519a
-  /// </summary>
-  /// <param name="interval">Timeout in Milliseconds</param>
-  /// <param name="action">Action<object> to fire when debounced event fires</object></param>
-  /// <param name="param">optional parameter</param>
-  /// <param name="priority">optional priorty for the dispatcher</param>
-  /// <param name="disp">optional dispatcher. If not passed or null CurrentDispatcher is used.</param>
-  public void Debounce(
-    int interval,
-    Action<object?> action,
-    object? param = null,
-    DispatcherPriority priority = DispatcherPriority.ApplicationIdle,
-    Dispatcher? disp = null
-  )
-  {
-    // kill pending timer and pending ticks
-    _timer?.Stop();
-    _timer = null;
-
-    if (disp == null)
-    {
-      disp = Dispatcher.CurrentDispatcher;
-    }
-
-    // timer is recreated for each event and effectively
-    // resets the timeout. Action only fires after timeout has fully
-    // elapsed without other events firing in between
-    _timer = new DispatcherTimer(
-      TimeSpan.FromMilliseconds(interval),
-      priority,
-      (s, e) =>
-      {
-        if (_timer == null)
-        {
-          return;
-        }
-
-        _timer?.Stop();
-        _timer = null;
-        action.Invoke(param);
-      },
-      disp
-    );
-
-    _timer.Start();
-  }
-
-  /// <summary>
-  /// This method throttles events by allowing only 1 event to fire for the given
-  /// timeout period. Only the last event fired is handled - all others are ignored.
-  /// Throttle will fire events every timeout ms even if additional events are pending.
-  ///
-  /// Use Throttle where you need to ensure that events fire at given intervals.
-  /// </summary>
-  /// <param name="interval">Timeout in Milliseconds</param>
-  /// <param name="action">Action<object> to fire when debounced event fires</object></param>
-  /// <param name="param">optional parameter</param>
-  /// <param name="priority">optional priorty for the dispatcher</param>
-  /// <param name="disp">optional dispatcher. If not passed or null CurrentDispatcher is used.</param>
-  public void Throttle(
-    int interval,
-    Action<object?> action,
-    object? param = null,
-    DispatcherPriority priority = DispatcherPriority.ApplicationIdle,
-    Dispatcher? disp = null
-  )
-  {
-    // kill pending timer and pending ticks
-    _timer?.Stop();
-    _timer = null;
-
-    if (disp == null)
-    {
-      disp = Dispatcher.CurrentDispatcher;
-    }
-
-    var curTime = DateTime.UtcNow;
-
-    // if timeout is not up yet - adjust timeout to fire
-    // with potentially new Action parameters
-    if (curTime.Subtract(TimerStarted).TotalMilliseconds < interval)
-    {
-      interval -= (int)curTime.Subtract(TimerStarted).TotalMilliseconds;
-    }
-
-    _timer = new DispatcherTimer(
-      TimeSpan.FromMilliseconds(interval),
-      priority,
-      (s, e) =>
-      {
-        if (_timer == null)
-        {
-          return;
-        }
-
-        _timer?.Stop();
-        _timer = null;
-        action.Invoke(param);
-      },
-      disp
-    );
-
-    _timer.Start();
-    TimerStarted = curTime;
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/Globals.cs

@@ -1,7 +0,0 @@
-namespace Speckle.Connectors.Grasshopper8.HostApp;
-
-public static class Constants
-{
-  public const string LAYER_PATH_DELIMITER = "::";
-  public const string PROPERTY_PATH_DELIMITER = ".";
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/Helpers.cs

@@ -1,157 +0,0 @@
-using Grasshopper;
-using Grasshopper.Kernel;
-using Grasshopper.Kernel.Data;
-using Grasshopper.Kernel.Types;
-using Rhino;
-using Rhino.Geometry;
-using Speckle.DoubleNumerics;
-using Speckle.Sdk;
-using Speckle.Sdk.Common;
-using Speckle.Sdk.Common.Exceptions;
-
-namespace Speckle.Connectors.Grasshopper8.HostApp;
-
-public static class GrasshopperHelpers
-{
-  public static string ToSpeckleString(this UnitSystem unitSystem)
-  {
-    switch (unitSystem)
-    {
-      case UnitSystem.None:
-        return Units.Meters;
-      case UnitSystem.Millimeters:
-        return Units.Millimeters;
-      case UnitSystem.Centimeters:
-        return Units.Centimeters;
-      case UnitSystem.Meters:
-        return Units.Meters;
-      case UnitSystem.Kilometers:
-        return Units.Kilometers;
-      case UnitSystem.Inches:
-        return Units.Inches;
-      case UnitSystem.Feet:
-        return Units.Feet;
-      case UnitSystem.Yards:
-        return Units.Yards;
-      case UnitSystem.Miles:
-        return Units.Miles;
-      case UnitSystem.Unset:
-        return Units.Meters;
-      default:
-        throw new UnitNotSupportedException($"The Unit System \"{unitSystem}\" is unsupported.");
-    }
-  }
-
-  public static Transform MatrixToTransform(Matrix4x4 matrix, string units)
-  {
-    var currentDoc = RhinoDoc.ActiveDoc; // POC: too much right now to interface around
-    var conversionFactor = Units.GetConversionFactor(units, currentDoc.ModelUnitSystem.ToSpeckleString());
-
-    var t = Transform.Identity;
-    t.M00 = matrix.M11;
-    t.M01 = matrix.M12;
-    t.M02 = matrix.M13;
-    t.M03 = matrix.M14 * conversionFactor;
-
-    t.M10 = matrix.M21;
-    t.M11 = matrix.M22;
-    t.M12 = matrix.M23;
-    t.M13 = matrix.M24 * conversionFactor;
-
-    t.M20 = matrix.M31;
-    t.M21 = matrix.M32;
-    t.M22 = matrix.M33;
-    t.M23 = matrix.M34 * conversionFactor;
-
-    t.M30 = matrix.M41;
-    t.M31 = matrix.M42;
-    t.M32 = matrix.M43;
-    t.M33 = matrix.M44;
-    return t;
-  }
-
-  /// <summary>
-  /// Attempts to cast the goo to a geometry base object.
-  /// </summary>
-  /// <param name="geoGeo"></param>
-  /// <returns></returns>
-  /// <exception cref="SpeckleException">If it fails to cast</exception>
-  public static GeometryBase GeometricGooToGeometryBase(this IGH_GeometricGoo geoGeo)
-  {
-    var value = geoGeo.GetType().GetProperty("Value")?.GetValue(geoGeo);
-    switch (value)
-    {
-      case GeometryBase gb:
-        return gb;
-      case Point3d pt:
-        return new Rhino.Geometry.Point(pt);
-      case Line ln:
-        return new LineCurve(ln);
-      case Rectangle3d rec:
-        return rec.ToNurbsCurve();
-      case Circle c:
-        return new ArcCurve(c);
-      case Arc ac:
-        return new ArcCurve(ac);
-      case Ellipse el:
-        return el.ToNurbsCurve();
-      case Sphere sp:
-        return sp.ToBrep();
-    }
-
-    throw new SpeckleException("Failed to cast IGH_GeometricGoo to geometry base");
-  }
-
-  /// <summary>
-  /// Creates a tree based of a string that encodes the grasshopper topology.
-  /// </summary>
-  /// <param name="topology"></param>
-  /// <param name="subset"></param>
-  /// <returns></returns>
-  public static DataTree<object> CreateDataTreeFromTopologyAndItems(string topology, System.Collections.IList subset)
-  {
-    var tree = new DataTree<object>();
-    var treeTopo = topology.Split(' ');
-    int subsetCount = 0;
-    foreach (var branch in treeTopo)
-    {
-      if (!string.IsNullOrEmpty(branch))
-      {
-        var branchTopo = branch.Split('-')[0].Split(';');
-        var branchIndexes = new List<int>();
-        foreach (var t in branchTopo)
-        {
-          branchIndexes.Add(Convert.ToInt32(t));
-        }
-
-        var elCount = Convert.ToInt32(branch.Split('-')[1]);
-        var myPath = new GH_Path(branchIndexes.ToArray());
-
-        for (int i = 0; i < elCount; i++)
-        {
-          tree.EnsurePath(myPath).Add(new Grasshopper.Kernel.Types.GH_ObjectWrapper(subset[subsetCount + i]));
-        }
-
-        subsetCount += elCount;
-      }
-    }
-
-    return tree;
-  }
-
-  /// <summary>
-  /// Encodes a tree topology into an exhaustive string which can be used to recreate it using
-  /// <see cref="CreateDataTreeFromTopologyAndItems"/>.
-  /// </summary>
-  /// <param name="param"></param>
-  /// <returns></returns>
-  public static string GetParamTopology(IGH_Param param)
-  {
-    string topology = "";
-    foreach (GH_Path myPath in param.VolatileData.Paths)
-    {
-      topology += myPath.ToString(false) + "-" + param.VolatileData.get_Branch(myPath).Count + " ";
-    }
-    return topology;
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/SpeckleResource.cs

@@ -1,104 +0,0 @@
-using Speckle.Connectors.Common.Operations;
-using Speckle.Sdk.Api;
-using Speckle.Sdk.Api.GraphQL.Models;
-using Speckle.Sdk.Common;
-using Version = Speckle.Sdk.Api.GraphQL.Models.Version;
-
-namespace Speckle.Connectors.Grasshopper8.HostApp;
-
-public abstract record SpeckleUrlModelResource(string Server, string ProjectId)
-{
-  public abstract Task<ReceiveInfo> GetReceiveInfo(Client client, CancellationToken cancellationToken = default);
-
-  public abstract Task<SendInfo> GetSendInfo(Client client, CancellationToken cancellationToken = default);
-}
-
-public record SpeckleUrlLatestModelVersionResource(string Server, string ProjectId, string ModelId)
-  : SpeckleUrlModelResource(Server, ProjectId)
-{
-  public override async Task<ReceiveInfo> GetReceiveInfo(Client client, CancellationToken cancellationToken = default)
-  {
-    Project project = await client.Project.Get(ProjectId, cancellationToken).ConfigureAwait(false);
-    ModelWithVersions model = await client
-      .Model.GetWithVersions(ModelId, ProjectId, 1, null, null, cancellationToken)
-      .ConfigureAwait(false);
-    Version version = model.versions.items[0];
-
-    var info = new ReceiveInfo(
-      client.Account.id,
-      new Uri(Server),
-      ProjectId,
-      project.name,
-      ModelId,
-      model.name,
-      version.id,
-      version.sourceApplication.NotNull()
-    );
-
-    return info;
-  }
-
-  public override async Task<SendInfo> GetSendInfo(Client client, CancellationToken cancellationToken = default)
-  {
-    // We don't care about the return info, we just want to be sure we have access and everything exists.
-    await client.Project.Get(ProjectId, cancellationToken).ConfigureAwait(false);
-    await client.Model.Get(ModelId, ProjectId, cancellationToken).ConfigureAwait(false);
-
-    return new SendInfo(
-      client.Account.id,
-      new Uri(Server),
-      ProjectId,
-      ModelId,
-      "Grasshopper8" // TODO: Grab from the right place!
-    );
-  }
-}
-
-public record SpeckleUrlModelVersionResource(string Server, string ProjectId, string ModelId, string VersionId)
-  : SpeckleUrlModelResource(Server, ProjectId)
-{
-  public override async Task<ReceiveInfo> GetReceiveInfo(Client client, CancellationToken cancellationToken = default)
-  {
-    Project project = await client.Project.Get(ProjectId, cancellationToken).ConfigureAwait(false);
-    Model model = await client.Model.Get(ModelId, ProjectId, cancellationToken).ConfigureAwait(false);
-    Version version = await client.Version.Get(VersionId, ProjectId, cancellationToken).ConfigureAwait(false);
-
-    var info = new ReceiveInfo(
-      client.Account.id,
-      new Uri(Server),
-      ProjectId,
-      project.name,
-      ModelId,
-      model.name,
-      VersionId,
-      version.sourceApplication.NotNull()
-    );
-
-    return info;
-  }
-
-  public override async Task<SendInfo> GetSendInfo(Client client, CancellationToken cancellationToken = default)
-  {
-    // We don't care about the return info, we just want to be sure we have access and everything exists.
-    await client.Project.Get(ProjectId, cancellationToken).ConfigureAwait(false);
-    await client.Model.Get(ModelId, ProjectId, cancellationToken).ConfigureAwait(false);
-
-    return new SendInfo(
-      client.Account.id,
-      new Uri(Server),
-      ProjectId,
-      ModelId,
-      "Grasshopper8" // TODO: Grab from the right place!
-    );
-  }
-}
-
-public record SpeckleUrlModelObjectResource(string Server, string ProjectId, string ObjectId)
-  : SpeckleUrlModelResource(Server, ProjectId)
-{
-  public override Task<ReceiveInfo> GetReceiveInfo(Client client, CancellationToken cancellationToken = default) =>
-    throw new NotImplementedException("Object Resources are not supported yet");
-
-  public override Task<SendInfo> GetSendInfo(Client client, CancellationToken cancellationToken = default) =>
-    throw new NotImplementedException("Object Resources are not supported yet");
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/SpeckleResourceBuilder.cs

@@ -1,82 +0,0 @@
-using System.Text.RegularExpressions;
-using Speckle.Sdk;
-
-namespace Speckle.Connectors.Grasshopper8.HostApp;
-
-public record SpeckleResourceBuilder
-{
-  /// <summary>
-  /// The ReGex pattern to determine if a URL's AbsolutePath is a Frontend2 URL or not.
-  /// </summary>
-  private static readonly Regex s_fe2UrlRegex =
-    new(
-      @"/projects/(?<projectId>[\w\d]+)(?:/models/(?<model>[\w\d]+(?:@[\w\d]+)?)(?:,(?<additionalModels>[\w\d]+(?:@[\w\d]+)?))*)?"
-    );
-
-  public static SpeckleUrlModelResource[] FromUrlString(string speckleModel)
-  {
-    var uri = new Uri(speckleModel);
-    var serverUrl = uri.GetLeftPart(UriPartial.Authority);
-    var match = s_fe2UrlRegex.Match(speckleModel);
-    var result = ParseFe2RegexMatch(serverUrl, match);
-    return result;
-  }
-
-  private static SpeckleUrlModelResource[] ParseFe2RegexMatch(string serverUrl, Match match)
-  {
-    var projectId = match.Groups["projectId"];
-    var model = match.Groups["model"];
-    var additionalModels = match.Groups["additionalModels"];
-
-    if (!projectId.Success)
-    {
-      throw new SpeckleException("The provided url is not a valid Speckle url");
-    }
-
-    if (!model.Success)
-    {
-      throw new SpeckleException("The provided url is not pointing to any model in the project.");
-    }
-
-    if (model.Value == "all")
-    {
-      throw new NotSupportedException("Fetching all models is not supported.");
-    }
-
-    if (model.Value.StartsWith("$"))
-    {
-      throw new NotSupportedException("Federation model urls are not supported");
-    }
-
-    var modelRes = GetUrlModelResource(serverUrl, projectId.Value, model.Value);
-
-    var result = new List<SpeckleUrlModelResource> { modelRes };
-
-    if (additionalModels.Success)
-    {
-      foreach (Capture additionalModelsCapture in additionalModels.Captures)
-      {
-        var extraModel = GetUrlModelResource(serverUrl, projectId.Value, additionalModelsCapture.Value);
-        result.Add(extraModel);
-      }
-    }
-
-    return result.ToArray();
-  }
-
-  private static SpeckleUrlModelResource GetUrlModelResource(string serverUrl, string projectId, string modelValue)
-  {
-    if (modelValue.Length == 32)
-    {
-      return new SpeckleUrlModelObjectResource(serverUrl, projectId, modelValue); // Model value is an ObjectID
-    }
-
-    if (!modelValue.Contains('@'))
-    {
-      return new SpeckleUrlLatestModelVersionResource(serverUrl, projectId, modelValue); // Model has no version attached
-    }
-
-    var res = modelValue.Split('@');
-    return new SpeckleUrlModelVersionResource(serverUrl, projectId, res[0], res[1]);
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/HostApp/ToSpeckleConversionContext.cs

@@ -1,39 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Rhino;
-using Speckle.Connectors.Grasshopper8.Registration;
-using Speckle.Converters.Common;
-using Speckle.Converters.Rhino;
-
-namespace Speckle.Connectors.Grasshopper8.HostApp;
-
-/// <summary>
-/// Handles grasshopper wide converters. We don't need new converters, unless the document changes - this class should handle this (untested).
-/// </summary>
-public static class ToSpeckleConversionContext
-{
-  private static IServiceScope? Scope { get; set; }
-  public static IRootToHostConverter ToHostConverter { get; private set; }
-  public static IRootToSpeckleConverter ToSpeckleConverter { get; private set; }
-
-  static ToSpeckleConversionContext()
-  {
-    RhinoDoc.ActiveDocumentChanged += RhinoDocOnActiveDocumentChanged;
-    InitializeConverters();
-  }
-
-  private static void RhinoDocOnActiveDocumentChanged(object sender, DocumentEventArgs e) => InitializeConverters(); // note: untested, and wrong on mac
-
-  private static void InitializeConverters()
-  {
-    Scope?.Dispose();
-    Scope = PriorityLoader.Container.CreateScope();
-
-    var rhinoConversionSettingsFactory = Scope.ServiceProvider.GetRequiredService<IRhinoConversionSettingsFactory>();
-    Scope
-      .ServiceProvider.GetRequiredService<IConverterSettingsStore<RhinoConversionSettings>>()
-      .Initialize(rhinoConversionSettingsFactory.Create(RhinoDoc.ActiveDoc));
-
-    ToHostConverter = Scope.ServiceProvider.GetService<IRootToHostConverter>();
-    ToSpeckleConverter = Scope.ServiceProvider.GetService<IRootToSpeckleConverter>();
-  }
-}

Connectors/Rhino/Speckle.Connectors.Grasshopper8/Operations/Receive/GrasshopperHostObjectBuilder.cs

@@ -1,189 +0,0 @@
-using Rhino.Geometry;
-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.Converters.Rhino;
-using Speckle.Sdk;
-using Speckle.Sdk.Logging;
-using Speckle.Sdk.Models;
-using Speckle.Sdk.Models.Collections;
-using Speckle.Sdk.Models.Instances;
-
-namespace Speckle.Connectors.Grasshopper8.Operations.Receive;
-
-public sealed class GrasshopperReceiveConversionResult : ReceiveConversionResult
-{
-  public object? Result { get; set; }
-  public Base Source { get; set; }
-
-  public GrasshopperReceiveConversionResult(
-    Status status,
-    Base source,
-    object? result,
-    string? resultId = null,
-    string? resultType = null,
-    Exception? exception = null
-  )
-    : base(status, source, resultId, resultType, exception)
-  {
-    Result = result;
-    Source = source;
-  }
-}
-
-public class GrasshopperHostObjectBuilder : IHostObjectBuilder
-{
-  private readonly IRootToHostConverter _converter;
-  private readonly IConverterSettingsStore<RhinoConversionSettings> _converterSettings;
-  private readonly TraversalContextUnpacker _contextUnpacker;
-  private readonly RootObjectUnpacker _rootObjectUnpacker;
-  private readonly ISdkActivityFactory _activityFactory;
-
-  public GrasshopperHostObjectBuilder(
-    IRootToHostConverter converter,
-    IConverterSettingsStore<RhinoConversionSettings> converterSettings,
-    RootObjectUnpacker rootObjectUnpacker,
-    ISdkActivityFactory activityFactory,
-    TraversalContextUnpacker contextUnpacker
-  )
-  {
-    _converter = converter;
-    _converterSettings = converterSettings;
-    _rootObjectUnpacker = rootObjectUnpacker;
-    _activityFactory = activityFactory;
-    _contextUnpacker = contextUnpacker;
-  }
-
-#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-  public async Task<HostObjectBuilderResult> Build(
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-    Base rootObject,
-    string projectName,
-    string modelName,
-    IProgress<CardProgress> onOperationProgressed,
-    CancellationToken cancellationToken
-  )
-  {
-    using var activity = _activityFactory.Start("Build");
-    // POC: This is where the top level base-layer name is set. Could be abstracted or injected in the context?
-    var baseLayerName = $"Project {projectName}: Model {modelName}";
-
-    // 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 = _contextUnpacker.GetAtomicObjectsWithPath(atomicObjects);
-    var instanceComponentsWithPath = _contextUnpacker.GetInstanceComponentsWithPath(instanceComponents);
-
-    // 2.1 - 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
-    onOperationProgressed.Report(new("Converting materials and colors", null));
-    if (unpackedRoot.RenderMaterialProxies != null)
-    {
-      using var _ = _activityFactory.Start("Render Materials");
-      //_materialBaker.BakeMaterials(unpackedRoot.RenderMaterialProxies, baseLayerName);
-    }
-
-    if (unpackedRoot.ColorProxies != null)
-    {
-      //_colorBaker.ParseColors(unpackedRoot.ColorProxies);
-    }
-
-    // 5 - Convert atomic objects
-    List<ReceiveConversionResult> conversionResults = new();
-    Dictionary<string, List<string>> applicationIdMap = new(); // This map is used in converting blocks in stage 2. keeps track of original app id => resulting new app ids post baking
-
-    int count = 0;
-    using (var _ = _activityFactory.Start("Converting objects"))
-    {
-      foreach (var (path, obj) in atomicObjectsWithPath)
-      {
-        using (var convertActivity = _activityFactory.Start("Converting object"))
-        {
-          onOperationProgressed.Report(new("Converting objects", (double)++count / atomicObjects.Count));
-          try
-          {
-            // 0: get pre-created layer from cache in layer baker
-            // int layerIndex = _layerBaker.GetLayerIndex(path, baseLayerName);
-
-            // 1: create object attributes for baking
-            string name = obj["name"] as string ?? "";
-
-            // 2: convert
-            var result = _converter.Convert(obj);
-
-            // 3: bake
-            if (result is GeometryBase geometryBase)
-            {
-              //var guid = BakeObject(geometryBase, obj, atts);
-            }
-            else if (result is List<GeometryBase> geometryBases) // one to many raw encoding case
-            {
-              foreach (var gb in geometryBases)
-              {
-                //var guid = BakeObject(gb, obj, atts);
-              }
-            }
-            else if (result is IEnumerable<(object, Base)> fallbackConversionResult) // one to many fallback conversion
-            {
-              //var guids = BakeObjectsAsFallbackGroup(fallbackConversionResult, obj, atts, baseLayerName);
-            }
-
-            // 4: log
-            conversionResults.Add(
-              new GrasshopperReceiveConversionResult(Status.SUCCESS, obj, result, null, result.GetType().ToString())
-            );
-
-            // applicationIdMap[obj.applicationId ?? obj.id] = conversionIds;
-            convertActivity?.SetStatus(SdkActivityStatusCode.Ok);
-          }
-          catch (Exception ex) when (!ex.IsFatal())
-          {
-            // TODO: No conversion report yet
-            conversionResults.Add(new GrasshopperReceiveConversionResult(Status.ERROR, obj, null, null, null, ex));
-            convertActivity?.SetStatus(SdkActivityStatusCode.Error);
-            convertActivity?.RecordException(ex);
-          }
-        }
-      }
-    }
-
-    // 6 - Convert instances
-    using (var _ = _activityFactory.Start("Converting instances"))
-    {
-      // TODO: No instances yet
-      // var (createdInstanceIds, consumedObjectIds, instanceConversionResults) = await _instanceBaker
-      //   .BakeInstances(instanceComponentsWithPath, applicationIdMap, baseLayerName, onOperationProgressed)
-      //   .ConfigureAwait(false);
-
-      // TODO: No conversion report yet
-      // conversionResults.RemoveAll(result => result.ResultId != null && consumedObjectIds.Contains(result.ResultId)); // remove all conversion results for atomic objects that have been consumed (POC: not that cool, but prevents problems on object highlighting)
-      // conversionResults.AddRange(instanceConversionResults); // add instance conversion results to our list
-    }
-
-    // 7 - Create groups
-    if (unpackedRoot.GroupProxies is not null)
-    {
-      // TODO: No groups yet
-      // _groupBaker.BakeGroups(unpackedRoot.GroupProxies, applicationIdMap, baseLayerName);
-    }
-
-    return new HostObjectBuilderResult([], conversionResults);
-  }
-}