From 1e925f520d3657132dacba2d6b360c2d098cc25a Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Fri, 14 Jun 2024 15:43:54 +0100 Subject: [PATCH 01/12] adds converter and connector --- All.sln | 68 ++++++++++++++++++- DUI3-DX.slnf | 3 + .../Properties/AssemblyInfo.cs | 36 ++++++++++ .../Speckle.Connectors.Civil3d2023.csproj | 25 +++++++ .../Civil3dConverterModule.cs | 20 ++++++ ...ers.Civil3d2023.DependencyInjection.csproj | 29 ++++++++ .../Speckle.Converters.Civil3d2023.csproj | 22 ++++++ .../GlobalUsings.cs | 6 ++ ...Speckle.Converters.Civil3dShared.projitems | 13 ++++ .../Speckle.Converters.Civil3dShared.shproj | 13 ++++ .../Speckle.Converters.CivilShared.projitems | 19 ++++++ 11 files changed, 252 insertions(+), 2 deletions(-) create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/GlobalUsings.cs create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems diff --git a/All.sln b/All.sln index ff3a26c713..8f604d34a6 100644 --- a/All.sln +++ b/All.sln @@ -555,7 +555,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2025", "Objec EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B1324D25-C601-40F2-8AE2-6131F492B911}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converters.Revit2023.Tests", "DUI3-DX\Converters\Revit\Speckle.Converters.Revit2023.Tests\Speckle.Converters.Revit2023.Tests.csproj", "{AEC26A0B-25F3-4544-A9D6-A427BFF79250}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Revit2023.Tests", "DUI3-DX\Converters\Revit\Speckle.Converters.Revit2023.Tests\Speckle.Converters.Revit2023.Tests.csproj", "{AEC26A0B-25F3-4544-A9D6-A427BFF79250}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2023", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2023\Speckle.Connectors.Civil3d2023.csproj", "{6BBA87CF-453D-4952-8E50-FA0E01FC79C7}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Converters.Civil3dShared", "DUI3-DX\Converters\Autocad\Speckle.Converters.CivilShared\Speckle.Converters.Civil3dShared.shproj", "{2EC4F6F1-8448-49DB-BCB9-85F7F0B0A496}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2023", "DUI3-DX\Converters\Autocad\Speckle.Converters.Civil3d2023\Speckle.Converters.Civil3d2023.csproj", "{573169D8-26DF-49ED-8708-74052EDAE34F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converters.Civil3d2023.DependencyInjection", "DUI3-DX\Converters\Autocad\Speckle.Converters.Civil3d2023.DependencyInjection\Speckle.Converters.Civil3d2023.DependencyInjection.csproj", "{65FDA527-F9DF-4198-9E9E-28099AA28CBF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -2807,6 +2815,54 @@ Global {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|Any CPU.Build.0 = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.ActiveCfg = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.Build.0 = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|x64.Build.0 = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|x64.ActiveCfg = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|x64.Build.0 = Debug|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|x64.ActiveCfg = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|x64.Build.0 = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|Any CPU.Build.0 = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|x64.ActiveCfg = Release|Any CPU + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|x64.Build.0 = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|x64.Build.0 = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|x64.ActiveCfg = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|x64.Build.0 = Debug|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|x64.ActiveCfg = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|x64.Build.0 = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|Any CPU.Build.0 = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|x64.ActiveCfg = Release|Any CPU + {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|x64.Build.0 = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|x64.Build.0 = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|x64.ActiveCfg = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|x64.Build.0 = Debug|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|x64.ActiveCfg = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|x64.Build.0 = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|Any CPU.Build.0 = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|x64.ActiveCfg = Release|Any CPU + {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2984,6 +3040,7 @@ Global {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} = {9DB74760-01DE-4AC1-A81B-BC7784351D22} {01F98733-7352-47AD-A594-537D979DE3DE} = {4838C66E-8677-4FBD-9609-25376042E981} {DC570FFF-6FE5-47BD-8BC1-B471A6067786} = {4838C66E-8677-4FBD-9609-25376042E981} + {E1C43415-3200-45F4-8BF9-A4DD7D7F2ED6} = {D92751C8-1039-4005-90B2-913E55E0B8BD} {83EAD6F0-3CB3-456A-AD81-072127D0DE0E} = {D92751C8-1039-4005-90B2-913E55E0B8BD} {26391930-F86F-47E0-A5F6-B89919E38CE1} = {D92751C8-1039-4005-90B2-913E55E0B8BD} {D81C0B87-F0C1-4297-A147-02F001FB7E1E} = {FD4D6594-D81E-456F-8F2E-35B09E04A755} @@ -3017,8 +3074,11 @@ Global {829688CD-CECE-4F6C-A5A0-032BB39CD9E0} = {BE521908-7944-46F3-98BF-B47D34509934} {70DEAA13-6DC8-44A0-B287-9E806A8054F1} = {890F3257-FCC2-4ED8-9180-22B3641B494C} {F06E4C37-4076-4272-9CA6-FB505E02CD31} = {BE521908-7944-46F3-98BF-B47D34509934} - {E1C43415-3200-45F4-8BF9-A4DD7D7F2ED6} = {D92751C8-1039-4005-90B2-913E55E0B8BD} {AEC26A0B-25F3-4544-A9D6-A427BFF79250} = {D92751C8-1039-4005-90B2-913E55E0B8BD} + {6BBA87CF-453D-4952-8E50-FA0E01FC79C7} = {743489BF-1941-43D5-8AF9-35C56D0DCC34} + {2EC4F6F1-8448-49DB-BCB9-85F7F0B0A496} = {804E065F-914C-414A-AF84-009312C3CFF6} + {573169D8-26DF-49ED-8708-74052EDAE34F} = {804E065F-914C-414A-AF84-009312C3CFF6} + {65FDA527-F9DF-4198-9E9E-28099AA28CBF} = {804E065F-914C-414A-AF84-009312C3CFF6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -3045,6 +3105,7 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{28e2ea7f-ffd1-4e13-9165-0243b5ac82f5}*SharedItemsImports = 13 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13 + DUI3-DX\Converters\Autocad\Speckle.Converters.CivilShared\Speckle.Converters.CivilShared.projitems*{2ec4f6f1-8448-49db-bcb9-85f7f0b0a496}*SharedItemsImports = 13 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{372d9f0f-ede9-4050-bf8c-758911c5c2e0}*SharedItemsImports = 13 ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{3b9189b9-e485-448a-8793-9b9587a36791}*SharedItemsImports = 5 @@ -3064,6 +3125,8 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{511c2fb0-9c73-4ac9-ba59-c8a84c089c59}*SharedItemsImports = 5 ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{521a7d9c-637f-4965-a6e6-ba96df99807d}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitTests\ConverterRevitTestsShared\ConverterRevitTestsShared.projitems*{54e90327-5f48-468d-9349-17aaceaa0a77}*SharedItemsImports = 5 + DUI3-DX\Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{573169d8-26df-49ed-8708-74052edae34f}*SharedItemsImports = 5 + DUI3-DX\Converters\Autocad\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{573169d8-26df-49ed-8708-74052edae34f}*SharedItemsImports = 5 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{57bf94a8-8f73-4d1a-91d2-b10cc64178b6}*SharedItemsImports = 5 ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{586a5a37-93f6-427e-8df8-c10db4d6822a}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{58a88f1a-7489-46d2-949d-2fc3f68c8d84}*SharedItemsImports = 5 @@ -3078,6 +3141,7 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 5 Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 + DUI3-DX\Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{6bba87cf-453d-4952-8e50-fa0e01fc79c7}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{70deaa13-6dc8-44a0-b287-9e806a8054f1}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{737d5567-7b1f-410d-9b7b-bae8065ed15b}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{74e39841-b2fa-494d-ac40-a6e505de6b33}*SharedItemsImports = 5 diff --git a/DUI3-DX.slnf b/DUI3-DX.slnf index 80e74b0b65..5e2475451c 100644 --- a/DUI3-DX.slnf +++ b/DUI3-DX.slnf @@ -11,6 +11,7 @@ "DUI3-DX\\Connectors\\ArcGIS\\Speckle.Connectors.ArcGIS3\\Speckle.Connectors.ArcGIS3.csproj", "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.Autocad2023\\Speckle.Connectors.Autocad2023.csproj", "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.AutocadShared\\Speckle.Connectors.AutocadShared.shproj", + "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.Civil3d2023\\Speckle.Connectors.Civil3d2023.csproj", "DUI3-DX\\Connectors\\Revit\\Speckle.Connectors.Revit2023\\Speckle.Connectors.Revit2023.csproj", "DUI3-DX\\Connectors\\Revit\\Speckle.Connectors.RevitShared\\Speckle.Connectors.RevitShared.shproj", "DUI3-DX\\Connectors\\Rhino\\Speckle.Connectors.Rhino7\\Speckle.Connectors.Rhino7.csproj", @@ -19,6 +20,8 @@ "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.AutocadShared\\Speckle.Converters.AutocadShared.shproj", + "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Civil3d2023.DependencyInjection\\Speckle.Converters.Civil3d2023.DependencyInjection.csproj", + "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Civil3d2023\\Speckle.Converters.Civil3d2023.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.DependencyInjection\\Speckle.Converters.Revit2023.DependencyInjection.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.Tests\\Speckle.Converters.Revit2023.Tests.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023\\Speckle.Converters.Revit2023.csproj", diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b37ceb1688 --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Speckle.Connectors.Civil3d2023")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Speckle.Connectors.Civil3d2023")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("6bba87cf-453d-4952-8e50-fa0e01fc79c7")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj new file mode 100644 index 0000000000..31e72caec3 --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj @@ -0,0 +1,25 @@ + + + Speckle.Connectors.Civil3d + net48 + x64 + true + Program + $(ProgramW6432)\Autodesk\AutoCAD 2023\acad.exe + + + + + + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs new file mode 100644 index 0000000000..cc3e1059d6 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs @@ -0,0 +1,20 @@ +using Autodesk.AutoCAD.ApplicationServices; +using Autodesk.AutoCAD.DatabaseServices; +using Speckle.Autofac.DependencyInjection; +using Speckle.Converters.Autocad; +using Speckle.Converters.Civil3d; +using Speckle.Converters.Common; +using Speckle.Converters.Common.DependencyInjection; + +namespace Speckle.Converters.Civil3d2023.DependencyInjection; + +public class Civil3dConverterModule : ISpeckleModule +{ + public void Load(SpeckleContainerBuilder builder) + { + builder.AddConverterCommon(); + + // single stack per conversion + builder.AddScoped, AutocadConversionContextStack>(); + } +} diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj new file mode 100644 index 0000000000..c64ed7a6f4 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj @@ -0,0 +1,29 @@ + + + + net48 + x64 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj new file mode 100644 index 0000000000..b057a7eec6 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj @@ -0,0 +1,22 @@ + + + + + net48 + x64 + + + + + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/GlobalUsings.cs b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/GlobalUsings.cs new file mode 100644 index 0000000000..9c48f198aa --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/GlobalUsings.cs @@ -0,0 +1,6 @@ +global using ADB = Autodesk.AutoCAD.DatabaseServices; +global using AG = Autodesk.AutoCAD.Geometry; +global using SOG = Objects.Geometry; +global using SOP = Objects.Primitive; +global using Document = Autodesk.AutoCAD.ApplicationServices.Document; +global using Application = Autodesk.AutoCAD.ApplicationServices.Core.Application; diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems new file mode 100644 index 0000000000..105e49159e --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems @@ -0,0 +1,13 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 2ec4f6f1-8448-49db-bcb9-85f7f0b0a496 + + + Speckle.Converters.Civil3dShared + + + + \ No newline at end of file diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj new file mode 100644 index 0000000000..57a5c83217 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj @@ -0,0 +1,13 @@ + + + + 2ec4f6f1-8448-49db-bcb9-85f7f0b0a496 + 14.0 + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems b/DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems new file mode 100644 index 0000000000..52eefd904b --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems @@ -0,0 +1,19 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 2ec4f6f1-8448-49db-bcb9-85f7f0b0a496 + + + Speckle.Converters.CivilShared + + + + + + + + + + \ No newline at end of file From b2365e4a3645badde7669e6449c5252edca6fc68 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Thu, 20 Jun 2024 14:07:11 +0100 Subject: [PATCH 02/12] fixes civil3d connector structure --- All.sln | 118 +++++++++--------- Core/Core/Kits/Applications.cs | 6 +- DUI3-DX.slnf | 6 +- .../Speckle.Connectors.Autocad2023.csproj | 5 +- .../Bindings/AutocadBasicConnectorBinding.cs | 2 +- .../Bindings/AutocadSendBinding.cs | 5 +- .../Civil3dConnectorModule.cs | 66 ++++++++++ .../DependencyInjection/Civil3dSettings.cs | 21 ++++ .../AutocadConnectorModule.cs | 3 +- .../DependencyInjection/AutocadSettings.cs | 21 ++++ .../HostApp/AutocadLayerManager.cs | 2 +- .../Interfaces/IAutocadSettings.cs | 11 ++ .../Plugin/AutocadCommand.cs | 14 ++- .../Plugin/AutocadPlugin.cs | 4 +- ...Speckle.Connectors.AutocadShared.projitems | 7 +- .../Properties/AssemblyInfo.cs | 36 ------ .../Speckle.Connectors.Civil3d2024.csproj} | 10 +- .../Speckle.Connectors.Civil3d2024.csproj | 28 +++++ .../Civil3dConnectorModule.cs | 64 ++++++++++ .../HostApp/Civil3dSettings.cs} | 9 +- ...peckle.Connectors.Civil3dShared.projitems} | 12 +- .../Speckle.Connectors.Civil3dShared.shproj | 13 ++ .../Civil3dConverterModule.cs | 0 ...rs.Civil3d2024.DependencyInjection.csproj} | 2 +- .../Speckle.Converters.Civil3d2024.csproj} | 4 +- .../Civil3dConverterModule.cs | 20 +++ ...ers.Civil3d2024.DependencyInjection.csproj | 29 +++++ .../Speckle.Converters.Civil3d2024.csproj | 22 ++++ .../GlobalUsings.cs | 0 ...Speckle.Converters.Civil3dShared.projitems | 4 + .../Speckle.Converters.Civil3dShared.shproj | 4 +- 31 files changed, 410 insertions(+), 138 deletions(-) create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dConnectorModule.cs create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs delete mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs rename DUI3-DX/Connectors/Autocad/{Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj => Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj} (75%) create mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj create mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs rename DUI3-DX/Connectors/{Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs => Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs} (60%) rename DUI3-DX/{Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems => Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems} (51%) create mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj rename DUI3-DX/Converters/{Autocad => Civil3d}/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs (100%) rename DUI3-DX/Converters/{Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj => Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj} (96%) rename DUI3-DX/Converters/{Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj => Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj} (97%) create mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs create mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj create mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj rename DUI3-DX/Converters/{Autocad => Civil3d}/Speckle.Converters.Civil3dShared/GlobalUsings.cs (100%) rename DUI3-DX/Converters/{Autocad => Civil3d}/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems (78%) rename DUI3-DX/Converters/{Autocad => Civil3d}/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj (92%) diff --git a/All.sln b/All.sln index 8f604d34a6..75f6880aa6 100644 --- a/All.sln +++ b/All.sln @@ -557,13 +557,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B1324D25 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Revit2023.Tests", "DUI3-DX\Converters\Revit\Speckle.Converters.Revit2023.Tests\Speckle.Converters.Revit2023.Tests.csproj", "{AEC26A0B-25F3-4544-A9D6-A427BFF79250}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2023", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2023\Speckle.Connectors.Civil3d2023.csproj", "{6BBA87CF-453D-4952-8E50-FA0E01FC79C7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Civil3d", "Civil3d", "{98220F0B-DF0F-4C22-8961-CC2989C1C646}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Speckle.Converters.Civil3dShared", "DUI3-DX\Converters\Autocad\Speckle.Converters.CivilShared\Speckle.Converters.Civil3dShared.shproj", "{2EC4F6F1-8448-49DB-BCB9-85F7F0B0A496}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{B5A077DF-ED31-4784-8D0B-72BB0471058C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2023", "DUI3-DX\Converters\Autocad\Speckle.Converters.Civil3d2023\Speckle.Converters.Civil3d2023.csproj", "{573169D8-26DF-49ED-8708-74052EDAE34F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2024", "DUI3-DX\Converters\Civil3d\Speckle.Converters.Civil3d2024\Speckle.Converters.Civil3d2024.csproj", "{FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converters.Civil3d2023.DependencyInjection", "DUI3-DX\Converters\Autocad\Speckle.Converters.Civil3d2023.DependencyInjection\Speckle.Converters.Civil3d2023.DependencyInjection.csproj", "{65FDA527-F9DF-4198-9E9E-28099AA28CBF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2024.DependencyInjection", "DUI3-DX\Converters\Civil3d\Speckle.Converters.Civil3d2024.DependencyInjection\Speckle.Converters.Civil3d2024.DependencyInjection.csproj", "{087A3F83-F69A-4404-B855-02AFA600937C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -2815,54 +2815,54 @@ Global {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|Any CPU.Build.0 = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.ActiveCfg = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.Build.0 = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|x64.ActiveCfg = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug Mac|x64.Build.0 = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Debug|x64.Build.0 = Debug|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|Any CPU.Build.0 = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|x64.ActiveCfg = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release Mac|x64.Build.0 = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|Any CPU.Build.0 = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|x64.ActiveCfg = Release|Any CPU - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7}.Release|x64.Build.0 = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|x64.ActiveCfg = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug Mac|x64.Build.0 = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|x64.ActiveCfg = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Debug|x64.Build.0 = Debug|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|Any CPU.Build.0 = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|x64.ActiveCfg = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release Mac|x64.Build.0 = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|Any CPU.Build.0 = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|x64.ActiveCfg = Release|Any CPU - {573169D8-26DF-49ED-8708-74052EDAE34F}.Release|x64.Build.0 = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|x64.ActiveCfg = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug Mac|x64.Build.0 = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|x64.ActiveCfg = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Debug|x64.Build.0 = Debug|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|Any CPU.Build.0 = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|x64.ActiveCfg = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release Mac|x64.Build.0 = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|Any CPU.Build.0 = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|x64.ActiveCfg = Release|Any CPU - {65FDA527-F9DF-4198-9E9E-28099AA28CBF}.Release|x64.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|x64.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|x64.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|x64.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|x64.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|x64.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.Build.0 = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|x64.Build.0 = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|x64.ActiveCfg = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|x64.Build.0 = Debug|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|x64.ActiveCfg = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|x64.Build.0 = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|Any CPU.Build.0 = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|x64.ActiveCfg = Release|Any CPU + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|x64.Build.0 = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|x64.Build.0 = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|x64.ActiveCfg = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|x64.Build.0 = Debug|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|x64.ActiveCfg = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|x64.Build.0 = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release|Any CPU.Build.0 = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release|x64.ActiveCfg = Release|Any CPU + {087A3F83-F69A-4404-B855-02AFA600937C}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3075,10 +3075,10 @@ Global {70DEAA13-6DC8-44A0-B287-9E806A8054F1} = {890F3257-FCC2-4ED8-9180-22B3641B494C} {F06E4C37-4076-4272-9CA6-FB505E02CD31} = {BE521908-7944-46F3-98BF-B47D34509934} {AEC26A0B-25F3-4544-A9D6-A427BFF79250} = {D92751C8-1039-4005-90B2-913E55E0B8BD} - {6BBA87CF-453D-4952-8E50-FA0E01FC79C7} = {743489BF-1941-43D5-8AF9-35C56D0DCC34} - {2EC4F6F1-8448-49DB-BCB9-85F7F0B0A496} = {804E065F-914C-414A-AF84-009312C3CFF6} - {573169D8-26DF-49ED-8708-74052EDAE34F} = {804E065F-914C-414A-AF84-009312C3CFF6} - {65FDA527-F9DF-4198-9E9E-28099AA28CBF} = {804E065F-914C-414A-AF84-009312C3CFF6} + {98220F0B-DF0F-4C22-8961-CC2989C1C646} = {1FE3C60E-7865-40A5-9794-55ECB64F6489} + {B5A077DF-ED31-4784-8D0B-72BB0471058C} = {743489BF-1941-43D5-8AF9-35C56D0DCC34} + {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D} = {98220F0B-DF0F-4C22-8961-CC2989C1C646} + {087A3F83-F69A-4404-B855-02AFA600937C} = {98220F0B-DF0F-4C22-8961-CC2989C1C646} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -3105,7 +3105,6 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{28e2ea7f-ffd1-4e13-9165-0243b5ac82f5}*SharedItemsImports = 13 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{2d0f9f8a-2e89-4780-978a-cd92d6d7b843}*SharedItemsImports = 13 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{2dcd648d-dca5-4d2a-8b14-ad2cb85d24b0}*SharedItemsImports = 13 - DUI3-DX\Converters\Autocad\Speckle.Converters.CivilShared\Speckle.Converters.CivilShared.projitems*{2ec4f6f1-8448-49db-bcb9-85f7f0b0a496}*SharedItemsImports = 13 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{372d9f0f-ede9-4050-bf8c-758911c5c2e0}*SharedItemsImports = 13 ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{3af1ef30-0906-4926-a02c-4e3ad666352a}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{3b9189b9-e485-448a-8793-9b9587a36791}*SharedItemsImports = 5 @@ -3125,8 +3124,6 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{511c2fb0-9c73-4ac9-ba59-c8a84c089c59}*SharedItemsImports = 5 ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{521a7d9c-637f-4965-a6e6-ba96df99807d}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitTests\ConverterRevitTestsShared\ConverterRevitTestsShared.projitems*{54e90327-5f48-468d-9349-17aaceaa0a77}*SharedItemsImports = 5 - DUI3-DX\Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{573169d8-26df-49ed-8708-74052edae34f}*SharedItemsImports = 5 - DUI3-DX\Converters\Autocad\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{573169d8-26df-49ed-8708-74052edae34f}*SharedItemsImports = 5 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{57bf94a8-8f73-4d1a-91d2-b10cc64178b6}*SharedItemsImports = 5 ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{586a5a37-93f6-427e-8df8-c10db4d6822a}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{58a88f1a-7489-46d2-949d-2fc3f68c8d84}*SharedItemsImports = 5 @@ -3141,7 +3138,6 @@ Global ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{67157264-aaa5-46a8-a38b-16254b49b892}*SharedItemsImports = 5 Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{67a463d3-e98b-4b16-b069-d7bbb05386a1}*SharedItemsImports = 5 - DUI3-DX\Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{6bba87cf-453d-4952-8e50-fa0e01fc79c7}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{70deaa13-6dc8-44a0-b287-9e806a8054f1}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{737d5567-7b1f-410d-9b7b-bae8065ed15b}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{74e39841-b2fa-494d-ac40-a6e505de6b33}*SharedItemsImports = 5 @@ -3181,6 +3177,7 @@ Global Objects\Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{adfa7990-c2e7-49da-b726-bfe19e08ccca}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{b47492d9-2eda-4016-a930-7fa708c85c3d}*SharedItemsImports = 13 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{b4d6f6dc-0712-4f9f-a24f-6b76dae84b6f}*SharedItemsImports = 5 + DUI3-DX\Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{b5a077df-ed31-4784-8d0b-72bb0471058c}*SharedItemsImports = 5 ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{b7376ec8-5d3e-47d2-96a7-748552f14c39}*SharedItemsImports = 13 Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13 ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{b81e0f77-1abd-4941-9d76-c0dc6b1b6b82}*SharedItemsImports = 5 @@ -3215,6 +3212,7 @@ Global ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4aa033f-4f85-4990-afe9-86be00abe973}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4bfb155-7ba9-4e46-8240-9c825060c904}*SharedItemsImports = 5 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{fc044d89-0ff3-441d-b35d-87454a693c16}*SharedItemsImports = 5 + DUI3-DX\Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{fcdbebe8-0de6-4898-b60f-dd8beac6754d}*SharedItemsImports = 5 ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{fdbc3082-1fad-4701-a121-802f591d2d35}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ff1793e1-77f5-4a92-b3f2-6d8b104e479b}*SharedItemsImports = 5 EndGlobalSection diff --git a/Core/Core/Kits/Applications.cs b/Core/Core/Kits/Applications.cs index ea3ccb0179..6988187cff 100644 --- a/Core/Core/Kits/Applications.cs +++ b/Core/Core/Kits/Applications.cs @@ -63,7 +63,7 @@ public static class HostApplications Dynamo = new("Dynamo", "dynamo"), Unity = new("Unity", "unity"), GSA = new("GSA", "gsa"), - Civil = new("Civil 3D", "civil3d"), + Civil3D = new("Civil 3D", "civil3d"), AutoCAD = new("AutoCAD", "autocad"), MicroStation = new("MicroStation", "microstation"), OpenRoads = new("OpenRoads", "openroads"), @@ -119,9 +119,9 @@ public static HostApplication GetHostAppFromString(string? appname) return AutoCAD; } - if (appname.Contains("civil")) + if (appname.Contains("civil3d")) { - return Civil; + return Civil3D; } if (appname.Contains("rhino")) diff --git a/DUI3-DX.slnf b/DUI3-DX.slnf index 5e2475451c..8f2d1a29ac 100644 --- a/DUI3-DX.slnf +++ b/DUI3-DX.slnf @@ -11,7 +11,7 @@ "DUI3-DX\\Connectors\\ArcGIS\\Speckle.Connectors.ArcGIS3\\Speckle.Connectors.ArcGIS3.csproj", "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.Autocad2023\\Speckle.Connectors.Autocad2023.csproj", "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.AutocadShared\\Speckle.Connectors.AutocadShared.shproj", - "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.Civil3d2023\\Speckle.Connectors.Civil3d2023.csproj", + "DUI3-DX\\Connectors\\Autocad\\Speckle.Connectors.Civil3d2024\\Speckle.Connectors.Civil3d2024.csproj", "DUI3-DX\\Connectors\\Revit\\Speckle.Connectors.Revit2023\\Speckle.Connectors.Revit2023.csproj", "DUI3-DX\\Connectors\\Revit\\Speckle.Connectors.RevitShared\\Speckle.Connectors.RevitShared.shproj", "DUI3-DX\\Connectors\\Rhino\\Speckle.Connectors.Rhino7\\Speckle.Connectors.Rhino7.csproj", @@ -20,8 +20,8 @@ "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.AutocadShared\\Speckle.Converters.AutocadShared.shproj", - "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Civil3d2023.DependencyInjection\\Speckle.Converters.Civil3d2023.DependencyInjection.csproj", - "DUI3-DX\\Converters\\Autocad\\Speckle.Converters.Civil3d2023\\Speckle.Converters.Civil3d2023.csproj", + "DUI3-DX\\Converters\\Civil3d\\Speckle.Converters.Civil3d2024.DependencyInjection\\Speckle.Converters.Civil3d2024.DependencyInjection.csproj", + "DUI3-DX\\Converters\\Civil3d\\Speckle.Converters.Civil3d2024\\Speckle.Converters.Civil3d2024.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.DependencyInjection\\Speckle.Converters.Revit2023.DependencyInjection.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.Tests\\Speckle.Converters.Revit2023.Tests.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023\\Speckle.Converters.Revit2023.csproj", diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj index 4ef5a65342..d4bd88d1ae 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj @@ -1,4 +1,4 @@ - + Speckle.Connectors.Autocad net48 @@ -6,11 +6,12 @@ true Program $(ProgramW6432)\Autodesk\AutoCAD 2023\acad.exe + $(DefineConstants);AUTOCAD2023 - + diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs index a87ea7f70d..e5400be4f3 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs @@ -1,6 +1,6 @@ using Autodesk.AutoCAD.DatabaseServices; using Sentry.Reflection; -using Speckle.Connectors.Autocad.HostApp; +using Speckle.Connectors.Autocad.DependencyInjection; using Speckle.Connectors.DUI.Bindings; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs index 296dd64359..b92f98b2b7 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs @@ -13,6 +13,7 @@ using Speckle.Connectors.DUI.Models.Card.SendFilter; using Speckle.Connectors.Utils; using Speckle.Connectors.Utils.Caching; +using Speckle.Connectors.Autocad.Interfaces; namespace Speckle.Connectors.Autocad.Bindings; @@ -27,7 +28,7 @@ public sealed class AutocadSendBinding : ISendBinding private readonly List _sendFilters; private readonly CancellationManager _cancellationManager; private readonly IUnitOfWorkFactory _unitOfWorkFactory; - private readonly AutocadSettings _autocadSettings; + private readonly IAutocadSettings _autocadSettings; private readonly ISendConversionCache _sendConversionCache; /// @@ -41,7 +42,7 @@ public AutocadSendBinding( IBridge parent, IEnumerable sendFilters, CancellationManager cancellationManager, - AutocadSettings autocadSettings, + IAutocadSettings autocadSettings, IUnitOfWorkFactory unitOfWorkFactory, ISendConversionCache sendConversionCache ) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dConnectorModule.cs new file mode 100644 index 0000000000..6615e3c425 --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dConnectorModule.cs @@ -0,0 +1,66 @@ +#if CIVIL3D +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.Operations; +using Speckle.Core.Models.GraphTraversal; + +namespace Speckle.Connectors.Civil3d.DependencyInjection; + +public class Civil3dConnectorModule : ISpeckleModule +{ + public void Load(SpeckleContainerBuilder builder) + { + builder.AddAutofac(); + builder.AddConnectorUtils(); + builder.AddDUI(); + builder.AddDUIView(); + + // Register other connector specific types + builder.AddSingleton(); + builder.AddTransient(); + builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + + // Operations + builder.AddScoped>(); + builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); + + // Object Builders + builder.AddScoped(); + builder.AddScoped, AutocadRootObjectBuilder>(); + + // Register bindings + builder.AddSingleton(); + builder.AddSingleton("connectorName", "Civil3d"); // POC: Easier like this for now, should be cleaned up later + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + + // register send filters + builder.AddTransient(); + + // register send conversion cache + builder.AddSingleton(); + } +} +#endif diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs new file mode 100644 index 0000000000..f3222de887 --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs @@ -0,0 +1,21 @@ +using System.IO; +using Speckle.Connectors.Autocad.Interfaces; +using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 + +namespace Speckle.Connectors.Civil3d.DependencyInjection; + +public class Civil3dSettings : IAutocadSettings +{ + public Civil3dSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) + { + HostAppInfo = hostAppInfo; + HostAppVersion = hostAppVersion; + var dir = new DirectoryInfo(typeof(Civil3dSettings).Assembly.Location); + Modules = new[] { dir.Parent.FullName }; + } + + public HostApplication HostAppInfo { get; set; } + public HostAppVersion HostAppVersion { get; set; } + + public IReadOnlyList Modules { get; set; } +} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs index f4a970b1d0..1196ef92e9 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs @@ -1,3 +1,4 @@ +#if AUTOCAD2023 using Speckle.Autofac; using Speckle.Autofac.DependencyInjection; using Speckle.Connectors.Autocad.Bindings; @@ -47,7 +48,6 @@ public void Load(SpeckleContainerBuilder builder) builder.AddScoped, AutocadRootObjectBuilder>(); // Register bindings - builder.AddSingleton(); builder.AddSingleton("connectorName", "Autocad"); // POC: Easier like this for now, should be cleaned up later builder.AddSingleton(); @@ -64,3 +64,4 @@ public void Load(SpeckleContainerBuilder builder) builder.AddSingleton(); } } +#endif diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs new file mode 100644 index 0000000000..e8ca67524d --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs @@ -0,0 +1,21 @@ +using System.IO; +using Speckle.Connectors.Autocad.Interfaces; +using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 + +namespace Speckle.Connectors.Autocad.DependencyInjection; + +public class AutocadSettings : IAutocadSettings +{ + public AutocadSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) + { + HostAppInfo = hostAppInfo; + HostAppVersion = hostAppVersion; + var dir = new DirectoryInfo(typeof(AutocadSettings).Assembly.Location); + Modules = new[] { dir.Parent.FullName }; + } + + public HostApplication HostAppInfo { get; set; } + public HostAppVersion HostAppVersion { get; set; } + + public IReadOnlyList Modules { get; set; } +} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerManager.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerManager.cs index 7fb81ccd82..87b1f00ca7 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerManager.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadLayerManager.cs @@ -10,7 +10,7 @@ public class AutocadLayerManager private readonly string _layerFilterName = "Speckle"; // POC: Will be addressed to move it into AutocadContext! - private Document Doc => Autodesk.AutoCAD.ApplicationServices.Core.Application.DocumentManager.MdiActiveDocument; + private Document Doc => Application.DocumentManager.MdiActiveDocument; public AutocadLayerManager(AutocadContext autocadContext) { diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs new file mode 100644 index 0000000000..ddb4ab63b2 --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs @@ -0,0 +1,11 @@ +using Speckle.Core.Kits; + +namespace Speckle.Connectors.Autocad.Interfaces; + +public interface IAutocadSettings +{ + public HostApplication HostAppInfo { get; set; } + public HostAppVersion HostAppVersion { get; set; } + + public IReadOnlyList Modules { get; set; } +} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs index 6727399792..3bc28273c5 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs @@ -3,7 +3,11 @@ using Autodesk.AutoCAD.Runtime; using Autodesk.AutoCAD.Windows; using Speckle.Autofac.DependencyInjection; -using Speckle.Connectors.Autocad.HostApp; +#if CIVIL3D +using Speckle.Connectors.Civil3d.DependencyInjection; +#else +using Speckle.Connectors.Autocad.DependencyInjection; +#endif using Speckle.Core.Kits; using Speckle.Connectors.Autocad.Interfaces; using Speckle.Connectors.DUI.WebView; @@ -35,8 +39,12 @@ public void Command() var builder = SpeckleContainerBuilder.CreateInstance(); - var autocadSettings = new AutocadSettings(HostApplications.AutoCAD, HostAppVersion.v2023); - +#if CIVIL3D + IAutocadSettings autocadSettings = new Civil3dSettings(HostApplications.Civil3D, HostAppVersion.v2024); +#else + IAutocadSettings autocadSettings = new AutocadSettings(HostApplications.AutoCAD, HostAppVersion.v2023); +#endif + var executingAssembly = Assembly.GetExecutingAssembly(); Container = builder .LoadAutofacModules(Assembly.GetExecutingAssembly(), autocadSettings.Modules) .AddSingleton(autocadSettings) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs index 5307a7b531..9fd1078fcb 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs @@ -8,9 +8,9 @@ public class AutocadPlugin : IAutocadPlugin { private readonly AutocadIdleManager _idleManager; private readonly DUI3ControlWebView _panel; - private readonly AutocadSettings _settings; + private readonly IAutocadSettings _settings; - public AutocadPlugin(DUI3ControlWebView panel, AutocadSettings settings, AutocadIdleManager idleManager) + public AutocadPlugin(DUI3ControlWebView panel, IAutocadSettings settings, AutocadIdleManager idleManager) { _panel = panel; _settings = settings; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems index d45686060d..9052abe76a 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems @@ -13,19 +13,22 @@ + + - + + @@ -36,6 +39,6 @@ - + \ No newline at end of file diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs deleted file mode 100644 index b37ceb1688..0000000000 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Speckle.Connectors.Civil3d2023")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Speckle.Connectors.Civil3d2023")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("6bba87cf-453d-4952-8e50-fa0e01fc79c7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj similarity index 75% rename from DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj rename to DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj index 31e72caec3..fb67b8434f 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2023/Speckle.Connectors.Civil3d2023.csproj +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj @@ -5,11 +5,11 @@ x64 true Program - $(ProgramW6432)\Autodesk\AutoCAD 2023\acad.exe + $(ProgramW6432)\Autodesk\AutoCAD 2024\acad.exe + $(DefineConstants);CIVIL3D2024;CIVIL3D;CIVIL3D2021_OR_GREATER;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER; - @@ -18,8 +18,8 @@ - - + + - + diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj new file mode 100644 index 0000000000..342d89adef --- /dev/null +++ b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj @@ -0,0 +1,28 @@ + + + Speckle.Connectors.Civil3d + net48 + x64 + true + Program + $(ProgramW6432)\Autodesk\AutoCAD 2024\acad.exe + $(DefineConstants);CIVIL3D2024;CIVIL3D;CIVIL3D2021_OR_GREATER;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER; + + + + + + + + + + + + + + + + + + + diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs new file mode 100644 index 0000000000..1d58765e12 --- /dev/null +++ b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs @@ -0,0 +1,64 @@ +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.Operations; +using Speckle.Core.Models.GraphTraversal; + +namespace Speckle.Connectors.Civil3d.DependencyInjection; + +public class Civil3dConnectorModule : ISpeckleModule +{ + public void Load(SpeckleContainerBuilder builder) + { + builder.AddAutofac(); + builder.AddConnectorUtils(); + builder.AddDUI(); + builder.AddDUIView(); + + // Register other connector specific types + builder.AddSingleton(); + builder.AddTransient(); + builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + + // Operations + builder.AddScoped>(); + builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); + + // Object Builders + builder.AddScoped(); + builder.AddScoped, AutocadRootObjectBuilder>(); + + // Register bindings + builder.AddSingleton(); + builder.AddSingleton("connectorName", "Civil3d"); // POC: Easier like this for now, should be cleaned up later + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + + // register send filters + builder.AddTransient(); + + // register send conversion cache + builder.AddSingleton(); + } +} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs similarity index 60% rename from DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs rename to DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs index 4d90418b83..250837672c 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs +++ b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs @@ -1,15 +1,16 @@ using System.IO; using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 -namespace Speckle.Connectors.Autocad.HostApp; +namespace Speckle.Connectors.Civil3d.HostApp; -public class AutocadSettings +public class Civil3dSettings { - public AutocadSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) + public Civil3dSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) { HostAppInfo = hostAppInfo; HostAppVersion = hostAppVersion; - Modules = new[] { new DirectoryInfo(typeof(AutocadSettings).Assembly.Location).Parent.FullName }; + var dir = new DirectoryInfo(typeof(Civil3dSettings).Assembly.Location); + Modules = new[] { dir.Parent.FullName }; } public HostApplication HostAppInfo { get; private set; } diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems similarity index 51% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems rename to DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems index 52eefd904b..94c8f58b48 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.CivilShared/Speckle.Converters.CivilShared.projitems +++ b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems @@ -3,17 +3,13 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true - 2ec4f6f1-8448-49db-bcb9-85f7f0b0a496 + b54a7c1f-4413-471d-b4ee-f9a6fb8fcfe8 - Speckle.Converters.CivilShared + Speckle.Connectors.Civil3dShared - - - - - - + + \ No newline at end of file diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj new file mode 100644 index 0000000000..76b3e17844 --- /dev/null +++ b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj @@ -0,0 +1,13 @@ + + + + b54a7c1f-4413-471d-b4ee-f9a6fb8fcfe8 + 14.0 + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs similarity index 100% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs rename to DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj similarity index 96% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj rename to DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj index c64ed7a6f4..98033e4ed1 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2023.DependencyInjection.csproj +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj @@ -7,7 +7,7 @@ - + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj similarity index 97% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj rename to DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj index b057a7eec6..6f96fbc340 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2023.csproj +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs new file mode 100644 index 0000000000..cc3e1059d6 --- /dev/null +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs @@ -0,0 +1,20 @@ +using Autodesk.AutoCAD.ApplicationServices; +using Autodesk.AutoCAD.DatabaseServices; +using Speckle.Autofac.DependencyInjection; +using Speckle.Converters.Autocad; +using Speckle.Converters.Civil3d; +using Speckle.Converters.Common; +using Speckle.Converters.Common.DependencyInjection; + +namespace Speckle.Converters.Civil3d2023.DependencyInjection; + +public class Civil3dConverterModule : ISpeckleModule +{ + public void Load(SpeckleContainerBuilder builder) + { + builder.AddConverterCommon(); + + // single stack per conversion + builder.AddScoped, AutocadConversionContextStack>(); + } +} diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj new file mode 100644 index 0000000000..c69c6ef974 --- /dev/null +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj @@ -0,0 +1,29 @@ + + + + net48 + x64 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj new file mode 100644 index 0000000000..6f96fbc340 --- /dev/null +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj @@ -0,0 +1,22 @@ + + + + + net48 + x64 + + + + + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/GlobalUsings.cs b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/GlobalUsings.cs similarity index 100% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/GlobalUsings.cs rename to DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/GlobalUsings.cs diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems similarity index 78% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems rename to DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems index 105e49159e..2a86c942c3 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems @@ -9,5 +9,9 @@ Speckle.Converters.Civil3dShared + + + + \ No newline at end of file diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj similarity index 92% rename from DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj rename to DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj index 57a5c83217..230d87d7ee 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj +++ b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj @@ -1,7 +1,7 @@ - 2ec4f6f1-8448-49db-bcb9-85f7f0b0a496 + {9A147842-417A-4311-A87A-9002A344AAA4} 14.0 @@ -10,4 +10,4 @@ - + \ No newline at end of file From 87f907786956b6e0c91ea8f7d5ad37f9e8dc5294 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 10:06:04 +0100 Subject: [PATCH 03/12] fixes civil3d connector --- .../Speckle.Connectors.Autocad2023.csproj | 2 +- .../Bindings/AutocadSendBinding.cs | 6 +- .../DependencyInjection/Civil3dSettings.cs | 21 ------ .../AutocadConnectorModule.cs | 2 +- .../Civil3dConnectorModule.cs | 0 .../AutocadSettings.cs | 3 +- .../Interfaces/IAutocadSettings.cs | 11 ---- .../Plugin/AutocadCommand.cs | 8 +-- .../Plugin/AutocadPlugin.cs | 5 +- ...Speckle.Connectors.AutocadShared.projitems | 9 +-- .../Speckle.Connectors.Civil3d2024.csproj | 2 +- .../Speckle.Connectors.Civil3d2024.csproj | 28 -------- .../Civil3dConnectorModule.cs | 64 ------------------- .../HostApp/Civil3dSettings.cs | 20 ------ ...Speckle.Connectors.Civil3dShared.projitems | 15 ----- .../Speckle.Connectors.Civil3dShared.shproj | 13 ---- 16 files changed, 14 insertions(+), 195 deletions(-) delete mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs rename DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/{Civil3d => }/DependencyInjection/Civil3dConnectorModule.cs (100%) rename DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/{DependencyInjection => HostApp}/AutocadSettings.cs (86%) delete mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs delete mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj delete mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs delete mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs delete mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems delete mode 100644 DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj index d4bd88d1ae..238ec770f6 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Autocad2023/Speckle.Connectors.Autocad2023.csproj @@ -6,7 +6,7 @@ true Program $(ProgramW6432)\Autodesk\AutoCAD 2023\acad.exe - $(DefineConstants);AUTOCAD2023 + $(DefineConstants);AUTOCAD2023;AUTOCAD diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs index b92f98b2b7..65fd8236b7 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs @@ -1,6 +1,7 @@ using Autodesk.AutoCAD.DatabaseServices; using Speckle.Connectors.Autocad.HostApp; using Speckle.Connectors.Autocad.HostApp.Extensions; +using Speckle.Connectors.Autocad.DependencyInjection; using Speckle.Connectors.DUI.Bindings; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models; @@ -13,7 +14,6 @@ using Speckle.Connectors.DUI.Models.Card.SendFilter; using Speckle.Connectors.Utils; using Speckle.Connectors.Utils.Caching; -using Speckle.Connectors.Autocad.Interfaces; namespace Speckle.Connectors.Autocad.Bindings; @@ -28,7 +28,7 @@ public sealed class AutocadSendBinding : ISendBinding private readonly List _sendFilters; private readonly CancellationManager _cancellationManager; private readonly IUnitOfWorkFactory _unitOfWorkFactory; - private readonly IAutocadSettings _autocadSettings; + private readonly AutocadSettings _autocadSettings; private readonly ISendConversionCache _sendConversionCache; /// @@ -42,7 +42,7 @@ public AutocadSendBinding( IBridge parent, IEnumerable sendFilters, CancellationManager cancellationManager, - IAutocadSettings autocadSettings, + AutocadSettings autocadSettings, IUnitOfWorkFactory unitOfWorkFactory, ISendConversionCache sendConversionCache ) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs deleted file mode 100644 index f3222de887..0000000000 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dSettings.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.IO; -using Speckle.Connectors.Autocad.Interfaces; -using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 - -namespace Speckle.Connectors.Civil3d.DependencyInjection; - -public class Civil3dSettings : IAutocadSettings -{ - public Civil3dSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) - { - HostAppInfo = hostAppInfo; - HostAppVersion = hostAppVersion; - var dir = new DirectoryInfo(typeof(Civil3dSettings).Assembly.Location); - Modules = new[] { dir.Parent.FullName }; - } - - public HostApplication HostAppInfo { get; set; } - public HostAppVersion HostAppVersion { get; set; } - - public IReadOnlyList Modules { get; set; } -} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs index 1196ef92e9..00dca68eee 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs @@ -1,4 +1,4 @@ -#if AUTOCAD2023 +#if AUTOCAD using Speckle.Autofac; using Speckle.Autofac.DependencyInjection; using Speckle.Connectors.Autocad.Bindings; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs similarity index 100% rename from DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Civil3d/DependencyInjection/Civil3dConnectorModule.cs rename to DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs similarity index 86% rename from DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs rename to DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs index e8ca67524d..e492d2865f 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadSettings.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs @@ -1,10 +1,9 @@ using System.IO; -using Speckle.Connectors.Autocad.Interfaces; using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 namespace Speckle.Connectors.Autocad.DependencyInjection; -public class AutocadSettings : IAutocadSettings +public class AutocadSettings { public AutocadSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) { diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs deleted file mode 100644 index ddb4ab63b2..0000000000 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Interfaces/IAutocadSettings.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Speckle.Core.Kits; - -namespace Speckle.Connectors.Autocad.Interfaces; - -public interface IAutocadSettings -{ - public HostApplication HostAppInfo { get; set; } - public HostAppVersion HostAppVersion { get; set; } - - public IReadOnlyList Modules { get; set; } -} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs index 3bc28273c5..b03877ef95 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs @@ -3,11 +3,7 @@ using Autodesk.AutoCAD.Runtime; using Autodesk.AutoCAD.Windows; using Speckle.Autofac.DependencyInjection; -#if CIVIL3D -using Speckle.Connectors.Civil3d.DependencyInjection; -#else using Speckle.Connectors.Autocad.DependencyInjection; -#endif using Speckle.Core.Kits; using Speckle.Connectors.Autocad.Interfaces; using Speckle.Connectors.DUI.WebView; @@ -40,9 +36,9 @@ public void Command() var builder = SpeckleContainerBuilder.CreateInstance(); #if CIVIL3D - IAutocadSettings autocadSettings = new Civil3dSettings(HostApplications.Civil3D, HostAppVersion.v2024); + AutocadSettings autocadSettings = new (HostApplications.Civil3D, HostAppVersion.v2024); #else - IAutocadSettings autocadSettings = new AutocadSettings(HostApplications.AutoCAD, HostAppVersion.v2023); + AutocadSettings autocadSettings = new(HostApplications.AutoCAD, HostAppVersion.v2023); #endif var executingAssembly = Assembly.GetExecutingAssembly(); Container = builder diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs index 9fd1078fcb..2715074f8d 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs @@ -1,5 +1,6 @@ using Speckle.Connectors.Autocad.HostApp; using Speckle.Connectors.Autocad.Interfaces; +using Speckle.Connectors.Autocad.DependencyInjection; using Speckle.Connectors.DUI.WebView; namespace Speckle.Connectors.Autocad.Plugin; @@ -8,9 +9,9 @@ public class AutocadPlugin : IAutocadPlugin { private readonly AutocadIdleManager _idleManager; private readonly DUI3ControlWebView _panel; - private readonly IAutocadSettings _settings; + private readonly AutocadSettings _settings; - public AutocadPlugin(DUI3ControlWebView panel, IAutocadSettings settings, AutocadIdleManager idleManager) + public AutocadPlugin(DUI3ControlWebView panel, AutocadSettings settings, AutocadIdleManager idleManager) { _panel = panel; _settings = settings; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems index 9052abe76a..969934cde7 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems @@ -13,22 +13,20 @@ - - + - + - @@ -38,7 +36,4 @@ - - - \ No newline at end of file diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj index fb67b8434f..9b9ea87010 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj @@ -6,7 +6,7 @@ true Program $(ProgramW6432)\Autodesk\AutoCAD 2024\acad.exe - $(DefineConstants);CIVIL3D2024;CIVIL3D;CIVIL3D2021_OR_GREATER;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER; + $(DefineConstants);CIVIL3D2024;CIVIL3D; diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj deleted file mode 100644 index 342d89adef..0000000000 --- a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj +++ /dev/null @@ -1,28 +0,0 @@ - - - Speckle.Connectors.Civil3d - net48 - x64 - true - Program - $(ProgramW6432)\Autodesk\AutoCAD 2024\acad.exe - $(DefineConstants);CIVIL3D2024;CIVIL3D;CIVIL3D2021_OR_GREATER;CIVIL3D2022_OR_GREATER;CIVIL3D2023_OR_GREATER;CIVIL3D2024_OR_GREATER; - - - - - - - - - - - - - - - - - - - diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs deleted file mode 100644 index 1d58765e12..0000000000 --- a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/DependencyInjection/Civil3dConnectorModule.cs +++ /dev/null @@ -1,64 +0,0 @@ -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.Operations; -using Speckle.Core.Models.GraphTraversal; - -namespace Speckle.Connectors.Civil3d.DependencyInjection; - -public class Civil3dConnectorModule : ISpeckleModule -{ - public void Load(SpeckleContainerBuilder builder) - { - builder.AddAutofac(); - builder.AddConnectorUtils(); - builder.AddDUI(); - builder.AddDUIView(); - - // Register other connector specific types - builder.AddSingleton(); - builder.AddTransient(); - builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - - // Operations - builder.AddScoped>(); - builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); - - // Object Builders - builder.AddScoped(); - builder.AddScoped, AutocadRootObjectBuilder>(); - - // Register bindings - builder.AddSingleton(); - builder.AddSingleton("connectorName", "Civil3d"); // POC: Easier like this for now, should be cleaned up later - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - - // register send filters - builder.AddTransient(); - - // register send conversion cache - builder.AddSingleton(); - } -} diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs deleted file mode 100644 index 250837672c..0000000000 --- a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/HostApp/Civil3dSettings.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.IO; -using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 - -namespace Speckle.Connectors.Civil3d.HostApp; - -public class Civil3dSettings -{ - public Civil3dSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersion) - { - HostAppInfo = hostAppInfo; - HostAppVersion = hostAppVersion; - var dir = new DirectoryInfo(typeof(Civil3dSettings).Assembly.Location); - Modules = new[] { dir.Parent.FullName }; - } - - public HostApplication HostAppInfo { get; private set; } - public HostAppVersion HostAppVersion { get; private set; } - - public IReadOnlyList Modules { get; private set; } -} diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems deleted file mode 100644 index 94c8f58b48..0000000000 --- a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.projitems +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - b54a7c1f-4413-471d-b4ee-f9a6fb8fcfe8 - - - Speckle.Connectors.Civil3dShared - - - - - - \ No newline at end of file diff --git a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj b/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj deleted file mode 100644 index 76b3e17844..0000000000 --- a/DUI3-DX/Connectors/Civil3d/Speckle.Connectors.Civil3dShared/Speckle.Connectors.Civil3dShared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - b54a7c1f-4413-471d-b4ee-f9a6fb8fcfe8 - 14.0 - - - - - - - - From 0d8f5c7dbbcc8aefc2afee73b78ed05a3c7799ab Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 10:07:32 +0100 Subject: [PATCH 04/12] removes converter --- .../Civil3dConverterModule.cs | 20 ------------- ...ers.Civil3d2024.DependencyInjection.csproj | 29 ------------------- .../Speckle.Converters.Civil3d2024.csproj | 22 -------------- .../Civil3dConverterModule.cs | 20 ------------- ...ers.Civil3d2024.DependencyInjection.csproj | 29 ------------------- .../Speckle.Converters.Civil3d2024.csproj | 22 -------------- .../GlobalUsings.cs | 6 ---- ...Speckle.Converters.Civil3dShared.projitems | 17 ----------- .../Speckle.Converters.Civil3dShared.shproj | 13 --------- 9 files changed, 178 deletions(-) delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/GlobalUsings.cs delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems delete mode 100644 DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs deleted file mode 100644 index cc3e1059d6..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Civil3dConverterModule.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Autodesk.AutoCAD.ApplicationServices; -using Autodesk.AutoCAD.DatabaseServices; -using Speckle.Autofac.DependencyInjection; -using Speckle.Converters.Autocad; -using Speckle.Converters.Civil3d; -using Speckle.Converters.Common; -using Speckle.Converters.Common.DependencyInjection; - -namespace Speckle.Converters.Civil3d2023.DependencyInjection; - -public class Civil3dConverterModule : ISpeckleModule -{ - public void Load(SpeckleContainerBuilder builder) - { - builder.AddConverterCommon(); - - // single stack per conversion - builder.AddScoped, AutocadConversionContextStack>(); - } -} diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj deleted file mode 100644 index 98033e4ed1..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - net48 - x64 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj deleted file mode 100644 index 6f96fbc340..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2023/Speckle.Converters.Civil3d2024.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - net48 - x64 - - - - - - - - - - - - - - - - diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs deleted file mode 100644 index cc3e1059d6..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Civil3dConverterModule.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Autodesk.AutoCAD.ApplicationServices; -using Autodesk.AutoCAD.DatabaseServices; -using Speckle.Autofac.DependencyInjection; -using Speckle.Converters.Autocad; -using Speckle.Converters.Civil3d; -using Speckle.Converters.Common; -using Speckle.Converters.Common.DependencyInjection; - -namespace Speckle.Converters.Civil3d2023.DependencyInjection; - -public class Civil3dConverterModule : ISpeckleModule -{ - public void Load(SpeckleContainerBuilder builder) - { - builder.AddConverterCommon(); - - // single stack per conversion - builder.AddScoped, AutocadConversionContextStack>(); - } -} diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj deleted file mode 100644 index c69c6ef974..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024.DependencyInjection/Speckle.Converters.Civil3d2024.DependencyInjection.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - net48 - x64 - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj deleted file mode 100644 index 6f96fbc340..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3d2024/Speckle.Converters.Civil3d2024.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - net48 - x64 - - - - - - - - - - - - - - - - diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/GlobalUsings.cs b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/GlobalUsings.cs deleted file mode 100644 index 9c48f198aa..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/GlobalUsings.cs +++ /dev/null @@ -1,6 +0,0 @@ -global using ADB = Autodesk.AutoCAD.DatabaseServices; -global using AG = Autodesk.AutoCAD.Geometry; -global using SOG = Objects.Geometry; -global using SOP = Objects.Primitive; -global using Document = Autodesk.AutoCAD.ApplicationServices.Document; -global using Application = Autodesk.AutoCAD.ApplicationServices.Core.Application; diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems deleted file mode 100644 index 2a86c942c3..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.projitems +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - 2ec4f6f1-8448-49db-bcb9-85f7f0b0a496 - - - Speckle.Converters.Civil3dShared - - - - - - - - \ No newline at end of file diff --git a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj b/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj deleted file mode 100644 index 230d87d7ee..0000000000 --- a/DUI3-DX/Converters/Civil3d/Speckle.Converters.Civil3dShared/Speckle.Converters.Civil3dShared.shproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - {9A147842-417A-4311-A87A-9002A344AAA4} - 14.0 - - - - - - - - \ No newline at end of file From 3eab4db860f60ddc81809ace0ce629fc77d51c2d Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 10:08:01 +0100 Subject: [PATCH 05/12] updates solution files --- All.sln | 42 ------------------------------------------ DUI3-DX.slnf | 2 -- 2 files changed, 44 deletions(-) diff --git a/All.sln b/All.sln index 75f6880aa6..361242a450 100644 --- a/All.sln +++ b/All.sln @@ -557,14 +557,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B1324D25 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Revit2023.Tests", "DUI3-DX\Converters\Revit\Speckle.Converters.Revit2023.Tests\Speckle.Converters.Revit2023.Tests.csproj", "{AEC26A0B-25F3-4544-A9D6-A427BFF79250}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Civil3d", "Civil3d", "{98220F0B-DF0F-4C22-8961-CC2989C1C646}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{B5A077DF-ED31-4784-8D0B-72BB0471058C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2024", "DUI3-DX\Converters\Civil3d\Speckle.Converters.Civil3d2024\Speckle.Converters.Civil3d2024.csproj", "{FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Civil3d2024.DependencyInjection", "DUI3-DX\Converters\Civil3d\Speckle.Converters.Civil3d2024.DependencyInjection\Speckle.Converters.Civil3d2024.DependencyInjection.csproj", "{087A3F83-F69A-4404-B855-02AFA600937C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Mac|Any CPU = Debug Mac|Any CPU @@ -2831,38 +2825,6 @@ Global {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.Build.0 = Release|Any CPU {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.ActiveCfg = Release|Any CPU {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.Build.0 = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|x64.ActiveCfg = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug Mac|x64.Build.0 = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|x64.ActiveCfg = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Debug|x64.Build.0 = Debug|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|Any CPU.Build.0 = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|x64.ActiveCfg = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release Mac|x64.Build.0 = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|Any CPU.Build.0 = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|x64.ActiveCfg = Release|Any CPU - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D}.Release|x64.Build.0 = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|x64.ActiveCfg = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug Mac|x64.Build.0 = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|x64.ActiveCfg = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Debug|x64.Build.0 = Debug|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|Any CPU.Build.0 = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|x64.ActiveCfg = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release Mac|x64.Build.0 = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release|Any CPU.Build.0 = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release|x64.ActiveCfg = Release|Any CPU - {087A3F83-F69A-4404-B855-02AFA600937C}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3075,10 +3037,7 @@ Global {70DEAA13-6DC8-44A0-B287-9E806A8054F1} = {890F3257-FCC2-4ED8-9180-22B3641B494C} {F06E4C37-4076-4272-9CA6-FB505E02CD31} = {BE521908-7944-46F3-98BF-B47D34509934} {AEC26A0B-25F3-4544-A9D6-A427BFF79250} = {D92751C8-1039-4005-90B2-913E55E0B8BD} - {98220F0B-DF0F-4C22-8961-CC2989C1C646} = {1FE3C60E-7865-40A5-9794-55ECB64F6489} {B5A077DF-ED31-4784-8D0B-72BB0471058C} = {743489BF-1941-43D5-8AF9-35C56D0DCC34} - {FCDBEBE8-0DE6-4898-B60F-DD8BEAC6754D} = {98220F0B-DF0F-4C22-8961-CC2989C1C646} - {087A3F83-F69A-4404-B855-02AFA600937C} = {98220F0B-DF0F-4C22-8961-CC2989C1C646} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -3212,7 +3171,6 @@ Global ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4aa033f-4f85-4990-afe9-86be00abe973}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4bfb155-7ba9-4e46-8240-9c825060c904}*SharedItemsImports = 5 ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{fc044d89-0ff3-441d-b35d-87454a693c16}*SharedItemsImports = 5 - DUI3-DX\Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{fcdbebe8-0de6-4898-b60f-dd8beac6754d}*SharedItemsImports = 5 ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{fdbc3082-1fad-4701-a121-802f591d2d35}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{ff1793e1-77f5-4a92-b3f2-6d8b104e479b}*SharedItemsImports = 5 EndGlobalSection diff --git a/DUI3-DX.slnf b/DUI3-DX.slnf index 8f2d1a29ac..07013daa88 100644 --- a/DUI3-DX.slnf +++ b/DUI3-DX.slnf @@ -20,8 +20,6 @@ "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.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", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.DependencyInjection\\Speckle.Converters.Revit2023.DependencyInjection.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.Tests\\Speckle.Converters.Revit2023.Tests.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023\\Speckle.Converters.Revit2023.csproj", From 67b35960b234f5d45d29d463ce1750eb22037ca5 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 10:34:14 +0100 Subject: [PATCH 06/12] updates all --- All.sln | 18 +- .../packages.lock.json | 516 ++++++++++++++++++ 2 files changed, 533 insertions(+), 1 deletion(-) create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json diff --git a/All.sln b/All.sln index 359df3d0ba..8ff00404be 100644 --- a/All.sln +++ b/All.sln @@ -559,7 +559,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Revit202 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{B5A077DF-ED31-4784-8D0B-72BB0471058C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converters.Common.Tests", "DUI3-DX\Sdk\Speckle.Converters.Common.Tests\Speckle.Converters.Common.Tests.csproj", "{95E23A97-E5EA-4506-A52C-D3DA9012DA02}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Common.Tests", "DUI3-DX\Sdk\Speckle.Converters.Common.Tests\Speckle.Converters.Common.Tests.csproj", "{95E23A97-E5EA-4506-A52C-D3DA9012DA02}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -2811,6 +2811,22 @@ Global {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|Any CPU.Build.0 = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.ActiveCfg = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|x64.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|x64.ActiveCfg = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|x64.Build.0 = Debug|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|x64.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|x64.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.Build.0 = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.ActiveCfg = Release|Any CPU + {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.Build.0 = Release|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Debug Mac|x64.ActiveCfg = Debug|Any CPU diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json new file mode 100644 index 0000000000..d8bfef786f --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -0,0 +1,516 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.8": { + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Direct", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.AutoCAD.API": { + "type": "Direct", + "requested": "[2024.0.0, )", + "resolved": "2024.0.0", + "contentHash": "pZZ5uI+NXhZaQnsqRkgp/rywqBAjDObDJ9XNFGJvemT5k2OthDpHzlK/mKxz8QDCYie7uImQ8dv3uWj2QUFDPw==" + }, + "Speckle.Civil3D.API": { + "type": "Direct", + "requested": "[2024.0.0, )", + "resolved": "2024.0.0", + "contentHash": "9Q7M1k0DotN8w7MkiScQezErRdnZ4dAkxBMcPNhHSWoth/lSaT6UPV1aYEdl90RhehJWG4l3O7U2e3OXvVSFdw==", + "dependencies": { + "Speckle.AutoCAD.API": "2024.0.0" + } + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.5, )", + "resolved": "0.9.5", + "contentHash": "oU/L7pN1R7q8KkbrpQ3WJnHirPHqn+9DEA7asOcUiggV5dzVg1A/VYs7GOSusD24njxXh03tE3a2oTLOjt3cVg==" + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "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" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "yg72rrYDapfsIUrul7aF6wwNnTJBOFvuA9VdDTQpPa8AlAriHbufeXYLBcodKjfUdkCnaiggX1U/nEP08Zb5GA==" + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "3aeMZ1N0lJoSyzqiP03hqemtb1BijhsJADdobn/4nsMJ8V1H+CrpuduUe4hlRdx+ikBQju1VGjMD1GJ3Sk05Eg==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "7.0.0", + "Microsoft.Extensions.DependencyInjection": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging.Abstractions": "7.0.0", + "Microsoft.Extensions.Options": "7.0.0", + "System.Diagnostics.DiagnosticSource": "7.0.0", + "System.ValueTuple": "4.5.0" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1823.32", + "contentHash": "ppRcWBUNggFIqyJp7PfgS4Oe8/7yli/mHcTNDOaqo3ZzJWnv9AOr0WE9ceEP5SPs1M7CQ3QvdGMR7KNz0v09EA==" + }, + "Polly": { + "type": "Transitive", + "resolved": "7.2.3", + "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + }, + "Polly.Contrib.WaitAndRetry": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" + }, + "Polly.Extensions.Http": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", + "dependencies": { + "Polly": "7.1.0" + } + }, + "Sentry": { + "type": "Transitive", + "resolved": "3.33.0", + "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", + "dependencies": { + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Json": "5.0.2" + } + }, + "Sentry.Serilog": { + "type": "Transitive", + "resolved": "3.33.0", + "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", + "dependencies": { + "Sentry": "3.33.0", + "Serilog": "2.7.1" + } + }, + "Serilog": { + "type": "Transitive", + "resolved": "2.12.0", + "contentHash": "xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg==" + }, + "Serilog.Enrichers.ClientInfo": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "mTc7PM+wC9Hr7LWSwqt5mmnlAr7RJs+eTb3PGPRhwdOackk95MkhUZognuxXEdlW19HAFNmEBTSBY5DfLwM8jQ==", + "dependencies": { + "Serilog": "2.4.0" + } + }, + "Serilog.Exceptions": { + "type": "Transitive", + "resolved": "8.4.0", + "contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "9faU0zNQqU7I6soVhLUMYaGNpgWv6cKlKb2S5AnS8gXxzW/em5Ladm/6FMrWTnX41cdbdGPOWNAo6adi4WaJ6A==", + "dependencies": { + "Microsoft.Extensions.Logging": "7.0.0", + "Serilog": "2.12.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.PeriodicBatching": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "NDWR7m3PalVlGEq3rzoktrXikjFMLmpwF0HI4sowo8YDdU+gqPlTHlDQiOGxHfB0sTfjPA9JjA7ctKG9zqjGkw==", + "dependencies": { + "Serilog": "2.0.0" + } + }, + "Serilog.Sinks.Seq": { + "type": "Transitive", + "resolved": "5.2.2", + "contentHash": "1Csmo5ua7NKUe0yXUx+zsRefjAniPWcXFhUXxXG8pwo0iMiw2gjn9SOkgYnnxbgWqmlGv236w0N/dHc2v5XwMg==", + "dependencies": { + "Serilog": "2.12.0", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Sinks.File": "5.0.0", + "Serilog.Sinks.PeriodicBatching": "3.1.0" + } + }, + "SerilogTimings": { + "type": "Transitive", + "resolved": "3.0.1", + "contentHash": "Zs28eTgszAMwpIrbBnWHBI50yuxL50p/dmAUWmy75+axdZYK/Sjm5/5m1N/CisR8acJUhTVcjPZrsB1P5iv0Uw==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "Speckle.Revit2023.Interfaces": { + "type": "Transitive", + "resolved": "0.1.1-preview.0.24", + "contentHash": "BSVpOUJc9g6ISrw8GxvtkglTlITpHEDYNOhxv1ZPbckBsI0yO36JiphhQV4q57ERqD9PpCozUJkVhlCaxWeS6A==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.dynamic_cdecl": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "System.DoubleNumerics": { + "type": "Transitive", + "resolved": "3.1.3", + "contentHash": "KRKEM/L3KBodjA9VOg3EifFVWUY6EOqaMB05UvPEDm7Zeby/kZW+4kdWUEPzW6xtkwf46p661L9NrbeeQhtLzw==", + "dependencies": { + "NETStandard.Library": "1.6.1" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Net.WebSockets.Client.Managed": { + "type": "Transitive", + "resolved": "1.0.22", + "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", + "dependencies": { + "System.Collections.Immutable": "5.0.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Tasks.Dataflow": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "+tyDCU3/B1lDdOOAJywHQoFwyXIUghIaP2BxG79uvhfTnO+D9qIgjVlL/JV2NTliYbMHpd6eKDmHp2VHpij7MA==" + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "speckle.autofac": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )", + "Speckle.Core": "[2.0.999-local, )" + } + }, + "speckle.connectors.dui": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )", + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Connectors.Utils": "[2.0.999-local, )", + "Speckle.Core": "[2.0.999-local, )", + "System.Threading.Tasks.Dataflow": "[6.0.0, )" + } + }, + "speckle.connectors.dui.webview": { + "type": "Project", + "dependencies": { + "Microsoft.Web.WebView2": "[1.0.1823.32, )", + "Speckle.Connectors.DUI": "[2.0.999-local, )" + } + }, + "speckle.connectors.utils": { + "type": "Project", + "dependencies": { + "Serilog.Extensions.Logging": "[7.0.0, )", + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Core": "[2.0.999-local, )" + } + }, + "speckle.converters.common": { + "type": "Project", + "dependencies": { + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Objects": "[2.0.999-local, )", + "Speckle.Revit2023.Interfaces": "[0.1.1-preview.0.24, )" + } + }, + "speckle.converters.common.dependencyinjection": { + "type": "Project", + "dependencies": { + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Converters.Common": "[2.0.999-local, )" + } + }, + "Speckle.Core": { + "type": "Project", + "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", + "dependencies": { + "Speckle.Core": "[2.0.999-local, )" + } + } + } + } +} \ No newline at end of file From 3914a223592664991dd753db20ee1029a78505a8 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 10:38:12 +0100 Subject: [PATCH 07/12] fixes civil3d connector merge --- All.sln | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/All.sln b/All.sln index 8ff00404be..b071706a5f 100644 --- a/All.sln +++ b/All.sln @@ -557,10 +557,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B1324D25 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Revit2023.Tests", "DUI3-DX\Converters\Revit\Speckle.Converters.Revit2023.Tests\Speckle.Converters.Revit2023.Tests.csproj", "{AEC26A0B-25F3-4544-A9D6-A427BFF79250}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{B5A077DF-ED31-4784-8D0B-72BB0471058C}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Common.Tests", "DUI3-DX\Sdk\Speckle.Converters.Common.Tests\Speckle.Converters.Common.Tests.csproj", "{95E23A97-E5EA-4506-A52C-D3DA9012DA02}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Mac|Any CPU = Debug Mac|Any CPU @@ -2811,22 +2811,6 @@ Global {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|Any CPU.Build.0 = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.ActiveCfg = Release|Any CPU {AEC26A0B-25F3-4544-A9D6-A427BFF79250}.Release|x64.Build.0 = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|x64.ActiveCfg = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug Mac|x64.Build.0 = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|x64.ActiveCfg = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Debug|x64.Build.0 = Debug|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|Any CPU.Build.0 = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|x64.ActiveCfg = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release Mac|x64.Build.0 = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|Any CPU.Build.0 = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.ActiveCfg = Release|Any CPU - {B5A077DF-ED31-4784-8D0B-72BB0471058C}.Release|x64.Build.0 = Release|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Debug Mac|x64.ActiveCfg = Debug|Any CPU @@ -2843,6 +2827,22 @@ Global {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Release|Any CPU.Build.0 = Release|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Release|x64.ActiveCfg = Release|Any CPU {95E23A97-E5EA-4506-A52C-D3DA9012DA02}.Release|x64.Build.0 = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug Mac|x64.Build.0 = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug|x64.ActiveCfg = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Debug|x64.Build.0 = Debug|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release Mac|x64.ActiveCfg = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release Mac|x64.Build.0 = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|Any CPU.Build.0 = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|x64.ActiveCfg = Release|Any CPU + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3056,6 +3056,7 @@ Global {F06E4C37-4076-4272-9CA6-FB505E02CD31} = {BE521908-7944-46F3-98BF-B47D34509934} {AEC26A0B-25F3-4544-A9D6-A427BFF79250} = {D92751C8-1039-4005-90B2-913E55E0B8BD} {95E23A97-E5EA-4506-A52C-D3DA9012DA02} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} + {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E} = {743489BF-1941-43D5-8AF9-35C56D0DCC34} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -3154,7 +3155,6 @@ Global Objects\Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{adfa7990-c2e7-49da-b726-bfe19e08ccca}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{b47492d9-2eda-4016-a930-7fa708c85c3d}*SharedItemsImports = 13 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{b4d6f6dc-0712-4f9f-a24f-6b76dae84b6f}*SharedItemsImports = 5 - DUI3-DX\Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{b5a077df-ed31-4784-8d0b-72bb0471058c}*SharedItemsImports = 5 ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{b7376ec8-5d3e-47d2-96a7-748552f14c39}*SharedItemsImports = 13 Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{b74cb8c1-187b-46a6-b20b-92b8c129f3ee}*SharedItemsImports = 13 ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{b81e0f77-1abd-4941-9d76-c0dc6b1b6b82}*SharedItemsImports = 5 @@ -3175,6 +3175,7 @@ Global ConnectorRhino\ConnectorRhino\ConnectorRhinoShared\ConnectorRhinoShared.projitems*{d648bb69-b992-4d34-906e-7a547374b86c}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{d9f443b5-c55b-4ad8-9c70-bc3d2be781be}*SharedItemsImports = 5 DUI3-DX\Connectors\Revit\Speckle.Connectors.RevitShared\Speckle.Connectors.RevitShared.projitems*{dc570fff-6fe5-47bd-8bc1-b471a6067786}*SharedItemsImports = 13 + DUI3-DX\Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{ddbba313-69a6-40de-ab3a-79ee5bf32a7e}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{debc2174-5e31-4b6e-8680-690d75e50e2d}*SharedItemsImports = 5 ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{dfdfdbb8-018b-4dcb-a012-54227abf53a7}*SharedItemsImports = 5 DUI3-DX\Converters\Revit\Speckle.Converters.RevitShared\Speckle.Converters.RevitShared.projitems*{e1c43415-3200-45f4-8bf9-a4dd7d7f2ed6}*SharedItemsImports = 13 From f3d823c7bc7805e8d310d5f15f7d85d73e367c55 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 12:31:33 +0100 Subject: [PATCH 08/12] adds autocad2024 converter for the civil3d 2024 connector --- All.sln | 39 ++ DUI3-DX.slnf | 2 + .../Civil3dConnectorModule.cs | 4 +- .../Plugin/AutocadCommand.cs | 4 +- .../Speckle.Connectors.Civil3d2024.csproj | 1 + .../packages.lock.json | 23 + .../AutocadConverterModule.cs | 19 + ...ers.Autocad2024.DependencyInjection.csproj | 17 + .../packages.lock.json | 417 ++++++++++++++++++ .../Speckle.Converters.Autocad2024.csproj | 18 + .../packages.lock.json | 395 +++++++++++++++++ 11 files changed, 935 insertions(+), 4 deletions(-) create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/AutocadConverterModule.cs create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/Speckle.Converters.Autocad2024.DependencyInjection.csproj create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/Speckle.Converters.Autocad2024.csproj create mode 100644 DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json diff --git a/All.sln b/All.sln index b071706a5f..9d104a8de5 100644 --- a/All.sln +++ b/All.sln @@ -561,6 +561,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Common.T EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "DUI3-DX\Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Converters.Autocad2024", "DUI3-DX\Converters\Autocad\Speckle.Converters.Autocad2024\Speckle.Converters.Autocad2024.csproj", "{C9C28F31-1367-438C-83B0-049C3B3A3E3B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Converters.Autocad2024.DependencyInjection", "DUI3-DX\Converters\Autocad\Speckle.Converters.Autocad2024.DependencyInjection\Speckle.Converters.Autocad2024.DependencyInjection.csproj", "{06082BAA-98E8-49B1-9D33-252B126A0561}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Mac|Any CPU = Debug Mac|Any CPU @@ -2843,6 +2847,38 @@ Global {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|Any CPU.Build.0 = Release|Any CPU {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|x64.ActiveCfg = Release|Any CPU {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E}.Release|x64.Build.0 = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug Mac|x64.Build.0 = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug|x64.ActiveCfg = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Debug|x64.Build.0 = Debug|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release Mac|x64.ActiveCfg = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release Mac|x64.Build.0 = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release|Any CPU.Build.0 = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release|x64.ActiveCfg = Release|Any CPU + {C9C28F31-1367-438C-83B0-049C3B3A3E3B}.Release|x64.Build.0 = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug Mac|x64.Build.0 = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug|x64.ActiveCfg = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Debug|x64.Build.0 = Debug|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release Mac|x64.ActiveCfg = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release Mac|x64.Build.0 = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release|Any CPU.Build.0 = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release|x64.ActiveCfg = Release|Any CPU + {06082BAA-98E8-49B1-9D33-252B126A0561}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -3057,6 +3093,8 @@ Global {AEC26A0B-25F3-4544-A9D6-A427BFF79250} = {D92751C8-1039-4005-90B2-913E55E0B8BD} {95E23A97-E5EA-4506-A52C-D3DA9012DA02} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA} {DDBBA313-69A6-40DE-AB3A-79EE5BF32A7E} = {743489BF-1941-43D5-8AF9-35C56D0DCC34} + {C9C28F31-1367-438C-83B0-049C3B3A3E3B} = {804E065F-914C-414A-AF84-009312C3CFF6} + {06082BAA-98E8-49B1-9D33-252B126A0561} = {804E065F-914C-414A-AF84-009312C3CFF6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -3164,6 +3202,7 @@ Global Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{c21a6553-b4ec-4ec3-b82a-c7a83cffb809}*SharedItemsImports = 5 ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{c2ba8b6b-72bd-4dab-865f-90c66083bdb2}*SharedItemsImports = 5 Objects\Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{c3232ef3-2000-44c6-a330-b94531c9cc83}*SharedItemsImports = 13 + DUI3-DX\Converters\Autocad\Speckle.Converters.AutocadShared\Speckle.Converters.AutocadShared.projitems*{c9c28f31-1367-438c-83b0-049c3b3a3e3b}*SharedItemsImports = 5 Objects\Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{cafd4eac-75a8-4fc8-94e5-91cadc39f5b3}*SharedItemsImports = 5 Objects\Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{cc790553-8088-41a9-83cd-b29f7141f408}*SharedItemsImports = 5 Objects\Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{cd334556-ba2b-4272-a1eb-628e8152204a}*SharedItemsImports = 5 diff --git a/DUI3-DX.slnf b/DUI3-DX.slnf index 9bf69111d9..4bfa3426df 100644 --- a/DUI3-DX.slnf +++ b/DUI3-DX.slnf @@ -19,6 +19,8 @@ "DUI3-DX\\Converters\\ArcGIS\\Speckle.Converters.ArcGIS3\\Speckle.Converters.ArcGIS3.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\\Revit\\Speckle.Converters.Revit2023.DependencyInjection\\Speckle.Converters.Revit2023.DependencyInjection.csproj", "DUI3-DX\\Converters\\Revit\\Speckle.Converters.Revit2023.Tests\\Speckle.Converters.Revit2023.Tests.csproj", diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs index 6615e3c425..5aff6071dc 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs @@ -5,7 +5,6 @@ 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; @@ -19,7 +18,7 @@ using Speckle.Connectors.Utils.Operations; using Speckle.Core.Models.GraphTraversal; -namespace Speckle.Connectors.Civil3d.DependencyInjection; +namespace Speckle.Connectors.Autocad.DependencyInjection; public class Civil3dConnectorModule : ISpeckleModule { @@ -44,7 +43,6 @@ public void Load(SpeckleContainerBuilder builder) builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); // Object Builders - builder.AddScoped(); builder.AddScoped, AutocadRootObjectBuilder>(); // Register bindings diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs index b03877ef95..af7d648aca 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs @@ -35,8 +35,10 @@ public void Command() var builder = SpeckleContainerBuilder.CreateInstance(); -#if CIVIL3D +#if CIVIL3D2024 AutocadSettings autocadSettings = new (HostApplications.Civil3D, HostAppVersion.v2024); +#elif AUTOCAD2023 + AutocadSettings autocadSettings = new(HostApplications.AutoCAD, HostAppVersion.v2023); #else AutocadSettings autocadSettings = new(HostApplications.AutoCAD, HostAppVersion.v2023); #endif diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj index 9b9ea87010..721a34ab7e 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/Speckle.Connectors.Civil3d2024.csproj @@ -10,6 +10,7 @@ + diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index d8bfef786f..972154724b 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -39,6 +39,14 @@ "resolved": "0.9.5", "contentHash": "oU/L7pN1R7q8KkbrpQ3WJnHirPHqn+9DEA7asOcUiggV5dzVg1A/VYs7GOSusD24njxXh03tE3a2oTLOjt3cVg==" }, + "Autofac": { + "type": "Transitive", + "resolved": "5.2.0", + "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0" + } + }, "GraphQL.Client": { "type": "Transitive", "resolved": "6.0.0", @@ -469,6 +477,21 @@ "Speckle.Core": "[2.0.999-local, )" } }, + "speckle.converters.autocad2024": { + "type": "Project", + "dependencies": { + "Speckle.AutoCAD.API": "[2024.0.0, )", + "Speckle.Converters.Common": "[2.0.999-local, )" + } + }, + "speckle.converters.autocad2024.dependencyinjection": { + "type": "Project", + "dependencies": { + "Autofac": "[5.2.0, )", + "Speckle.Converters.Autocad2024": "[2.0.999-local, )", + "Speckle.Converters.Common.DependencyInjection": "[2.0.999-local, )" + } + }, "speckle.converters.common": { "type": "Project", "dependencies": { diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/AutocadConverterModule.cs b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/AutocadConverterModule.cs new file mode 100644 index 0000000000..923bc241d1 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/AutocadConverterModule.cs @@ -0,0 +1,19 @@ +using Autodesk.AutoCAD.ApplicationServices; +using Autodesk.AutoCAD.DatabaseServices; +using Speckle.Autofac.DependencyInjection; +using Speckle.Converters.Autocad; +using Speckle.Converters.Common; +using Speckle.Converters.Common.DependencyInjection; + +namespace Speckle.Converters.Autocad20243.DependencyInjection; + +public class AutocadConverterModule : ISpeckleModule +{ + public void Load(SpeckleContainerBuilder builder) + { + builder.AddConverterCommon(); + + // single stack per conversion + builder.AddScoped, AutocadConversionContextStack>(); + } +} diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/Speckle.Converters.Autocad2024.DependencyInjection.csproj b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/Speckle.Converters.Autocad2024.DependencyInjection.csproj new file mode 100644 index 0000000000..9442c9cfe9 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/Speckle.Converters.Autocad2024.DependencyInjection.csproj @@ -0,0 +1,17 @@ + + + + net48 + x64 + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json new file mode 100644 index 0000000000..f16bd97d53 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json @@ -0,0 +1,417 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.8": { + "Autofac": { + "type": "Direct", + "requested": "[5.2.0, )", + "resolved": "5.2.0", + "contentHash": "V8dBH0dsv75uDzl7Sw+HkhKDPUw2eXnlMjcSVMH+tLo2s67MpTKGyDj1pDcpR+IF2u4YRs0s3/x7R88YJzIWvg==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "1.1.0" + } + }, + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.5, )", + "resolved": "0.9.5", + "contentHash": "oU/L7pN1R7q8KkbrpQ3WJnHirPHqn+9DEA7asOcUiggV5dzVg1A/VYs7GOSusD24njxXh03tE3a2oTLOjt3cVg==" + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "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" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "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.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Polly": { + "type": "Transitive", + "resolved": "7.2.3", + "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + }, + "Polly.Contrib.WaitAndRetry": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" + }, + "Polly.Extensions.Http": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", + "dependencies": { + "Polly": "7.1.0" + } + }, + "Sentry": { + "type": "Transitive", + "resolved": "3.33.0", + "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", + "dependencies": { + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Json": "5.0.2" + } + }, + "Sentry.Serilog": { + "type": "Transitive", + "resolved": "3.33.0", + "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", + "dependencies": { + "Sentry": "3.33.0", + "Serilog": "2.7.1" + } + }, + "Serilog": { + "type": "Transitive", + "resolved": "2.12.0", + "contentHash": "xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg==" + }, + "Serilog.Enrichers.ClientInfo": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "mTc7PM+wC9Hr7LWSwqt5mmnlAr7RJs+eTb3PGPRhwdOackk95MkhUZognuxXEdlW19HAFNmEBTSBY5DfLwM8jQ==", + "dependencies": { + "Serilog": "2.4.0" + } + }, + "Serilog.Exceptions": { + "type": "Transitive", + "resolved": "8.4.0", + "contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.PeriodicBatching": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "NDWR7m3PalVlGEq3rzoktrXikjFMLmpwF0HI4sowo8YDdU+gqPlTHlDQiOGxHfB0sTfjPA9JjA7ctKG9zqjGkw==", + "dependencies": { + "Serilog": "2.0.0" + } + }, + "Serilog.Sinks.Seq": { + "type": "Transitive", + "resolved": "5.2.2", + "contentHash": "1Csmo5ua7NKUe0yXUx+zsRefjAniPWcXFhUXxXG8pwo0iMiw2gjn9SOkgYnnxbgWqmlGv236w0N/dHc2v5XwMg==", + "dependencies": { + "Serilog": "2.12.0", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Sinks.File": "5.0.0", + "Serilog.Sinks.PeriodicBatching": "3.1.0" + } + }, + "SerilogTimings": { + "type": "Transitive", + "resolved": "3.0.1", + "contentHash": "Zs28eTgszAMwpIrbBnWHBI50yuxL50p/dmAUWmy75+axdZYK/Sjm5/5m1N/CisR8acJUhTVcjPZrsB1P5iv0Uw==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Speckle.AutoCAD.API": { + "type": "Transitive", + "resolved": "2024.0.0", + "contentHash": "pZZ5uI+NXhZaQnsqRkgp/rywqBAjDObDJ9XNFGJvemT5k2OthDpHzlK/mKxz8QDCYie7uImQ8dv3uWj2QUFDPw==" + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "Speckle.Revit2023.Interfaces": { + "type": "Transitive", + "resolved": "0.1.1-preview.0.24", + "contentHash": "BSVpOUJc9g6ISrw8GxvtkglTlITpHEDYNOhxv1ZPbckBsI0yO36JiphhQV4q57ERqD9PpCozUJkVhlCaxWeS6A==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.dynamic_cdecl": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, + "System.DoubleNumerics": { + "type": "Transitive", + "resolved": "3.1.3", + "contentHash": "KRKEM/L3KBodjA9VOg3EifFVWUY6EOqaMB05UvPEDm7Zeby/kZW+4kdWUEPzW6xtkwf46p661L9NrbeeQhtLzw==", + "dependencies": { + "NETStandard.Library": "1.6.1" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Net.WebSockets.Client.Managed": { + "type": "Transitive", + "resolved": "1.0.22", + "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", + "dependencies": { + "System.Collections.Immutable": "5.0.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "speckle.autofac": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )", + "Speckle.Core": "[2.0.999-local, )" + } + }, + "speckle.converters.autocad2024": { + "type": "Project", + "dependencies": { + "Speckle.AutoCAD.API": "[2024.0.0, )", + "Speckle.Converters.Common": "[2.0.999-local, )" + } + }, + "speckle.converters.common": { + "type": "Project", + "dependencies": { + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Objects": "[2.0.999-local, )", + "Speckle.Revit2023.Interfaces": "[0.1.1-preview.0.24, )" + } + }, + "speckle.converters.common.dependencyinjection": { + "type": "Project", + "dependencies": { + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Converters.Common": "[2.0.999-local, )" + } + }, + "Speckle.Core": { + "type": "Project", + "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", + "dependencies": { + "Speckle.Core": "[2.0.999-local, )" + } + } + } + } +} \ No newline at end of file diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/Speckle.Converters.Autocad2024.csproj b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/Speckle.Converters.Autocad2024.csproj new file mode 100644 index 0000000000..f23b34ad29 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/Speckle.Converters.Autocad2024.csproj @@ -0,0 +1,18 @@ + + + + net48 + x64 + + + + + + + + + + + + + diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json new file mode 100644 index 0000000000..b4a7488317 --- /dev/null +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -0,0 +1,395 @@ +{ + "version": 1, + "dependencies": { + ".NETFramework,Version=v4.8": { + "PolySharp": { + "type": "Direct", + "requested": "[1.14.1, )", + "resolved": "1.14.1", + "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ==" + }, + "Speckle.AutoCAD.API": { + "type": "Direct", + "requested": "[2024.0.0, )", + "resolved": "2024.0.0", + "contentHash": "pZZ5uI+NXhZaQnsqRkgp/rywqBAjDObDJ9XNFGJvemT5k2OthDpHzlK/mKxz8QDCYie7uImQ8dv3uWj2QUFDPw==" + }, + "Speckle.InterfaceGenerator": { + "type": "Direct", + "requested": "[0.9.5, )", + "resolved": "0.9.5", + "contentHash": "oU/L7pN1R7q8KkbrpQ3WJnHirPHqn+9DEA7asOcUiggV5dzVg1A/VYs7GOSusD24njxXh03tE3a2oTLOjt3cVg==" + }, + "GraphQL.Client": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "8yPNBbuVBpTptivyAlak4GZvbwbUcjeQTL4vN1HKHRuOykZ4r7l5fcLS6vpyPyLn0x8FsL31xbOIKyxbmR9rbA==", + "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" + } + }, + "GraphQL.Client.Abstractions": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "h7uzWFORHZ+CCjwr/ThAyXMr0DPpzEANDa4Uo54wqCQ+j7qUKwqYTgOrb1W40sqbvNaZm9v/X7It31SUw0maHA==", + "dependencies": { + "GraphQL.Primitives": "6.0.0" + } + }, + "GraphQL.Client.Abstractions.Websocket": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "Nr9bPf8gIOvLuXpqEpqr9z9jslYFJOvd0feHth3/kPqeR3uMbjF5pjiwh4jxyMcxHdr8Pb6QiXkV3hsSyt0v7A==", + "dependencies": { + "GraphQL.Client.Abstractions": "6.0.0" + } + }, + "GraphQL.Primitives": { + "type": "Transitive", + "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.CSharp": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" + }, + "Microsoft.Data.Sqlite": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "KGxbPeWsQMnmQy43DSBxAFtHz3l2JX8EWBSGUCvT3CuZ8KsuzbkqMIJMDOxWtG8eZSoCDI04aiVQjWuuV8HmSw==", + "dependencies": { + "Microsoft.Data.Sqlite.Core": "7.0.5", + "SQLitePCLRaw.bundle_e_sqlite3": "2.1.4" + } + }, + "Microsoft.Data.Sqlite.Core": { + "type": "Transitive", + "resolved": "7.0.5", + "contentHash": "FTerRmQPqHrCrnoUzhBu+E+1DNGwyrAMLqHkAqOOOu5pGfyMOj8qQUBxI/gDtWtG11p49UxSfWmBzRNlwZqfUg==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5" + } + }, + "Polly": { + "type": "Transitive", + "resolved": "7.2.3", + "contentHash": "DeCY0OFbNdNxsjntr1gTXHJ5pKUwYzp04Er2LLeN3g6pWhffsGuKVfMBLe1lw7x76HrPkLxKEFxBlpRxS2nDEQ==" + }, + "Polly.Contrib.WaitAndRetry": { + "type": "Transitive", + "resolved": "1.1.1", + "contentHash": "1MUQLiSo4KDkQe6nzQRhIU05lm9jlexX5BVsbuw0SL82ynZ+GzAHQxJVDPVBboxV37Po3SG077aX8DuSy8TkaA==" + }, + "Polly.Extensions.Http": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "drrG+hB3pYFY7w1c3BD+lSGYvH2oIclH8GRSehgfyP5kjnFnHKQuuBhuHLv+PWyFuaTDyk/vfRpnxOzd11+J8g==", + "dependencies": { + "Polly": "7.1.0" + } + }, + "Sentry": { + "type": "Transitive", + "resolved": "3.33.0", + "contentHash": "8vbD2o6IR2wrRrkSiRbnodWGWUOqIlwYtzpjvPNOb5raJdOf+zxMwfS8f6nx9bmrTTfDj7KrCB8C/5OuicAc8A==", + "dependencies": { + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", + "System.Text.Json": "5.0.2" + } + }, + "Sentry.Serilog": { + "type": "Transitive", + "resolved": "3.33.0", + "contentHash": "V8BU7QGWg2qLYfNPqtuTBhC1opysny5l+Ifp6J6PhOeAxU0FssR7nYfbJVetrnLIoh2rd3DlJ6hHYYQosQYcUQ==", + "dependencies": { + "Sentry": "3.33.0", + "Serilog": "2.7.1" + } + }, + "Serilog": { + "type": "Transitive", + "resolved": "2.12.0", + "contentHash": "xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg==" + }, + "Serilog.Enrichers.ClientInfo": { + "type": "Transitive", + "resolved": "1.3.0", + "contentHash": "mTc7PM+wC9Hr7LWSwqt5mmnlAr7RJs+eTb3PGPRhwdOackk95MkhUZognuxXEdlW19HAFNmEBTSBY5DfLwM8jQ==", + "dependencies": { + "Serilog": "2.4.0" + } + }, + "Serilog.Exceptions": { + "type": "Transitive", + "resolved": "8.4.0", + "contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "4.1.0", + "contentHash": "K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.PeriodicBatching": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "NDWR7m3PalVlGEq3rzoktrXikjFMLmpwF0HI4sowo8YDdU+gqPlTHlDQiOGxHfB0sTfjPA9JjA7ctKG9zqjGkw==", + "dependencies": { + "Serilog": "2.0.0" + } + }, + "Serilog.Sinks.Seq": { + "type": "Transitive", + "resolved": "5.2.2", + "contentHash": "1Csmo5ua7NKUe0yXUx+zsRefjAniPWcXFhUXxXG8pwo0iMiw2gjn9SOkgYnnxbgWqmlGv236w0N/dHc2v5XwMg==", + "dependencies": { + "Serilog": "2.12.0", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Sinks.File": "5.0.0", + "Serilog.Sinks.PeriodicBatching": "3.1.0" + } + }, + "SerilogTimings": { + "type": "Transitive", + "resolved": "3.0.1", + "contentHash": "Zs28eTgszAMwpIrbBnWHBI50yuxL50p/dmAUWmy75+axdZYK/Sjm5/5m1N/CisR8acJUhTVcjPZrsB1P5iv0Uw==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Speckle.Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.2", + "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" + }, + "Speckle.Revit2023.Interfaces": { + "type": "Transitive", + "resolved": "0.1.1-preview.0.24", + "contentHash": "BSVpOUJc9g6ISrw8GxvtkglTlITpHEDYNOhxv1ZPbckBsI0yO36JiphhQV4q57ERqD9PpCozUJkVhlCaxWeS6A==" + }, + "SQLitePCLRaw.bundle_e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "EWI1olKDjFEBMJu0+3wuxwziIAdWDVMYLhuZ3Qs84rrz+DHwD00RzWPZCa+bLnHCf3oJwuFZIRsHT5p236QXww==", + "dependencies": { + "SQLitePCLRaw.lib.e_sqlite3": "2.1.4", + "SQLitePCLRaw.provider.dynamic_cdecl": "2.1.4" + } + }, + "SQLitePCLRaw.core": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "inBjvSHo9UDKneGNzfUfDjK08JzlcIhn1+SP5Y3m6cgXpCxXKCJDy6Mka7LpgSV+UZmKSnC8rTwB0SQ0xKu5pA==", + "dependencies": { + "System.Memory": "4.5.3" + } + }, + "SQLitePCLRaw.lib.e_sqlite3": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "2C9Q9eX7CPLveJA0rIhf9RXAvu+7nWZu1A2MdG6SD/NOu26TakGgL1nsbc0JAspGijFOo3HoN79xrx8a368fBg==" + }, + "SQLitePCLRaw.provider.dynamic_cdecl": { + "type": "Transitive", + "resolved": "2.1.4", + "contentHash": "ZsaKKhgYF9B1fvcnOGKl3EycNAwd9CRWX7v0rEfuPWhQQ5Jjpvf2VEHahiLIGHio3hxi3EIKFJw9KvyowWOUAw==", + "dependencies": { + "SQLitePCLRaw.core": "2.1.4" + } + }, + "System.Buffers": { + "type": "Transitive", + "resolved": "4.5.1", + "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==", + "dependencies": { + "System.Memory": "4.5.4" + } + }, + "System.DoubleNumerics": { + "type": "Transitive", + "resolved": "3.1.3", + "contentHash": "KRKEM/L3KBodjA9VOg3EifFVWUY6EOqaMB05UvPEDm7Zeby/kZW+4kdWUEPzW6xtkwf46p661L9NrbeeQhtLzw==", + "dependencies": { + "NETStandard.Library": "1.6.1" + } + }, + "System.Memory": { + "type": "Transitive", + "resolved": "4.5.5", + "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.Net.WebSockets.Client.Managed": { + "type": "Transitive", + "resolved": "1.0.22", + "contentHash": "WqEOxPlXjuZrIjUtXNE9NxEfU/n5E35iV2PtoZdJSUC4tlrqwHnTee+wvMIM4OUaJWmwrymeqcgYrE0IkGAgLA==", + "dependencies": { + "System.Buffers": "4.4.0", + "System.Numerics.Vectors": "4.4.0" + } + }, + "System.Numerics.Vectors": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==" + }, + "System.Reactive": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "erBZjkQHWL9jpasCE/0qKAryzVBJFxGHVBAvgRN1bzM0q2s1S4oYREEEL0Vb+1kA/6BKb5FjUZMp5VXmy+gzkQ==", + "dependencies": { + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==", + "dependencies": { + "System.Collections.Immutable": "5.0.0" + } + }, + "System.Runtime.CompilerServices.Unsafe": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA==" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "cbz4YJMqRDR7oLeMRbdYv7mYzc++17lNhScCX0goO2XpGWdvAt60CGN+FHdePUEHCe/Jy9jUlvNAiNdM+7jsOw==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4" + } + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "5.0.2", + "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "5.0.0", + "System.Buffers": "4.5.1", + "System.Memory": "4.5.4", + "System.Numerics.Vectors": "4.5.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encodings.Web": "5.0.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, + "System.Threading.Tasks.Extensions": { + "type": "Transitive", + "resolved": "4.5.4", + "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "4.5.3" + } + }, + "System.ValueTuple": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==" + }, + "speckle.autofac": { + "type": "Project", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )", + "Speckle.Core": "[2.0.999-local, )" + } + }, + "speckle.converters.common": { + "type": "Project", + "dependencies": { + "Speckle.Autofac": "[2.0.999-local, )", + "Speckle.Objects": "[2.0.999-local, )", + "Speckle.Revit2023.Interfaces": "[0.1.1-preview.0.24, )" + } + }, + "Speckle.Core": { + "type": "Project", + "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", + "dependencies": { + "Speckle.Core": "[2.0.999-local, )" + } + } + } + } +} \ No newline at end of file From ade2092b25d5e2cee8a16600ab7c54f0cbec14ba Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 12:42:24 +0100 Subject: [PATCH 09/12] removes changes to autocad settings --- .../Bindings/AutocadBasicConnectorBinding.cs | 2 +- .../Bindings/AutocadSendBinding.cs | 1 - .../Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs | 2 +- .../Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs | 2 +- .../Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs index e5400be4f3..a87ea7f70d 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs @@ -1,6 +1,6 @@ using Autodesk.AutoCAD.DatabaseServices; using Sentry.Reflection; -using Speckle.Connectors.Autocad.DependencyInjection; +using Speckle.Connectors.Autocad.HostApp; using Speckle.Connectors.DUI.Bindings; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs index 6a0504577e..32cc40fbe7 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs @@ -1,7 +1,6 @@ using Autodesk.AutoCAD.DatabaseServices; using Speckle.Connectors.Autocad.HostApp; using Speckle.Connectors.Autocad.HostApp.Extensions; -using Speckle.Connectors.Autocad.DependencyInjection; using Speckle.Connectors.DUI.Bindings; using Speckle.Connectors.DUI.Bridge; using Speckle.Connectors.DUI.Models; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs index e492d2865f..f73ebf2906 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs @@ -1,7 +1,7 @@ using System.IO; using Speckle.Core.Kits; // POC: Must go https://spockle.atlassian.net/browse/CNX-9325 -namespace Speckle.Connectors.Autocad.DependencyInjection; +namespace Speckle.Connectors.Autocad.HostApp; public class AutocadSettings { diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs index af7d648aca..8f81590753 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs @@ -3,7 +3,7 @@ using Autodesk.AutoCAD.Runtime; using Autodesk.AutoCAD.Windows; using Speckle.Autofac.DependencyInjection; -using Speckle.Connectors.Autocad.DependencyInjection; +using Speckle.Connectors.Autocad.HostApp; using Speckle.Core.Kits; using Speckle.Connectors.Autocad.Interfaces; using Speckle.Connectors.DUI.WebView; diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs index 2715074f8d..5307a7b531 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadPlugin.cs @@ -1,6 +1,5 @@ using Speckle.Connectors.Autocad.HostApp; using Speckle.Connectors.Autocad.Interfaces; -using Speckle.Connectors.Autocad.DependencyInjection; using Speckle.Connectors.DUI.WebView; namespace Speckle.Connectors.Autocad.Plugin; From 3bb1584ad7355b5a5e516b84c60a6b50cc2f4c16 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 12:48:09 +0100 Subject: [PATCH 10/12] minor refactors --- .../HostApp/AutocadSettings.cs | 9 ++++----- .../Plugin/AutocadCommand.cs | 1 - .../Speckle.Connectors.AutocadShared.projitems | 3 +++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs index f73ebf2906..4d90418b83 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadSettings.cs @@ -9,12 +9,11 @@ public AutocadSettings(HostApplication hostAppInfo, HostAppVersion hostAppVersio { HostAppInfo = hostAppInfo; HostAppVersion = hostAppVersion; - var dir = new DirectoryInfo(typeof(AutocadSettings).Assembly.Location); - Modules = new[] { dir.Parent.FullName }; + Modules = new[] { new DirectoryInfo(typeof(AutocadSettings).Assembly.Location).Parent.FullName }; } - public HostApplication HostAppInfo { get; set; } - public HostAppVersion HostAppVersion { get; set; } + public HostApplication HostAppInfo { get; private set; } + public HostAppVersion HostAppVersion { get; private set; } - public IReadOnlyList Modules { get; set; } + public IReadOnlyList Modules { get; private set; } } diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs index 8f81590753..2a08e16bc9 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs @@ -42,7 +42,6 @@ public void Command() #else AutocadSettings autocadSettings = new(HostApplications.AutoCAD, HostAppVersion.v2023); #endif - var executingAssembly = Assembly.GetExecutingAssembly(); Container = builder .LoadAutofacModules(Assembly.GetExecutingAssembly(), autocadSettings.Modules) .AddSingleton(autocadSettings) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems index 969934cde7..f7b3190f39 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems @@ -36,4 +36,7 @@ + + + \ No newline at end of file From 9f94f9df1bece33aac9917840600b0d6b813d617 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Mon, 24 Jun 2024 13:06:39 +0100 Subject: [PATCH 11/12] Update Applications.cs --- Core/Core/Kits/Applications.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Core/Core/Kits/Applications.cs b/Core/Core/Kits/Applications.cs index 6988187cff..9eb9962fcc 100644 --- a/Core/Core/Kits/Applications.cs +++ b/Core/Core/Kits/Applications.cs @@ -63,6 +63,7 @@ public static class HostApplications Dynamo = new("Dynamo", "dynamo"), Unity = new("Unity", "unity"), GSA = new("GSA", "gsa"), + Civil = new("Civil 3D", "civil3d"), Civil3D = new("Civil 3D", "civil3d"), AutoCAD = new("AutoCAD", "autocad"), MicroStation = new("MicroStation", "microstation"), @@ -119,6 +120,11 @@ public static HostApplication GetHostAppFromString(string? appname) return AutoCAD; } + if (appname.Contains("civil")) + { + return Civil; + } + if (appname.Contains("civil3d")) { return Civil3D; From 1fe7e02adeca71246a3e798a41f4bbbe312df682 Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 25 Jun 2024 12:08:00 +0100 Subject: [PATCH 12/12] adds shared connector module --- Core/Core/Kits/Applications.cs | 8 ++-- .../AutocadConnectorModule.cs | 27 +------------ .../Civil3dConnectorModule.cs | 29 +------------- .../SharedConnectorModule.cs | 40 +++++++++++++++++++ ...Speckle.Connectors.AutocadShared.projitems | 1 + .../packages.lock.json | 8 +--- .../packages.lock.json | 8 +--- .../packages.lock.json | 8 +--- 8 files changed, 50 insertions(+), 79 deletions(-) create mode 100644 DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedConnectorModule.cs diff --git a/Core/Core/Kits/Applications.cs b/Core/Core/Kits/Applications.cs index 9eb9962fcc..d80b63479e 100644 --- a/Core/Core/Kits/Applications.cs +++ b/Core/Core/Kits/Applications.cs @@ -120,14 +120,14 @@ public static HostApplication GetHostAppFromString(string? appname) return AutoCAD; } - if (appname.Contains("civil")) + if (appname.Contains("civil3d")) { - return Civil; + return Civil3D; } - if (appname.Contains("civil3d")) + if (appname.Contains("civil")) { - return Civil3D; + return Civil; } if (appname.Contains("rhino")) diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs index 00dca68eee..731098b249 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs @@ -1,19 +1,11 @@ #if AUTOCAD -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.Operations; @@ -25,19 +17,7 @@ public class AutocadConnectorModule : ISpeckleModule { public void Load(SpeckleContainerBuilder builder) { - builder.AddAutofac(); - builder.AddConnectorUtils(); - builder.AddDUI(); - builder.AddDUIView(); - - // Register other connector specific types - builder.AddSingleton(); - builder.AddTransient(); - builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); + SharedConnectorModule.LoadShared(builder); // Operations builder.AddScoped>(); @@ -48,12 +28,7 @@ public void Load(SpeckleContainerBuilder builder) builder.AddScoped, AutocadRootObjectBuilder>(); // Register bindings - builder.AddSingleton(); builder.AddSingleton("connectorName", "Autocad"); // POC: Easier like this for now, should be cleaned up later - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); builder.AddSingleton(); builder.AddSingleton(); diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs index 5aff6071dc..e6889843c5 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/Civil3dConnectorModule.cs @@ -1,22 +1,13 @@ #if CIVIL3D -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.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.Operations; -using Speckle.Core.Models.GraphTraversal; namespace Speckle.Connectors.Autocad.DependencyInjection; @@ -24,34 +15,16 @@ public class Civil3dConnectorModule : ISpeckleModule { public void Load(SpeckleContainerBuilder builder) { - builder.AddAutofac(); - builder.AddConnectorUtils(); - builder.AddDUI(); - builder.AddDUIView(); - - // Register other connector specific types - builder.AddSingleton(); - builder.AddTransient(); - builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); + SharedConnectorModule.LoadShared(builder); // Operations builder.AddScoped>(); - builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); // Object Builders builder.AddScoped, AutocadRootObjectBuilder>(); // Register bindings - builder.AddSingleton(); builder.AddSingleton("connectorName", "Civil3d"); // POC: Easier like this for now, should be cleaned up later - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); - builder.AddSingleton(); builder.AddSingleton(); // register send filters diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedConnectorModule.cs b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedConnectorModule.cs new file mode 100644 index 0000000000..48b71d723e --- /dev/null +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedConnectorModule.cs @@ -0,0 +1,40 @@ +using Speckle.Autofac; +using Speckle.Autofac.DependencyInjection; +using Speckle.Connectors.Autocad.Bindings; +using Speckle.Connectors.Autocad.HostApp; +using Speckle.Connectors.Autocad.Interfaces; +using Speckle.Connectors.Autocad.Plugin; +using Speckle.Connectors.DUI; +using Speckle.Connectors.DUI.Bindings; +using Speckle.Connectors.DUI.Models; +using Speckle.Connectors.DUI.WebView; +using Speckle.Connectors.Utils; + +namespace Speckle.Connectors.Autocad.DependencyInjection; + +public static class SharedConnectorModule +{ + public static void LoadShared(SpeckleContainerBuilder builder) + { + builder.AddAutofac(); + builder.AddConnectorUtils(); + builder.AddDUI(); + builder.AddDUIView(); + + // Register other connector specific types + builder.AddSingleton(); + builder.AddTransient(); + builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + + // Register bindings + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + builder.AddSingleton(); + } +} diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems index f7b3190f39..dd0f8afa29 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems @@ -13,6 +13,7 @@ + diff --git a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json index 972154724b..442462d552 100644 --- a/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json +++ b/DUI3-DX/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json @@ -288,11 +288,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "Speckle.Revit2023.Interfaces": { - "type": "Transitive", - "resolved": "0.1.1-preview.0.24", - "contentHash": "BSVpOUJc9g6ISrw8GxvtkglTlITpHEDYNOhxv1ZPbckBsI0yO36JiphhQV4q57ERqD9PpCozUJkVhlCaxWeS6A==" - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -496,8 +491,7 @@ "type": "Project", "dependencies": { "Speckle.Autofac": "[2.0.999-local, )", - "Speckle.Objects": "[2.0.999-local, )", - "Speckle.Revit2023.Interfaces": "[0.1.1-preview.0.24, )" + "Speckle.Objects": "[2.0.999-local, )" } }, "speckle.converters.common.dependencyinjection": { diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json index f16bd97d53..90415ed373 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024.DependencyInjection/packages.lock.json @@ -213,11 +213,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "Speckle.Revit2023.Interfaces": { - "type": "Transitive", - "resolved": "0.1.1-preview.0.24", - "contentHash": "BSVpOUJc9g6ISrw8GxvtkglTlITpHEDYNOhxv1ZPbckBsI0yO36JiphhQV4q57ERqD9PpCozUJkVhlCaxWeS6A==" - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -374,8 +369,7 @@ "type": "Project", "dependencies": { "Speckle.Autofac": "[2.0.999-local, )", - "Speckle.Objects": "[2.0.999-local, )", - "Speckle.Revit2023.Interfaces": "[0.1.1-preview.0.24, )" + "Speckle.Objects": "[2.0.999-local, )" } }, "speckle.converters.common.dependencyinjection": { diff --git a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json index b4a7488317..7e24ff76cb 100644 --- a/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json +++ b/DUI3-DX/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json @@ -205,11 +205,6 @@ "resolved": "13.0.2", "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA==" }, - "Speckle.Revit2023.Interfaces": { - "type": "Transitive", - "resolved": "0.1.1-preview.0.24", - "contentHash": "BSVpOUJc9g6ISrw8GxvtkglTlITpHEDYNOhxv1ZPbckBsI0yO36JiphhQV4q57ERqD9PpCozUJkVhlCaxWeS6A==" - }, "SQLitePCLRaw.bundle_e_sqlite3": { "type": "Transitive", "resolved": "2.1.4", @@ -359,8 +354,7 @@ "type": "Project", "dependencies": { "Speckle.Autofac": "[2.0.999-local, )", - "Speckle.Objects": "[2.0.999-local, )", - "Speckle.Revit2023.Interfaces": "[0.1.1-preview.0.24, )" + "Speckle.Objects": "[2.0.999-local, )" } }, "Speckle.Core": {