Merge pull request #315 from specklesystems/dev

Update `release/3.0.0` with changes from `dev`
specklesystems · Oct 21, 2024 · 9855ca8 · 9855ca8
2 parents e908484 + 7644dec
commit 9855ca8
Show file tree

Hide file tree

Showing 156 changed files with 4,668 additions and 932 deletions.
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs
@@ -189,7 +189,7 @@ mapMember is not ILayerContainer
 
     if (results.All(x => x.Status == Status.ERROR))
     {
-      throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+      throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
     }
 
     // POC: Add Color Proxies

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
@@ -244,16 +244,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -278,7 +278,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -310,18 +310,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.162"
+          "Speckle.Sdk": "3.1.0-dev.164"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json
@@ -274,16 +274,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -308,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.162"
+          "Speckle.Sdk": "3.1.0-dev.164"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -274,16 +274,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -308,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -346,18 +346,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.162"
+          "Speckle.Sdk": "3.1.0-dev.164"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json
@@ -274,16 +274,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -309,7 +309,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -347,18 +347,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.162"
+          "Speckle.Sdk": "3.1.0-dev.164"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json
@@ -238,16 +238,16 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )"
         }
       },
       "speckle.connectors.dui": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.162, )",
+          "Speckle.Sdk": "[3.1.0-dev.164, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -273,7 +273,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.162, )"
+          "Speckle.Objects": "[3.1.0-dev.164, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -311,18 +311,18 @@
       },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "1fyaPjC1kVtroKfoXI7edJX0Uho/TNRWG9mtmIQ7jKhX1zElrJPSoH8zEIMqckZhGmwUrYjlQFPssASNCP721Q==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "bvQ7xwOWFm9fYdWr111Q/PKgHaMEfV08uE0erQyZuLYCJ9sFJKRcbQlaf4d6VRzl/fVJm8ypqIdtXgQtsiMSlQ==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.162"
+          "Speckle.Sdk": "3.1.0-dev.164"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.162, )",
-        "resolved": "3.1.0-dev.162",
-        "contentHash": "ulT3XNgqIQSmpQFK5YEEwRq4RA6emXBKQHnZxtCz37SJin1PnVpH9m8vOAF9FmaWsgSAfjhhjIZDruMu1oKxSg==",
+        "requested": "[3.1.0-dev.164, )",
+        "resolved": "3.1.0-dev.164",
+        "contentHash": "b88QWWSPYs3h9H2Af78TrKclyjYd7OxmKwx4p2C7IgFzaDW51dSd9o0pEB7H3Ao4ydCoOW9Xey8v1lhfckl09w==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerUnpacker.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerUnpacker.cs
@@ -1,6 +1,6 @@
 using Autodesk.AutoCAD.DatabaseServices;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Converters.Common;
+using Speckle.Sdk;
 using Speckle.Sdk.Models.Collections;
 
 namespace Speckle.Connectors.Autocad.HostApp;
@@ -24,6 +24,7 @@ public Layer GetOrCreateSpeckleLayer(Entity entity, Transaction tr, out LayerTab
       layer = autocadLayer;
       return speckleLayer;
     }
-    throw new SpeckleConversionException("Unexpected condition in GetOrCreateSpeckleLayer");
+
+    throw new SpeckleException("Unexpected condition in GetOrCreateSpeckleLayer");
   }
 }
diff --git a/.../Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs b/.../Autocad/Speckle.Connectors.AutocadShared/Operations/Send/AutocadRootObjectBaseBuilder.cs
@@ -128,7 +128,7 @@ private RootObjectBuilderResult BuildSync(
 
       if (results.All(x => x.Status == Status.ERROR))
       {
-        throw new SpeckleConversionException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
+        throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
       }
 
       // 4 - Unpack the render material proxies

diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AppUtils.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AppUtils.cs
@@ -10,21 +10,19 @@ public static class AppUtils
 #elif AUTOCAD
     HostApplications.AutoCAD;
 #else
-    throw new NotImplementedException();
+    throw new NotSupportedException();
 #endif
 
   public static HostAppVersion Version =>
-#if CIVIL3D2024
-    HostAppVersion.v2024;
-#elif AUTOCAD2025
+#if AUTOCAD2025 || CIVIL3D2025
     HostAppVersion.v2025;
-#elif AUTOCAD2024
+#elif AUTOCAD2024 || CIVIL3D2024
     HostAppVersion.v2024;
-#elif AUTOCAD2023
+#elif AUTOCAD2023|| CIVIL3D2023
     HostAppVersion.v2023;
-#elif AUTOCAD2022
+#elif AUTOCAD2022 || CIVIL3D2022
     HostAppVersion.v2022;
 #else
-    throw new NotImplementedException();
+    throw new NotSupportedException();
 #endif
 }
diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/Speckle.Connectors.Civil3d2022.csproj b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/Speckle.Connectors.Civil3d2022.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseWpf>true</UseWpf>
+    <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" />
+    <PackageReference Include="Speckle.Civil3D.API" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Converters\Civil3d\Speckle.Converters.Civil3d2022\Speckle.Converters.Civil3d2022.csproj" />
+    <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\..\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
+  <Import Project="..\..\Autocad\Speckle.Connectors.Civil3dShared\Speckle.Connectors.Civil3dShared.projitems" Label="Shared" />
+</Project>