specklesystems · adamhathcock · Aug 8, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs
@@ -5,7 +5,7 @@
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.Utils.Cancellation;
 using Speckle.Connectors.Utils.Operations;
-using Speckle.Core.Logging;
+using Speckle.Sdk;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs
@@ -17,8 +17,8 @@
 using Speckle.Connectors.Utils.Caching;
 using Speckle.Connectors.Utils.Cancellation;
 using Speckle.Connectors.Utils.Operations;
-using Speckle.Core.Common;
-using Speckle.Core.Logging;
+using Speckle.Sdk;
+using Speckle.Sdk.Common;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs
@@ -8,8 +8,8 @@
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.Utils.Common;
-using Speckle.Core.Common;
-using Speckle.Core.Kits;
+using Speckle.Sdk.Common;
+using Speckle.Sdk.Host;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs
@@ -18,7 +18,7 @@
 using Speckle.Connectors.Utils.Caching;
 using Speckle.Connectors.Utils.Instances;
 using Speckle.Connectors.Utils.Operations;
-using Speckle.Core.Models.GraphTraversal;
+using Speckle.Sdk.Models.GraphTraversal;
 
 // POC: This is a temp reference to root object senders to tweak CI failing after having generic interfaces into common project.
 // This should go whenever it is aligned.

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/HostApp/ArcGISSettings.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/HostApp/ArcGISSettings.cs
@@ -1,6 +1,6 @@
 using System.IO;
-using Speckle.Core.Common;
-using Speckle.Core.Kits;
+using Speckle.Sdk.Common;
+using Speckle.Sdk.Host;
 
 namespace Speckle.Connectors.ArcGIS.HostApp;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Receive/HostObjectBuilder.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Receive/HostObjectBuilder.cs
@@ -3,20 +3,20 @@
 using ArcGIS.Core.Geometry;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
-using Objects.GIS;
 using Speckle.Connectors.ArcGIS.Utils;
 using Speckle.Connectors.Utils.Builders;
 using Speckle.Connectors.Utils.Conversion;
 using Speckle.Connectors.Utils.Instances;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.ArcGIS3.Utils;
 using Speckle.Converters.Common;
-using Speckle.Core.Logging;
-using Speckle.Core.Models;
-using Speckle.Core.Models.Collections;
-using Speckle.Core.Models.GraphTraversal;
-using Speckle.Core.Models.Instances;
-using RasterLayer = Objects.GIS.RasterLayer;
+using Speckle.Objects.GIS;
+using Speckle.Sdk;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.GraphTraversal;
+using Speckle.Sdk.Models.Instances;
+using RasterLayer = Speckle.Objects.GIS.RasterLayer;
 
 namespace Speckle.Connectors.ArcGIS.Operations.Receive;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Operations/Send/ArcGISRootObjectBuilder.cs
@@ -2,16 +2,16 @@
 using ArcGIS.Core.Geometry;
 using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
-using Objects.GIS;
 using Speckle.Connectors.Utils.Builders;
 using Speckle.Connectors.Utils.Caching;
 using Speckle.Connectors.Utils.Conversion;
 using Speckle.Connectors.Utils.Operations;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Converters.Common;
-using Speckle.Core.Logging;
-using Speckle.Core.Models;
-using Speckle.Core.Models.Collections;
+using Speckle.Objects.GIS;
+using Speckle.Sdk;
+using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
 
 namespace Speckle.Connectors.ArcGis.Operations.Send;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Speckle.Connectors.ArcGIS3.csproj
@@ -9,6 +9,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <DefineConstants>$(DefineConstants);ARCGIS3</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
   </PropertyGroup>
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs
@@ -3,7 +3,8 @@
 using Speckle.Autofac;
 using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.ArcGIS.HostApp;
-using Speckle.Core.Kits;
+using Speckle.Connectors.Utils;
+using Speckle.Sdk.Host;
 using Module = ArcGIS.Desktop.Framework.Contracts.Module;
 
 namespace Speckle.Connectors.ArcGIS;
@@ -14,6 +15,7 @@ namespace Speckle.Connectors.ArcGIS;
 internal sealed class SpeckleModule : Module
 {
   private static SpeckleModule? s_this;
+  private readonly IDisposable? _disposableLogger;
 
   /// <summary>
   /// Retrieve the singleton instance to this module here
@@ -30,14 +32,25 @@ public SpeckleModule()
     var builder = SpeckleContainerBuilder.CreateInstance();
 
     // Register Settings
-    var arcgisSettings = new ArcGISSettings(HostApplications.ArcGIS, HostAppVersion.v3);
+    var arcgisSettings = new ArcGISSettings(HostApplications.ArcGIS, GetVersion());
+    // init DI
+    _disposableLogger = Connector.Initialize(HostApplications.ArcGIS, GetVersion());
 
     Container = builder
       .LoadAutofacModules(Assembly.GetExecutingAssembly(), arcgisSettings.Modules)
       .AddSingleton(arcgisSettings)
       .Build();
   }
 
+  private HostAppVersion GetVersion()
+  {
+#if ARCGIS3
+    return HostAppVersion.v3;
+#else
+    throw new NotImplementedException();
+#endif
+  }
+
   /// <summary>
   /// Called by Framework when ArcGIS Pro is closing
   /// </summary>
@@ -46,6 +59,7 @@ protected override bool CanUnload()
   {
     //TODO - add your business logic
     //return false to ~cancel~ Application close
+    _disposableLogger?.Dispose();
     return true;
   }
 }
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs
@@ -5,8 +5,8 @@
 using ArcGIS.Desktop.Mapping.Events;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
-using Speckle.Core.Common;
 using Speckle.Newtonsoft.Json;
+using Speckle.Sdk.Common;
 
 namespace Speckle.Connectors.ArcGIS.Utils;
 

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
@@ -173,16 +173,16 @@
         "resolved": "4.0.1",
         "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
       },
-      "Speckle.Logging": {
-        "type": "Transitive",
-        "resolved": "3.1.0-dev.91",
-        "contentHash": "THx7v4jrTwdVEYp4jiQ/yK/OJAkSQWFA0UFD5TD0w9KKm468sjIZLS79XN9FfWTIStPgxjjx8t/nI+K9vNoQVQ=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.94",
+        "contentHash": "BRMTEqP2A0p92/wXXtJbQqPzUxjV1IBv6Qm5sQyz0pEX3E1d7rX+XuEcGA9GL275KAkOIwE37xae0qe3GHYMLA=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -240,7 +240,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
           "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Connectors.Utils": "[1.0.0, )",
-          "Speckle.Core": "[3.1.0-dev.91, )",
+          "Speckle.Sdk": "[3.1.0-dev.94, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -256,7 +256,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging": "[3.1.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Core": "[3.1.0-dev.91, )"
+          "Speckle.Objects": "[3.1.0-dev.94, )",
+          "Speckle.Sdk": "[3.1.0-dev.94, )"
         }
       },
       "speckle.converters.arcgis3": {
@@ -278,7 +279,7 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.91, )"
+          "Speckle.Objects": "[3.1.0-dev.94, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
@@ -312,11 +313,20 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
-      "Speckle.Core": {
+      "Speckle.Objects": {
+        "type": "CentralTransitive",
+        "requested": "[3.1.0-dev.94, )",
+        "resolved": "3.1.0-dev.94",
+        "contentHash": "IgsV46aplUEWNJDRi2lsMIqgghULtO/zEAWZhB6kceKRPdNqrOC1ujDep2OGJMZOxIM/ne8lxF6MtnZCjhdWVw==",
+        "dependencies": {
+          "Speckle.Sdk": "3.1.0-dev.94"
+        }
+      },
+      "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.91, )",
-        "resolved": "3.1.0-dev.91",
-        "contentHash": "lD966yNddLn7WBJ9sgoMerZSW6b9U/6o1FE9c4tlYfBLZeghfCeTFzqyKWB1a0ZEfgqgDxuW9F2mu80c0o83eA==",
+        "requested": "[3.1.0-dev.94, )",
+        "resolved": "3.1.0-dev.94",
+        "contentHash": "0zTiFvFLhOryH1aLvJ+AVML4/mElv6sik3Epn77UExGa8V3xHaBvu6GGr/r2F3ihvzlrVhHBrlGtOnAB4tlCJg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -325,20 +335,11 @@
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Logging": "3.1.0-dev.91",
           "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.94",
           "System.Text.Json": "5.0.2"
         }
       },
-      "Speckle.Objects": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.91, )",
-        "resolved": "3.1.0-dev.91",
-        "contentHash": "GU6Wg2Cpznn9o0zTafx7kM52e0xEkNjGwgWD4wTbflm1mUHU3z0UQVK96uIn/i46DULjXFKfqMZO3ZXT1oLf4Q==",
-        "dependencies": {
-          "Speckle.Core": "3.1.0-dev.91"
-        }
-      },
       "System.Threading.Tasks.Dataflow": {
         "type": "CentralTransitive",
         "requested": "[6.0.0, )",

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj b/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj
@@ -2,22 +2,20 @@
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
-    <UseWpf>true</UseWpf>
     <AutoCADVersion>2023</AutoCADVersion>
     <DefineConstants>$(DefineConstants);AUTOCAD2023;AUTOCAD</DefineConstants>
     <Configurations>Debug;Release;Local</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" />
+  </ItemGroup>  
+
+  <ItemGroup>   
     <ProjectReference Include="..\..\..\Converters\Autocad\Speckle.Converters.Autocad2023.DependencyInjection\Speckle.Converters.Autocad2023.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\DUI3\Speckle.Connectors.DUI.WebView\Speckle.Connectors.DUI.WebView.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Autofac\Speckle.Autofac.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Connectors.Utils\Speckle.Connectors.Utils.csproj" />
-    <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0" />
-  </ItemGroup>
+
   <Import Project="..\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems" Label="Shared" />
 </Project>
diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -182,16 +182,16 @@
         "resolved": "4.0.1",
         "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
       },
-      "Speckle.Logging": {
-        "type": "Transitive",
-        "resolved": "3.1.0-dev.91",
-        "contentHash": "THx7v4jrTwdVEYp4jiQ/yK/OJAkSQWFA0UFD5TD0w9KKm468sjIZLS79XN9FfWTIStPgxjjx8t/nI+K9vNoQVQ=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
         "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
       },
+      "Speckle.Sdk.Logging": {
+        "type": "Transitive",
+        "resolved": "3.1.0-dev.94",
+        "contentHash": "BRMTEqP2A0p92/wXXtJbQqPzUxjV1IBv6Qm5sQyz0pEX3E1d7rX+XuEcGA9GL275KAkOIwE37xae0qe3GHYMLA=="
+      },
       "SQLitePCLRaw.bundle_e_sqlite3": {
         "type": "Transitive",
         "resolved": "2.1.4",
@@ -318,7 +318,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
           "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Connectors.Utils": "[1.0.0, )",
-          "Speckle.Core": "[3.1.0-dev.91, )",
+          "Speckle.Sdk": "[3.1.0-dev.94, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -334,7 +334,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging": "[3.1.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Core": "[3.1.0-dev.91, )"
+          "Speckle.Objects": "[3.1.0-dev.94, )",
+          "Speckle.Sdk": "[3.1.0-dev.94, )"
         }
       },
       "speckle.converters.autocad2023": {
@@ -357,7 +358,7 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[3.1.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.91, )"
+          "Speckle.Objects": "[3.1.0-dev.94, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
@@ -400,11 +401,20 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
-      "Speckle.Core": {
+      "Speckle.Objects": {
+        "type": "CentralTransitive",
+        "requested": "[3.1.0-dev.94, )",
+        "resolved": "3.1.0-dev.94",
+        "contentHash": "IgsV46aplUEWNJDRi2lsMIqgghULtO/zEAWZhB6kceKRPdNqrOC1ujDep2OGJMZOxIM/ne8lxF6MtnZCjhdWVw==",
+        "dependencies": {
+          "Speckle.Sdk": "3.1.0-dev.94"
+        }
+      },
+      "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.91, )",
-        "resolved": "3.1.0-dev.91",
-        "contentHash": "lD966yNddLn7WBJ9sgoMerZSW6b9U/6o1FE9c4tlYfBLZeghfCeTFzqyKWB1a0ZEfgqgDxuW9F2mu80c0o83eA==",
+        "requested": "[3.1.0-dev.94, )",
+        "resolved": "3.1.0-dev.94",
+        "contentHash": "0zTiFvFLhOryH1aLvJ+AVML4/mElv6sik3Epn77UExGa8V3xHaBvu6GGr/r2F3ihvzlrVhHBrlGtOnAB4tlCJg==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
@@ -413,20 +423,11 @@
           "Polly.Contrib.WaitAndRetry": "1.1.1",
           "Polly.Extensions.Http": "3.0.0",
           "Speckle.DoubleNumerics": "4.0.1",
-          "Speckle.Logging": "3.1.0-dev.91",
           "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Logging": "3.1.0-dev.94",
           "System.Text.Json": "5.0.2"
         }
       },
-      "Speckle.Objects": {
-        "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.91, )",
-        "resolved": "3.1.0-dev.91",
-        "contentHash": "GU6Wg2Cpznn9o0zTafx7kM52e0xEkNjGwgWD4wTbflm1mUHU3z0UQVK96uIn/i46DULjXFKfqMZO3ZXT1oLf4Q==",
-        "dependencies": {
-          "Speckle.Core": "3.1.0-dev.91"
-        }
-      },
       "System.Threading.Tasks.Dataflow": {
         "type": "CentralTransitive",
         "requested": "[6.0.0, )",