From 3ed07ca3b396bb65c7ab5a4a53bc38dd2eaa2faf Mon Sep 17 00:00:00 2001 From: Claire Kuang Date: Tue, 14 May 2024 05:38:59 -0700 Subject: [PATCH] feat(autocad): CNX-9237 CNX-9238 Add support for Autocad and Civil3D 2025 (#3413) * adds autocad 2025 support * updates civil usings and constants * adds civil3d 2025 solutions * removes implicit usings * fix: Add civil 2025 to Objects.sln * removes implicit using from autocad converter --------- Co-authored-by: Alan Rynne --- All.sln | 88 ++++++++++++++++++- .../ConnectorAutocad2025.csproj | 47 ++++++++++ .../ConnectorAutocadCivil.sln | 16 ++++ .../ConnectorAutocadCivil.slnf | 4 + .../ConnectorBindingsAutocadCivil.Receive.cs | 2 +- .../UI/ConnectorBindingsAutocadCivil.Send.cs | 2 +- .../ConnectorAutocadCivil/Utils.cs | 14 ++- .../ConnectorCivil2021.csproj | 2 +- .../ConnectorCivil2022.csproj | 2 +- .../ConnectorCivil2023.csproj | 2 +- .../ConnectorCivil2024.csproj | 2 +- .../ConnectorCivil2025.csproj | 52 +++++++++++ .../ConverterAutocad2025.csproj | 28 ++++++ .../Converter.AutocadCivil.Utils.cs | 4 +- .../ConverterAutocadCivil.Civil.cs | 4 +- .../ConverterAutocadCivil.cs | 14 +-- .../ConverterCivil2021.csproj | 2 +- .../ConverterCivil2022.csproj | 2 +- .../ConverterCivil2023.csproj | 2 +- .../ConverterCivil2024.csproj | 2 +- .../ConverterCivil2025.csproj | 30 +++++++ Objects/Objects.sln | 28 +++++- 22 files changed, 322 insertions(+), 27 deletions(-) create mode 100644 ConnectorAutocadCivil/ConnectorAutocad2025/ConnectorAutocad2025.csproj create mode 100644 ConnectorAutocadCivil/ConnectorCivil2025/ConnectorCivil2025.csproj create mode 100644 Objects/Converters/ConverterAutocadCivil/ConverterAutocad2025/ConverterAutocad2025.csproj create mode 100644 Objects/Converters/ConverterAutocadCivil/ConverterCivil2025/ConverterCivil2025.csproj diff --git a/All.sln b/All.sln index 0e457a6b56..df383c2f22 100644 --- a/All.sln +++ b/All.sln @@ -434,7 +434,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5009BB59 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Core.Tests.Unit", "Core\Tests\Speckle.Core.Tests.Unit\Speckle.Core.Tests.Unit.csproj", "{2A88A9EA-EB11-49FD-BE95-DA6FC8F6CB3D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Core.Tests.Performance", "Core\Tests\Speckle.Core.Tests.Performance\Speckle.Core.Tests.Performance.csproj", "{1DE6EF69-0782-4FD7-A2A7-9F697426882D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Core.Tests.Performance", "Core\Tests\Speckle.Core.Tests.Performance\Speckle.Core.Tests.Performance.csproj", "{1DE6EF69-0782-4FD7-A2A7-9F697426882D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Core.Tests.Integration", "Core\Tests\Speckle.Core.Tests.Integration\Speckle.Core.Tests.Integration.csproj", "{FB2DEE1D-788B-45B6-B80C-D8F7C8390C37}" EndProject @@ -449,9 +449,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8A909E95 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects.Tests.Unit", "Objects\Tests\Objects.Tests.Unit\Objects.Tests.Unit.csproj", "{9E74F0E6-94B4-46BD-B1CA-DD874B459399}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterNavisworks2025", "Objects\Converters\ConverterNavisworks\ConverterNavisworks2025\ConverterNavisworks2025.csproj", "{0B6B5C52-54EC-461F-8729-6244ACA63646}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterNavisworks2025", "Objects\Converters\ConverterNavisworks\ConverterNavisworks2025\ConverterNavisworks2025.csproj", "{0B6B5C52-54EC-461F-8729-6244ACA63646}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorNavisworks2025", "ConnectorNavisworks\ConnectorNavisworks2025\ConnectorNavisworks2025.csproj", "{2568500E-F1BC-440E-9150-DD4820B3FAD6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorNavisworks2025", "ConnectorNavisworks\ConnectorNavisworks2025\ConnectorNavisworks2025.csproj", "{2568500E-F1BC-440E-9150-DD4820B3FAD6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DllConflictManagement", "ConnectorCore\DllConflictManagement\DllConflictManagement.csproj", "{0D23858F-4CC1-4DCA-9207-5EDB8B6CE9DD}" EndProject @@ -461,6 +461,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorRevit2025", "Conne EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRevit2025", "Objects\Converters\ConverterRevit\ConverterRevit2025\ConverterRevit2025.csproj", "{C0295BF9-9A40-4FCD-BE39-E943985CA3F8}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAutocad2025", "ConnectorAutocadCivil\ConnectorAutocad2025\ConnectorAutocad2025.csproj", "{42FE69BF-C821-43E8-8EAE-8F342749EF7A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2025", "Objects\Converters\ConverterAutocadCivil\ConverterAutocad2025\ConverterAutocad2025.csproj", "{829688CD-CECE-4F6C-A5A0-032BB39CD9E0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorCivil2025", "ConnectorAutocadCivil\ConnectorCivil2025\ConnectorCivil2025.csproj", "{70DEAA13-6DC8-44A0-B287-9E806A8054F1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterCivil2025", "Objects\Converters\ConverterAutocadCivil\ConverterCivil2025\ConverterCivil2025.csproj", "{F06E4C37-4076-4272-9CA6-FB505E02CD31}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Mac|Any CPU = Debug Mac|Any CPU @@ -2327,6 +2335,70 @@ Global {C0295BF9-9A40-4FCD-BE39-E943985CA3F8}.Release|Any CPU.Build.0 = Release|Any CPU {C0295BF9-9A40-4FCD-BE39-E943985CA3F8}.Release|x64.ActiveCfg = Release|Any CPU {C0295BF9-9A40-4FCD-BE39-E943985CA3F8}.Release|x64.Build.0 = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug Mac|x64.Build.0 = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug|x64.ActiveCfg = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Debug|x64.Build.0 = Debug|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release Mac|x64.ActiveCfg = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release Mac|x64.Build.0 = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release|Any CPU.Build.0 = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release|x64.ActiveCfg = Release|Any CPU + {42FE69BF-C821-43E8-8EAE-8F342749EF7A}.Release|x64.Build.0 = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug Mac|x64.Build.0 = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug|x64.ActiveCfg = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Debug|x64.Build.0 = Debug|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release Mac|x64.ActiveCfg = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release Mac|x64.Build.0 = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release|Any CPU.Build.0 = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release|x64.ActiveCfg = Release|Any CPU + {829688CD-CECE-4F6C-A5A0-032BB39CD9E0}.Release|x64.Build.0 = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug Mac|x64.Build.0 = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug|x64.ActiveCfg = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Debug|x64.Build.0 = Debug|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release Mac|x64.ActiveCfg = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release Mac|x64.Build.0 = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release|Any CPU.Build.0 = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release|x64.ActiveCfg = Release|Any CPU + {70DEAA13-6DC8-44A0-B287-9E806A8054F1}.Release|x64.Build.0 = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug Mac|Any CPU.ActiveCfg = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug Mac|Any CPU.Build.0 = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug Mac|x64.ActiveCfg = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug Mac|x64.Build.0 = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug|x64.ActiveCfg = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Debug|x64.Build.0 = Debug|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release Mac|Any CPU.ActiveCfg = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release Mac|Any CPU.Build.0 = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release Mac|x64.ActiveCfg = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release Mac|x64.Build.0 = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release|Any CPU.Build.0 = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release|x64.ActiveCfg = Release|Any CPU + {F06E4C37-4076-4272-9CA6-FB505E02CD31}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2499,6 +2571,10 @@ Global {7B02BACC-D9B6-4FFE-A450-7ECB5F71F209} = {C73C19B5-72A3-4C63-8D56-0A7E7DB46CA5} {D607BD0A-9F7F-4C3A-9B9C-FEAD6BA49C7C} = {42A86931-7497-4A34-B2FD-060231CD0A8F} {C0295BF9-9A40-4FCD-BE39-E943985CA3F8} = {925C0BF6-A0B1-4699-9C4B-078E01D652CC} + {42FE69BF-C821-43E8-8EAE-8F342749EF7A} = {890F3257-FCC2-4ED8-9180-22B3641B494C} + {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1D43D91B-4F01-4A78-8250-CC6F9BD93A14} @@ -2508,6 +2584,7 @@ Global ConnectorBentley\ConnectorBentleyShared\ConnectorBentleyShared.projitems*{0420d74a-2997-4b92-844b-c3769deaa1ad}*SharedItemsImports = 5 Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{05f993a6-8651-4801-a732-9a30d1472eef}*SharedItemsImports = 5 ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{071f914c-f473-4fb2-9faf-98632afb164b}*SharedItemsImports = 13 + Objects\Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{0b6b5c52-54ec-461f-8729-6244aca63646}*SharedItemsImports = 5 ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{0f1fd0c3-875f-4689-9c4a-c56e9ab31102}*SharedItemsImports = 13 Objects\Converters\ConverterRevit\ConverterRevitTests\ConverterRevitTestsShared\ConverterRevitTestsShared.projitems*{1085f4b5-fdad-4ff8-b144-dddbd9454f55}*SharedItemsImports = 13 Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{15c4ff29-0370-4860-b80a-06cc5e0e8d5f}*SharedItemsImports = 5 @@ -2515,6 +2592,7 @@ Global Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{1f21e740-6b05-47bd-8d2a-c9ed5e91c577}*SharedItemsImports = 5 Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{21223ba5-c6e8-405d-b581-106c4726edc0}*SharedItemsImports = 5 ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{2568500e-f1bc-440e-9150-db4820b3fad6}*SharedItemsImports = 5 + ConnectorNavisworks\ConnectorNavisworks\ConnectorNavisworks.Shared.projitems*{2568500e-f1bc-440e-9150-dd4820b3fad6}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{2639e37d-80d3-415a-b4d1-20d7f321f27f}*SharedItemsImports = 5 Objects\Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{26eca1be-f5b2-4a41-9658-46a4a917bfe6}*SharedItemsImports = 5 ConnectorRevit\ConnectorRevit\ConnectorRevit.projitems*{27a79aca-7ea8-4406-8bb8-216578cc3ab7}*SharedItemsImports = 5 @@ -2528,6 +2606,7 @@ Global Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{3df12639-78b6-41b3-a046-a675035369be}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{3e30d170-3cb4-4728-97d5-887c5019da9b}*SharedItemsImports = 5 Objects\Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{425f0d00-6608-4bd2-a1e0-2730c9f2bfd3}*SharedItemsImports = 13 + ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{42fe69bf-c821-43e8-8eae-8f342749ef7a}*SharedItemsImports = 5 Objects\Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{442116f3-0f4a-4136-894e-ff5f4295500b}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{464f2220-d7d9-4d8c-bb3d-b93a1c603469}*SharedItemsImports = 5 ConnectorTeklaStructures\ConnectorTeklaStructuresShared\ConnectorTeklaStructuresShared.projitems*{48c44a7a-122f-4a1f-b3ba-613cb432a7bc}*SharedItemsImports = 5 @@ -2551,6 +2630,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 + 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 Objects\Converters\ConverterDynamo\ConverterDynamoShared\ConverterDynamoShared.projitems*{75144587-6f51-46c8-8e40-da652fbc53f4}*SharedItemsImports = 5 @@ -2561,6 +2641,7 @@ Global ConnectorRevit\RevitSharedResources\RevitSharedResources.projitems*{7b02bacc-d9b6-4ffe-a450-7ecb5f71f209}*SharedItemsImports = 5 Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{7ffdab72-145d-4490-9892-fac5f1d72b17}*SharedItemsImports = 13 ConnectorCSI\ConnectorCSIShared\ConnectorCSIShared.projitems*{81299d15-5788-414d-a962-1a568c251323}*SharedItemsImports = 5 + Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{829688cd-cece-4f6c-a5a0-032bb39cd9e0}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{8581b4bb-a8bc-4328-99fe-d18615af2554}*SharedItemsImports = 5 ConnectorGrasshopper\ConnectorGrasshopperShared\ConnectorGrasshopperShared.projitems*{86920221-416e-4a66-a601-3418207e2401}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{88a24c40-74c8-4e20-9051-6be9e6adecfd}*SharedItemsImports = 5 @@ -2612,6 +2693,7 @@ Global Objects\Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{eb52e451-9ed8-460e-9ee4-6717bfb12eab}*SharedItemsImports = 5 Objects\Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{ec2436db-b7f4-4d78-807b-8d91d7d5165c}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{f03af41c-3489-4414-a887-b52d529b5a55}*SharedItemsImports = 5 + Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{f06e4c37-4076-4272-9ca6-fb505e02cd31}*SharedItemsImports = 5 Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{f1311789-37dc-47fd-acec-75b9b97edfed}*SharedItemsImports = 5 Objects\Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{f2146143-c240-4920-a01b-2bd7e076ad11}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{f4aa033f-4f85-4990-afe9-86be00abe973}*SharedItemsImports = 5 diff --git a/ConnectorAutocadCivil/ConnectorAutocad2025/ConnectorAutocad2025.csproj b/ConnectorAutocadCivil/ConnectorAutocad2025/ConnectorAutocad2025.csproj new file mode 100644 index 0000000000..16d11ac2cd --- /dev/null +++ b/ConnectorAutocadCivil/ConnectorAutocad2025/ConnectorAutocad2025.csproj @@ -0,0 +1,47 @@ + + + Speckle.ConnectorAutocad + SpeckleConnectorAutocad + net8.0-windows + ConnectorAutocad + ConnectorAutocad + Program + $(ProgramW6432)\Autodesk\AutoCAD 2025\acad.exe + true + $(DefineConstants);AUTOCAD2025 + false + true + x64 + win-x64 + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil.sln b/ConnectorAutocadCivil/ConnectorAutocadCivil.sln index e122c2b1bd..eb1c452a38 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil.sln +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil.sln @@ -65,6 +65,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAdvanceSteel2024", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAdvanceSteel2024", "ConnectorAdvanceSteel2024\ConnectorAdvanceSteel2024.csproj", "{572B1D77-83BA-4E96-A70A-7D000D2AC220}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorAutocad2025", "ConnectorAutocad2025\ConnectorAutocad2025.csproj", "{6B147D7E-4F94-43EC-A982-340E98B37656}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2025", "..\Objects\Converters\ConverterAutocadCivil\ConverterAutocad2025\ConverterAutocad2025.csproj", "{5A4FB6D3-CAC0-43BC-BB4A-BED3845C79DA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -167,6 +171,14 @@ Global {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Debug|Any CPU.Build.0 = Debug|Any CPU {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Release|Any CPU.ActiveCfg = Release|Any CPU {572B1D77-83BA-4E96-A70A-7D000D2AC220}.Release|Any CPU.Build.0 = Release|Any CPU + {6B147D7E-4F94-43EC-A982-340E98B37656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B147D7E-4F94-43EC-A982-340E98B37656}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B147D7E-4F94-43EC-A982-340E98B37656}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B147D7E-4F94-43EC-A982-340E98B37656}.Release|Any CPU.Build.0 = Release|Any CPU + {5A4FB6D3-CAC0-43BC-BB4A-BED3845C79DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A4FB6D3-CAC0-43BC-BB4A-BED3845C79DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A4FB6D3-CAC0-43BC-BB4A-BED3845C79DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A4FB6D3-CAC0-43BC-BB4A-BED3845C79DA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -196,6 +208,8 @@ Global {23478901-5C29-4D54-A66A-AE9FEA6118C7} = {A07071D5-E197-487D-B543-28639AC3C719} {C7F4DFA0-18FE-4C0B-A9DC-DAD74D5E6E13} = {8AFDB1E6-D3E7-45EA-BCDC-F3554BDDEF1E} {572B1D77-83BA-4E96-A70A-7D000D2AC220} = {A07071D5-E197-487D-B543-28639AC3C719} + {6B147D7E-4F94-43EC-A982-340E98B37656} = {A07071D5-E197-487D-B543-28639AC3C719} + {5A4FB6D3-CAC0-43BC-BB4A-BED3845C79DA} = {8AFDB1E6-D3E7-45EA-BCDC-F3554BDDEF1E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EAFBA51C-7222-435F-8BDF-8C15B27A34C8} @@ -213,6 +227,8 @@ Global ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{575293fb-158c-4f91-abc1-18b60f310b32}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{57a28a09-c64e-47f6-b602-b6d58b19f1d5}*SharedItemsImports = 5 ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{58a88f1a-7489-46d2-949d-2fc3f68c8d84}*SharedItemsImports = 5 + ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{5a4fb6d3-cac0-43bc-bb4a-bed3845c79da}*SharedItemsImports = 5 + ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems*{6b147d7e-4f94-43ec-a982-340e98b37656}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{79e41261-3078-4f38-a71e-4b4020cf8f57}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{8cfc7609-f640-4683-bf13-fe144d3dc50b}*SharedItemsImports = 5 ..\Objects\Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{9a11c16b-790f-437a-9e04-7e0d3ecdc06b}*SharedItemsImports = 5 diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf b/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf index b6dc9fe55a..e645e74cae 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil.slnf @@ -6,11 +6,13 @@ "ConnectorAutocadCivil\\ConnectorAutocad2022\\ConnectorAutocad2022.csproj", "ConnectorAutocadCivil\\ConnectorAutocad2023\\ConnectorAutocad2023.csproj", "ConnectorAutocadCivil\\ConnectorAutocad2024\\ConnectorAutocad2024.csproj", + "ConnectorAutocadCivil\\ConnectorAutocad2025\\ConnectorAutocad2025.csproj", "ConnectorAutocadCivil\\ConnectorAutocadCivil\\ConnectorAutocadCivilShared.shproj", "ConnectorAutocadCivil\\ConnectorCivil2021\\ConnectorCivil2021.csproj", "ConnectorAutocadCivil\\ConnectorCivil2022\\ConnectorCivil2022.csproj", "ConnectorAutocadCivil\\ConnectorCivil2023\\ConnectorCivil2023.csproj", "ConnectorAutocadCivil\\ConnectorCivil2024\\ConnectorCivil2024.csproj", + "ConnectorAutocadCivil\\ConnectorCivil2025\\ConnectorCivil2025.csproj", "Core\\Core\\Core.csproj", "Core\\Tests\\Speckle.Core.Tests.Unit\\Speckle.Core.Tests.Unit.csproj", "Core\\Transports\\DiskTransport\\DiskTransport.csproj", @@ -20,11 +22,13 @@ "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2022\\ConverterAutocad2022.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2023\\ConverterAutocad2023.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2024\\ConverterAutocad2024.csproj", + "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocad2025\\ConverterAutocad2025.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterAutocadCivilShared\\ConverterAutocadCivilShared.shproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2021\\ConverterCivil2021.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2022\\ConverterCivil2022.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2023\\ConverterCivil2023.csproj", "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2024\\ConverterCivil2024.csproj", + "Objects\\Converters\\ConverterAutocadCivil\\ConverterCivil2025\\ConverterCivil2025.csproj", "Objects\\Objects\\Objects.csproj", "Objects\\Tests\\Objects.Tests.Unit\\Objects.Tests.Unit.csproj" ] diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs index 41bab7b772..dddcd877d2 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Receive.cs @@ -544,7 +544,7 @@ and not ApplicationObject.State.Updated } // add property sets if this is Civil3D -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL if (obj["propertySets"] is IReadOnlyList list) { List> propertySets = new(); diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs index 2c65993377..2c96f1eacd 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/UI/ConnectorBindingsAutocadCivil.Send.cs @@ -244,7 +244,7 @@ ref int convertedCount converted[key] = obj.ExtensionDictionary.GetUserString(key); */ -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL // add property sets if this is Civil3D var propertySets = obj.GetPropertySets(tr); if (propertySets.Count > 0) diff --git a/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs b/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs index a4965491a4..eed231d48f 100644 --- a/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs +++ b/ConnectorAutocadCivil/ConnectorAutocadCivil/Utils.cs @@ -14,7 +14,7 @@ using Speckle.ConnectorAutocadCivil.DocumentUtils; using Speckle.Core.Logging; -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL using Autodesk.Aec.ApplicationServices; using Autodesk.Aec.PropertyData.DatabaseServices; #endif @@ -47,6 +47,10 @@ public static class Utils public static string VersionedAppName = HostApplications.AutoCAD.GetVersion(HostAppVersion.v2024); public static string AppName = HostApplications.AutoCAD.Name; public static string Slug = HostApplications.AutoCAD.Slug; +#elif AUTOCAD2025 + public static string VersionedAppName = HostApplications.AutoCAD.GetVersion(HostAppVersion.v2025); + public static string AppName = HostApplications.AutoCAD.Name; + public static string Slug = HostApplications.AutoCAD.Slug; #elif CIVIL2021 public static string VersionedAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2021); public static string AppName = HostApplications.Civil.Name; @@ -63,6 +67,10 @@ public static class Utils public static string VersionedAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2024); public static string AppName = HostApplications.Civil.Name; public static string Slug = HostApplications.Civil.Slug; +#elif CIVIL2025 + public static string VersionedAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2025); + public static string AppName = HostApplications.Civil.Name; + public static string Slug = HostApplications.Civil.Slug; #elif ADVANCESTEEL2023 public static string VersionedAppName = HostApplications.AdvanceSteel.GetVersion(HostAppVersion.v2023); public static string AppName = HostApplications.AdvanceSteel.Name; @@ -307,7 +315,7 @@ public static bool GetOrMakeLayer(this Document doc, string layerName, Transacti #endregion #region property sets -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL private static Autodesk.Aec.PropertyData.DataType? GetPropertySetType(object prop) { switch (prop) @@ -765,7 +773,7 @@ public static string GetUnits(Document doc) var insUnits = doc.Database.Insunits; string units = (insUnits == UnitsValue.Undefined) ? Units.None : Units.GetUnitsFromString(insUnits.ToString()); -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL if (units == Units.None) { // try to get the drawing unit instead diff --git a/ConnectorAutocadCivil/ConnectorCivil2021/ConnectorCivil2021.csproj b/ConnectorAutocadCivil/ConnectorCivil2021/ConnectorCivil2021.csproj index d53e435fde..8743f7deb1 100644 --- a/ConnectorAutocadCivil/ConnectorCivil2021/ConnectorCivil2021.csproj +++ b/ConnectorAutocadCivil/ConnectorCivil2021/ConnectorCivil2021.csproj @@ -12,7 +12,7 @@ x64 ConnectorCivil2021 ConnectorCivil2021 - $(DefineConstants);CIVIL2021 + $(DefineConstants);CIVIL2021;CIVIL;CIVIL2021_OR_GREATER false diff --git a/ConnectorAutocadCivil/ConnectorCivil2022/ConnectorCivil2022.csproj b/ConnectorAutocadCivil/ConnectorCivil2022/ConnectorCivil2022.csproj index dbcb1f3afc..75e84ec5d4 100644 --- a/ConnectorAutocadCivil/ConnectorCivil2022/ConnectorCivil2022.csproj +++ b/ConnectorAutocadCivil/ConnectorCivil2022/ConnectorCivil2022.csproj @@ -12,7 +12,7 @@ x64 ConnectorCivil2022 ConnectorCivil2022 - $(DefineConstants);CIVIL2022 + $(DefineConstants);CIVIL2022;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER false diff --git a/ConnectorAutocadCivil/ConnectorCivil2023/ConnectorCivil2023.csproj b/ConnectorAutocadCivil/ConnectorCivil2023/ConnectorCivil2023.csproj index 601d524f7c..4d80155046 100644 --- a/ConnectorAutocadCivil/ConnectorCivil2023/ConnectorCivil2023.csproj +++ b/ConnectorAutocadCivil/ConnectorCivil2023/ConnectorCivil2023.csproj @@ -12,7 +12,7 @@ x64 ConnectorCivil2023 ConnectorCivil2023 - $(DefineConstants);CIVIL2023 + $(DefineConstants);CIVIL2023;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER false diff --git a/ConnectorAutocadCivil/ConnectorCivil2024/ConnectorCivil2024.csproj b/ConnectorAutocadCivil/ConnectorCivil2024/ConnectorCivil2024.csproj index 9bf7914a30..f6db7a0e1c 100644 --- a/ConnectorAutocadCivil/ConnectorCivil2024/ConnectorCivil2024.csproj +++ b/ConnectorAutocadCivil/ConnectorCivil2024/ConnectorCivil2024.csproj @@ -12,7 +12,7 @@ x64 ConnectorCivil2024 ConnectorCivil2024 - $(DefineConstants);CIVIL2024 + $(DefineConstants);CIVIL2024;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER;CIVIL2024_OR_GREATER false diff --git a/ConnectorAutocadCivil/ConnectorCivil2025/ConnectorCivil2025.csproj b/ConnectorAutocadCivil/ConnectorCivil2025/ConnectorCivil2025.csproj new file mode 100644 index 0000000000..774d948d0e --- /dev/null +++ b/ConnectorAutocadCivil/ConnectorCivil2025/ConnectorCivil2025.csproj @@ -0,0 +1,52 @@ + + + + net8.0-windows + enable + + Speckle.ConnectorCivil + SpeckleConnectorCivil + Program + $(ProgramW6432)\Autodesk\AutoCAD 2025\acad.exe + + /ld "C:\Program Files\Autodesk\AutoCAD 2025\\AecBase.dbx" /product "C3D" /language + "en-US" + + + ConnectorCivil2025 + ConnectorCivil2025 + $(DefineConstants);CIVIL2025;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER;CIVIL2024_OR_GREATER;CIVIL2025_OR_GREATER + false + true + x64 + win-x64 + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocad2025/ConverterAutocad2025.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterAutocad2025/ConverterAutocad2025.csproj new file mode 100644 index 0000000000..96d027e17f --- /dev/null +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocad2025/ConverterAutocad2025.csproj @@ -0,0 +1,28 @@ + + + + net8.0 + enable + Objects.Converter.Autocad2025 + Objects.Converter.Autocad + $(DefineConstants);AUTOCAD2025 + Speckle.Objects.Converter.Autocad2025 + Objects.Converter.Autocad2025 + Converter for Autocad 2025 + $(PackageTags) objects converter autocad + true + False + + + + + + + + + + + + + + diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/Converter.AutocadCivil.Utils.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/Converter.AutocadCivil.Utils.cs index abe25556eb..56e6b7e48f 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/Converter.AutocadCivil.Utils.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/Converter.AutocadCivil.Utils.cs @@ -11,7 +11,7 @@ using Autodesk.AutoCAD.EditorInput; using Speckle.Core.Logging; -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL using Autodesk.Aec.ApplicationServices; #endif @@ -407,7 +407,7 @@ public string ModelUnits { _modelUnits = UnitToSpeckle(Doc.Database.Insunits); -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL if (_modelUnits == Units.None) { // try to get the drawing unit instead diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs index 116e3c0a77..20ede66c9c 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs @@ -1,4 +1,4 @@ -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL using System; using System.Collections.Generic; using System.Linq; @@ -599,7 +599,7 @@ public CivilProfile ProfileToSpeckle(CivilDB.Profile profile) foreach (ProfilePVI pvi in profile.PVIs) { double pviStation = 0; -#if CIVIL2024 +#if CIVIL2024_OR_GREATER pviStation = pvi.RawStation; #else pviStation = pvi.Station; diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs index 057144695d..957fff734b 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs +++ b/Objects/Converters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.cs @@ -26,7 +26,7 @@ using Spiral = Objects.Geometry.Spiral; using Speckle.Core.Logging; -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL using CivilDB = Autodesk.Civil.DatabaseServices; #endif @@ -42,6 +42,8 @@ public partial class ConverterAutocadCivil : ISpeckleConverter public static string AutocadAppName = HostApplications.AutoCAD.GetVersion(HostAppVersion.v2023); #elif AUTOCAD2024 public static string AutocadAppName = HostApplications.AutoCAD.GetVersion(HostAppVersion.v2024); +#elif AUTOCAD2025 + public static string AutocadAppName = HostApplications.AutoCAD.GetVersion(HostAppVersion.v2025); #elif CIVIL2021 public static string AutocadAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2021); #elif CIVIL2022 @@ -50,6 +52,8 @@ public partial class ConverterAutocadCivil : ISpeckleConverter public static string AutocadAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2023); #elif CIVIL2024 public static string AutocadAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2024); +#elif CIVIL2025 + public static string AutocadAppName = HostApplications.Civil.GetVersion(HostAppVersion.v2025); #elif ADVANCESTEEL2023 public static string AutocadAppName = HostApplications.AdvanceSteel.GetVersion(HostAppVersion.v2023); #elif ADVANCESTEEL2024 @@ -194,7 +198,7 @@ public Base ConvertToSpeckle(object @object) case LayerTableRecord o: @base = LayerToSpeckle(o); break; -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL case CivilDB.Alignment o: @base = AlignmentToSpeckle(o); break; @@ -378,7 +382,7 @@ public object ConvertToNative(Base @object) break; case Mesh o: -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL acadObj = isFromCivil ? CivilSurfaceToNative(o) : MeshToNativeDB(o); #else acadObj = MeshToNativeDB(o); @@ -405,7 +409,7 @@ public object ConvertToNative(Base @object) acadObj = CollectionToNative(o); break; -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL case Alignment o: acadObj = AlignmentToNative(o); break; @@ -515,7 +519,7 @@ public bool CanConvertToSpeckle(object @object) case LayerTableRecord: return true; -#if CIVIL2021 || CIVIL2022 || CIVIL2023 || CIVIL2024 +#if CIVIL // NOTE: C3D pressure pipes and pressure fittings API under development case CivilDB.FeatureLine: case CivilDB.Corridor: diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2021/ConverterCivil2021.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2021/ConverterCivil2021.csproj index 44fb3cc244..9c101b39cb 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2021/ConverterCivil2021.csproj +++ b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2021/ConverterCivil2021.csproj @@ -4,7 +4,7 @@ netstandard2.0 Objects.Converter.Civil3D2021 Objects.Converter.Civil - $(DefineConstants);CIVIL2021 + $(DefineConstants);CIVIL2021;CIVIL;CIVIL2021_OR_GREATER Speckle.Objects.Converter.Civil2021 Objects.Converter.Civil2021 Converter for Civil3D 2021 diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2022/ConverterCivil2022.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2022/ConverterCivil2022.csproj index 15cd07f6d6..6b9ac54c54 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2022/ConverterCivil2022.csproj +++ b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2022/ConverterCivil2022.csproj @@ -4,7 +4,7 @@ netstandard2.0 Objects.Converter.Civil3D2022 Objects.Converter.Civil - $(DefineConstants);CIVIL2022 + $(DefineConstants);CIVIL2022;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER Speckle.Objects.Converter.Civil2022 Objects.Converter.Civil2022 Converter for Civil3D 2022 diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2023/ConverterCivil2023.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2023/ConverterCivil2023.csproj index b0d497c59a..a2cbe48b3b 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2023/ConverterCivil2023.csproj +++ b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2023/ConverterCivil2023.csproj @@ -5,7 +5,7 @@ Objects.Converter.Civil3D2023 Objects.Converter.Civil Speckle.Objects.Converter.Civil2023 - $(DefineConstants);CIVIL2023 + $(DefineConstants);CIVIL2023;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER Converter for Civil3D 2023 $(PackageTags) objects converter civil3d true diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2024/ConverterCivil2024.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2024/ConverterCivil2024.csproj index 760cb514e5..22ab7fcbb5 100644 --- a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2024/ConverterCivil2024.csproj +++ b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2024/ConverterCivil2024.csproj @@ -5,7 +5,7 @@ Objects.Converter.Civil3D2024 Objects.Converter.Civil Speckle.Objects.Converter.Civil2024 - $(DefineConstants);CIVIL2024 + $(DefineConstants);CIVIL2024;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER;CIVIL2024_OR_GREATER Converter for Civil3D 2024 $(PackageTags) objects converter civil3d true diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterCivil2025/ConverterCivil2025.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2025/ConverterCivil2025.csproj new file mode 100644 index 0000000000..51b5b83ded --- /dev/null +++ b/Objects/Converters/ConverterAutocadCivil/ConverterCivil2025/ConverterCivil2025.csproj @@ -0,0 +1,30 @@ + + + + net8.0 + enable + Objects.Converter.Civil2025 + Objects.Converter.Civil + $(DefineConstants);CIVIL2025;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER;CIVIL2024_OR_GREATER;CIVIL2025_OR_GREATER + Speckle.Objects.Converter.Civil2025 + Objects.Converter.Civil2025 + Converter for Civil 3D 2025 + $(PackageTags) objects converter civil3d + true + False + + + + + + + + + + + + + + + diff --git a/Objects/Objects.sln b/Objects/Objects.sln index 9945108d66..f32fc6b4a3 100644 --- a/Objects/Objects.sln +++ b/Objects/Objects.sln @@ -125,11 +125,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterNavisworks2024", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterRhino8", "Converters\ConverterRhinoGh\ConverterRhino8\ConverterRhino8.csproj", "{DB55FC55-0FE8-4622-AA0B-66F5EF9737B9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterGrasshopper8", "Converters\ConverterRhinoGh\ConverterGrasshopper8\ConverterGrasshopper8.csproj", "{738A607A-C51C-447B-AFBB-47D7FED47CA0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterGrasshopper8", "Converters\ConverterRhinoGh\ConverterGrasshopper8\ConverterGrasshopper8.csproj", "{738A607A-C51C-447B-AFBB-47D7FED47CA0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{985946E0-ACEC-4EF7-92D6-E0B153271393}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Objects.Tests.Unit", "Tests\Objects.Tests.Unit\Objects.Tests.Unit.csproj", "{70AB0F97-B226-44F9-8CCE-0927A9C18037}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Objects.Tests.Unit", "Tests\Objects.Tests.Unit\Objects.Tests.Unit.csproj", "{70AB0F97-B226-44F9-8CCE-0927A9C18037}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConverterAutocad2025", "Converters\ConverterAutocadCivil\ConverterAutocad2025\ConverterAutocad2025.csproj", "{0E85DB68-4547-4059-83BD-D66F54F0201E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverterCivil2025", "Converters\ConverterAutocadCivil\ConverterCivil2025\ConverterCivil2025.csproj", "{82C22520-8EFE-426B-8865-43965FA3DD87}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -491,6 +495,22 @@ Global {70AB0F97-B226-44F9-8CCE-0927A9C18037}.Release|Any CPU.Build.0 = Release|Any CPU {70AB0F97-B226-44F9-8CCE-0927A9C18037}.Release|x64.ActiveCfg = Release|Any CPU {70AB0F97-B226-44F9-8CCE-0927A9C18037}.Release|x64.Build.0 = Release|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Debug|x64.ActiveCfg = Debug|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Debug|x64.Build.0 = Debug|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Release|Any CPU.Build.0 = Release|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Release|x64.ActiveCfg = Release|Any CPU + {0E85DB68-4547-4059-83BD-D66F54F0201E}.Release|x64.Build.0 = Release|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Debug|x64.ActiveCfg = Debug|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Debug|x64.Build.0 = Debug|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Release|Any CPU.ActiveCfg = Release|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Release|Any CPU.Build.0 = Release|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Release|x64.ActiveCfg = Release|Any CPU + {82C22520-8EFE-426B-8865-43965FA3DD87}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -556,6 +576,8 @@ Global {DB55FC55-0FE8-4622-AA0B-66F5EF9737B9} = {1A35077C-2936-4A3D-8D48-65F39F76D999} {738A607A-C51C-447B-AFBB-47D7FED47CA0} = {1A35077C-2936-4A3D-8D48-65F39F76D999} {70AB0F97-B226-44F9-8CCE-0927A9C18037} = {985946E0-ACEC-4EF7-92D6-E0B153271393} + {0E85DB68-4547-4059-83BD-D66F54F0201E} = {5419488F-6509-4F16-A342-BB2BE2689E00} + {82C22520-8EFE-426B-8865-43965FA3DD87} = {5419488F-6509-4F16-A342-BB2BE2689E00} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DA57EC2E-0A9E-4F59-B1F7-A65F76A74B74} @@ -564,6 +586,7 @@ Global Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{05ff1d88-1b2d-4a25-bf65-2895d4e6746d}*SharedItemsImports = 5 Converters\ConverterTeklaStructures\ConverterTeklaStructuresShared\ConverterTeklaStructuresShared.projitems*{08ee146e-9f7a-4c82-b790-688fe4532ca7}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{0af5ba0f-0fea-463b-9877-f063892ea7de}*SharedItemsImports = 5 + Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{0e85db68-4547-4059-83bd-d66f54f0201e}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{13f93c20-793c-4f2d-b836-68d7744063df}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{156ff86c-8531-46d0-aa23-97db326bc591}*SharedItemsImports = 5 Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{1dc0a8f4-1f14-47e8-8456-9d8e9c0e6cff}*SharedItemsImports = 5 @@ -584,6 +607,7 @@ Global Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{63b3f901-7c14-4530-8a6f-ccad68586664}*SharedItemsImports = 5 Converters\ConverterBentley\ConverterBentleyShared\ConverterBentleyShared.projitems*{651f0278-3de2-4371-8586-70d3732f9770}*SharedItemsImports = 5 Converters\ConverterAutocadCivil\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems*{6d1265b2-31fb-4096-9ec9-dd937a349b9c}*SharedItemsImports = 5 + Converters\ConverterRhinoGh\ConverterRhinoGhShared\ConverterRhinoGhShared.projitems*{738a607a-c51c-447b-afbb-47d7fed47ca0}*SharedItemsImports = 5 Converters\ConverterRevit\ConverterRevitShared\ConverterRevitShared.projitems*{73d708ca-e956-455a-be62-785b0cc79264}*SharedItemsImports = 5 Converters\ConverterNavisworks\ConverterNavisworks\ConverterNavisworksShared.projitems*{74081536-2a3e-447d-8f53-bdc5dcb5d98b}*SharedItemsImports = 5 Converters\ConverterCSI\ConverterCSIShared\ConverterCSIShared.projitems*{79aa475d-7cde-4501-90ce-9a0d9d0db023}*SharedItemsImports = 5