fixes merge issue with package version and autocad proj structure

specklesystems · Jul 3, 2024 · c0387fb · c0387fb
1 parent 535ad8e
commit c0387fb
Show file tree

Hide file tree

Showing 21 changed files with 206 additions and 173 deletions.
diff --git a/All.sln b/All.sln
diff --git a/DUI3-DX.slnf b/DUI3-DX.slnf
@@ -12,10 +12,10 @@
       "DUI3-DX\\Connectors\\Rhino\\Speckle.Connectors.Rhino7\\Speckle.Connectors.Rhino7.csproj",
       "DUI3-DX\\Converters\\ArcGIS\\Speckle.Converters.ArcGIS3.DependencyInjection\\Speckle.Converters.ArcGIS3.DependencyInjection.csproj",
       "DUI3-DX\\Converters\\ArcGIS\\Speckle.Converters.ArcGIS3\\Speckle.Converters.ArcGIS3.csproj",
-      "DUI3-DX\\Converters\\Autocad\\2023\\Speckle.Converters.Autocad2023.DependencyInjection\\Speckle.Converters.Autocad2023.DependencyInjection.csproj",
-      "DUI3-DX\\Converters\\Autocad\\2023\\Speckle.Converters.Autocad2023\\Speckle.Converters.Autocad2023.csproj",
-      "DUI3-DX\\Converters\\Autocad\\2024\\Speckle.Converters.Autocad2024.DependencyInjection\\Speckle.Converters.Autocad2024.DependencyInjection.csproj",
-      "DUI3-DX\\Converters\\Autocad\\2024\\Speckle.Converters.Autocad2024\\Speckle.Converters.Autocad2024.csproj",
+      "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Autocad2023.DependencyInjection\\Speckle.Converters.Autocad2023.DependencyInjection.csproj",
+      "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Autocad2023\\Speckle.Converters.Autocad2023.csproj",
+      "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Autocad2024.DependencyInjection\\Speckle.Converters.Autocad2024.DependencyInjection.csproj",
+      "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Autocad2024\\Speckle.Converters.Autocad2024.csproj",
       "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.AutocadShared\\Speckle.Converters.AutocadShared.shproj",
       "DUI3-DX\\Converters\\Civil3d\\Speckle.Converters.Civil3d2024.DependencyInjection\\Speckle.Converters.Civil3d2024.DependencyInjection.csproj",
       "DUI3-DX\\Converters\\Civil3d\\Speckle.Converters.Civil3d2024\\Speckle.Converters.Civil3d2024.csproj",

diff --git a/...X/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj b/...X/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj
@@ -10,7 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Converters\Autocad\2023\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" />
@@ -19,7 +18,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-    <PackageReference Include="Speckle.AutoCAD.API" VersionOverride="2023.0.0"  />
+    <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/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -455,18 +455,10 @@
           "Speckle.Core": "[3.0.1-alpha.14, )"
         }
       },
-      "speckle.converters.autocad2023": {
-        "type": "Project",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "[2023.0.0, )",
-          "Speckle.Converters.Common": "[2.0.999-local, )"
-        }
-      },
       "speckle.converters.autocad2023.dependencyinjection": {
         "type": "Project",
         "dependencies": {
           "Autofac": "[5.2.0, )",
-          "Speckle.Converters.Autocad2023": "[2.0.999-local, )",
           "Speckle.Converters.Common.DependencyInjection": "[2.0.999-local, )"
         }
       },

diff --git a/...rs/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs b/...rs/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs
@@ -1,20 +1,13 @@
 #if AUTOCAD
 using Autodesk.AutoCAD.DatabaseServices;
-using Speckle.Autofac;
 using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.Autocad.Bindings;
 using Speckle.Connectors.Autocad.Filters;
 using Speckle.Connectors.Autocad.HostApp;
-using Speckle.Connectors.Autocad.Interfaces;
 using Speckle.Connectors.Autocad.Operations.Receive;
 using Speckle.Connectors.Autocad.Operations.Send;
-using Speckle.Connectors.Autocad.Plugin;
-using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
-using Speckle.Connectors.DUI.WebView;
-using Speckle.Connectors.Utils;
 using Speckle.Connectors.Utils.Builders;
 using Speckle.Connectors.Utils.Caching;
 using Speckle.Connectors.Utils.Instances;
@@ -29,9 +22,6 @@ public void Load(SpeckleContainerBuilder builder)
   {
     SharedRegistration.Load(builder);
 
-
-    builder.AddScoped<AutocadLayerManager>();
-
     // Operations
     builder.AddScoped<SendOperation<AutocadRootObject>>();
     builder.AddSingleton(DefaultTraversal.CreateTraversalFunc());

diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json
@@ -530,7 +530,7 @@
       },
       "Speckle.AutoCAD.API": {
         "type": "CentralTransitive",
-        "requested": "[2023.0.0, )",
+        "requested": "[2024.0.0, )",
         "resolved": "2024.0.0",
         "contentHash": "pZZ5uI+NXhZaQnsqRkgp/rywqBAjDObDJ9XNFGJvemT5k2OthDpHzlK/mKxz8QDCYie7uImQ8dv3uWj2QUFDPw=="
       },

diff --git a/...ndencyInjection/AutocadConverterModule.cs → ...ndencyInjection/AutocadConverterModule.cs b/...ndencyInjection/AutocadConverterModule.cs → ...ndencyInjection/AutocadConverterModule.cs
diff --git a/...rs.Autocad2023.DependencyInjection.csproj → ...rs.Autocad2023.DependencyInjection.csproj b/...rs.Autocad2023.DependencyInjection.csproj → ...rs.Autocad2023.DependencyInjection.csproj
diff --git a/...23.DependencyInjection/packages.lock.json → ...23.DependencyInjection/packages.lock.json b/...23.DependencyInjection/packages.lock.json → ...23.DependencyInjection/packages.lock.json
@@ -396,7 +396,7 @@
       },
       "Speckle.AutoCAD.API": {
         "type": "CentralTransitive",
-        "requested": "[2023.0.0, )",
+        "requested": "[2024.0.0, )",
         "resolved": "2023.0.0",
         "contentHash": "aNfiNw9zRW8pCl8AAQK7afEJuea4bJ4sFNsGVSDrdq1egaonZrwALU01dSyFNCE8tne86eVjlprpOGG6r0+G/A=="
       },

diff --git a/...023/Speckle.Converters.Autocad2023.csproj → ...023/Speckle.Converters.Autocad2023.csproj b/...023/Speckle.Converters.Autocad2023.csproj → ...023/Speckle.Converters.Autocad2023.csproj
diff --git a/...Converters.Autocad2023/packages.lock.json → ...Converters.Autocad2023/packages.lock.json b/...Converters.Autocad2023/packages.lock.json → ...Converters.Autocad2023/packages.lock.json
diff --git a/...ndencyInjection/AutocadConverterModule.cs → ...ndencyInjection/AutocadConverterModule.cs b/...ndencyInjection/AutocadConverterModule.cs → ...ndencyInjection/AutocadConverterModule.cs
diff --git a/...rs.Autocad2024.DependencyInjection.csproj → ...rs.Autocad2024.DependencyInjection.csproj b/...rs.Autocad2024.DependencyInjection.csproj → ...rs.Autocad2024.DependencyInjection.csproj
diff --git a/...24.DependencyInjection/packages.lock.json → ...24.DependencyInjection/packages.lock.json b/...24.DependencyInjection/packages.lock.json → ...24.DependencyInjection/packages.lock.json
diff --git a/...024/Speckle.Converters.Autocad2024.csproj → ...024/Speckle.Converters.Autocad2024.csproj b/...024/Speckle.Converters.Autocad2024.csproj → ...024/Speckle.Converters.Autocad2024.csproj
diff --git a/...Converters.Autocad2024/packages.lock.json → ...Converters.Autocad2024/packages.lock.json b/...Converters.Autocad2024/packages.lock.json → ...Converters.Autocad2024/packages.lock.json
diff --git a/...Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj b/...Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Autofac" Version="5.2.0"/>
+      <PackageReference Include="Autofac" />
     </ItemGroup>
 
 </Project>
diff --git a/.../Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/packages.lock.json b/.../Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/packages.lock.json
@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "dependencies": {
     ".NETFramework,Version=v4.8": {
       "Autofac": {
@@ -11,6 +11,16 @@
           "Microsoft.Bcl.AsyncInterfaces": "1.1.0"
         }
       },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
       "PolySharp": {
         "type": "Direct",
         "requested": "[1.14.1, )",
@@ -63,6 +73,11 @@
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
       "Microsoft.CSharp": {
         "type": "Transitive",
         "resolved": "4.7.0",
@@ -85,14 +100,10 @@
           "SQLitePCLRaw.core": "2.1.4"
         }
       },
-      "Microsoft.Extensions.Logging.Abstractions": {
+      "Microsoft.SourceLink.Common": {
         "type": "Transitive",
-        "resolved": "7.0.0",
-        "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==",
-        "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Memory": "4.5.5"
-        }
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
       "Polly": {
         "type": "Transitive",
@@ -203,19 +214,6 @@
           "Serilog": "2.10.0"
         }
       },
-      "Speckle.AutoCAD.API": {
-        "type": "Transitive",
-        "resolved": "2024.0.0",
-        "contentHash": "pZZ5uI+NXhZaQnsqRkgp/rywqBAjDObDJ9XNFGJvemT5k2OthDpHzlK/mKxz8QDCYie7uImQ8dv3uWj2QUFDPw=="
-      },
-      "Speckle.Civil3D.API": {
-        "type": "Transitive",
-        "resolved": "2024.0.0",
-        "contentHash": "9Q7M1k0DotN8w7MkiScQezErRdnZ4dAkxBMcPNhHSWoth/lSaT6UPV1aYEdl90RhehJWG4l3O7U2e3OXvVSFdw==",
-        "dependencies": {
-          "Speckle.AutoCAD.API": "2024.0.0"
-        }
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -362,8 +360,7 @@
       "speckle.autofac": {
         "type": "Project",
         "dependencies": {
-          "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
-          "Speckle.Core": "[2.0.999-local, )"
+          "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )"
         }
       },
       "speckle.converters.civil3d2024": {
@@ -378,7 +375,7 @@
         "type": "Project",
         "dependencies": {
           "Speckle.Autofac": "[2.0.999-local, )",
-          "Speckle.Objects": "[2.0.999-local, )"
+          "Speckle.Objects": "[3.0.1-alpha.14, )"
         }
       },
       "speckle.converters.common.dependencyinjection": {
@@ -388,31 +385,62 @@
           "Speckle.Converters.Common": "[2.0.999-local, )"
         }
       },
-      "Speckle.Core": {
-        "type": "Project",
+      "Microsoft.Extensions.Logging.Abstractions": {
+        "type": "CentralTransitive",
+        "requested": "[7.0.0, )",
+        "resolved": "7.0.0",
+        "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==",
         "dependencies": {
-          "GraphQL.Client": "[6.0.0, )",
-          "Microsoft.CSharp": "[4.7.0, )",
-          "Microsoft.Data.Sqlite": "[7.0.5, )",
-          "Polly": "[7.2.3, )",
-          "Polly.Contrib.WaitAndRetry": "[1.1.1, )",
-          "Polly.Extensions.Http": "[3.0.0, )",
-          "Sentry": "[3.33.0, )",
-          "Sentry.Serilog": "[3.33.0, )",
-          "Serilog": "[2.12.0, )",
-          "Serilog.Enrichers.ClientInfo": "[1.3.0, )",
-          "Serilog.Exceptions": "[8.4.0, )",
-          "Serilog.Sinks.Console": "[4.1.0, )",
-          "Serilog.Sinks.Seq": "[5.2.2, )",
-          "SerilogTimings": "[3.0.1, )",
-          "Speckle.Newtonsoft.Json": "[13.0.2, )",
-          "System.DoubleNumerics": "[3.1.3, )"
+          "System.Buffers": "4.5.1",
+          "System.Memory": "4.5.5"
+        }
+      },
+      "Speckle.AutoCAD.API": {
+        "type": "CentralTransitive",
+        "requested": "[2024.0.0, )",
+        "resolved": "2024.0.0",
+        "contentHash": "pZZ5uI+NXhZaQnsqRkgp/rywqBAjDObDJ9XNFGJvemT5k2OthDpHzlK/mKxz8QDCYie7uImQ8dv3uWj2QUFDPw=="
+      },
+      "Speckle.Civil3D.API": {
+        "type": "CentralTransitive",
+        "requested": "[2024.0.0, )",
+        "resolved": "2024.0.0",
+        "contentHash": "9Q7M1k0DotN8w7MkiScQezErRdnZ4dAkxBMcPNhHSWoth/lSaT6UPV1aYEdl90RhehJWG4l3O7U2e3OXvVSFdw==",
+        "dependencies": {
+          "Speckle.AutoCAD.API": "2024.0.0"
+        }
+      },
+      "Speckle.Core": {
+        "type": "CentralTransitive",
+        "requested": "[3.0.1-alpha.14, )",
+        "resolved": "3.0.1-alpha.14",
+        "contentHash": "RzQPVIGFFkKvG56YLr8ACtiwdWJE6IJ9vCQ4qHa0PIsUEpfzAIAi59jnzqtByOFC0FiFrFPow9bkfzylaZorAA==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Polly": "7.2.3",
+          "Polly.Contrib.WaitAndRetry": "1.1.1",
+          "Polly.Extensions.Http": "3.0.0",
+          "Sentry": "3.33.0",
+          "Sentry.Serilog": "3.33.0",
+          "Serilog": "2.12.0",
+          "Serilog.Enrichers.ClientInfo": "1.3.0",
+          "Serilog.Exceptions": "8.4.0",
+          "Serilog.Sinks.Console": "4.1.0",
+          "Serilog.Sinks.Seq": "5.2.2",
+          "SerilogTimings": "3.0.1",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "System.DoubleNumerics": "3.1.3"
         }
       },
       "Speckle.Objects": {
-        "type": "Project",
+        "type": "CentralTransitive",
+        "requested": "[3.0.1-alpha.14, )",
+        "resolved": "3.0.1-alpha.14",
+        "contentHash": "z38LGryMvh7iU1uBW+4uo5DwsB3CwRgLt2uFexWFx3mPSid+A0l5XcJzOgLwgFhNl6B42Ryz4ezBsddTp1Uc/g==",
         "dependencies": {
-          "Speckle.Core": "[2.0.999-local, )"
+          "Speckle.Core": "3.0.1-alpha.14"
         }
       }
     }

diff --git a/...X/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj b/...X/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Speckle.AutoCAD.API" Version="2024.0.0" />
-    <PackageReference Include="Speckle.Civil3D.API" Version="2024.0.0" />
+    <PackageReference Include="Speckle.AutoCAD.API" />
+    <PackageReference Include="Speckle.Civil3D.API" />
   </ItemGroup>
 
   <ItemGroup>