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 <[email protected]>
specklesystems · May 14, 2024 · 3ed07ca · 3ed07ca
1 parent 5293e60
commit 3ed07ca
Show file tree

Hide file tree

Showing 22 changed files with 322 additions and 27 deletions.
diff --git a/All.sln b/All.sln
diff --git a/ConnectorAutocadCivil/ConnectorAutocad2025/ConnectorAutocad2025.csproj b/ConnectorAutocadCivil/ConnectorAutocad2025/ConnectorAutocad2025.csproj
@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>Speckle.ConnectorAutocad</RootNamespace>
+    <AssemblyName>SpeckleConnectorAutocad</AssemblyName>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <AssemblyTitle>ConnectorAutocad</AssemblyTitle>
+    <Product>ConnectorAutocad</Product>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD 2025\acad.exe</StartProgram>
+    <UseWPF>true</UseWPF>
+    <DefineConstants>$(DefineConstants);AUTOCAD2025</DefineConstants>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PlatformTarget>x64</PlatformTarget>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
+  </PropertyGroup>
+
+  <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />
+
+  <Target Name="Clean">
+    <RemoveDir Directories="$(TargetDir);$(AppData)\Autodesk\ApplicationPlugins\Speckle2AutoCAD2025" />
+  </Target>
+  <Target Name="AfterBuildMigrated" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
+    <Message Text="Calling 2025 post build" Importance="high" />
+    <CallTarget Condition="'$(Configuration)' == 'Debug' AND '$(IsDesktopBuild)' == true" Targets="AfterBuildDebug" />
+  </Target>
+  <Target Name="AfterBuildDebug">
+    <ItemGroup>
+      <SourceDLLs Include="$(TargetDir)\**\*.*" />
+    </ItemGroup>
+    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle2AutoCAD2025\%(RecursiveDir)" SourceFiles="@(SourceDLLs)" />
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" Version="2025.0.0" IncludeAssets="compile;build" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App"></FrameworkReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Core\Core.csproj" />
+    <ProjectReference Include="..\..\DesktopUI2\DesktopUI2\DesktopUI2.csproj" />
+  </ItemGroup>
+</Project>
diff --git 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
@@ -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
@@ -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<object> list)
             {
               List<Dictionary<string, object>> propertySets = new();

diff --git 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
@@ -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
@@ -12,7 +12,7 @@
         <PlatformTarget>x64</PlatformTarget>
         <AssemblyTitle>ConnectorCivil2021</AssemblyTitle>
         <Product>ConnectorCivil2021</Product>
-        <DefineConstants>$(DefineConstants);CIVIL2021</DefineConstants>
+      <DefineConstants>$(DefineConstants);CIVIL2021;CIVIL;CIVIL2021_OR_GREATER</DefineConstants>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />

diff --git a/ConnectorAutocadCivil/ConnectorCivil2022/ConnectorCivil2022.csproj b/ConnectorAutocadCivil/ConnectorCivil2022/ConnectorCivil2022.csproj
@@ -12,7 +12,7 @@
         <PlatformTarget>x64</PlatformTarget>
         <AssemblyTitle>ConnectorCivil2022</AssemblyTitle>
         <Product>ConnectorCivil2022</Product>
-        <DefineConstants>$(DefineConstants);CIVIL2022</DefineConstants>
+      <DefineConstants>$(DefineConstants);CIVIL2022;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER</DefineConstants>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />

diff --git a/ConnectorAutocadCivil/ConnectorCivil2023/ConnectorCivil2023.csproj b/ConnectorAutocadCivil/ConnectorCivil2023/ConnectorCivil2023.csproj
@@ -12,7 +12,7 @@
         <PlatformTarget>x64</PlatformTarget>
         <AssemblyTitle>ConnectorCivil2023</AssemblyTitle>
         <Product>ConnectorCivil2023</Product>
-        <DefineConstants>$(DefineConstants);CIVIL2023</DefineConstants>
+      <DefineConstants>$(DefineConstants);CIVIL2023;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER</DefineConstants>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />

diff --git a/ConnectorAutocadCivil/ConnectorCivil2024/ConnectorCivil2024.csproj b/ConnectorAutocadCivil/ConnectorCivil2024/ConnectorCivil2024.csproj
@@ -12,7 +12,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <AssemblyTitle>ConnectorCivil2024</AssemblyTitle>
     <Product>ConnectorCivil2024</Product>
-    <DefineConstants>$(DefineConstants);CIVIL2024</DefineConstants>
+    <DefineConstants>$(DefineConstants);CIVIL2024;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER;CIVIL2024_OR_GREATER</DefineConstants>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />

diff --git a/ConnectorAutocadCivil/ConnectorCivil2025/ConnectorCivil2025.csproj b/ConnectorAutocadCivil/ConnectorCivil2025/ConnectorCivil2025.csproj
@@ -0,0 +1,52 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+
+    <RootNamespace>Speckle.ConnectorCivil</RootNamespace>
+    <AssemblyName>SpeckleConnectorCivil</AssemblyName>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(ProgramW6432)\Autodesk\AutoCAD 2025\acad.exe</StartProgram>
+    <StartArguments>
+      /ld "C:\Program Files\Autodesk\AutoCAD 2025\\AecBase.dbx" /product "C3D" /language
+      "en-US"
+    </StartArguments>
+
+    <AssemblyTitle>ConnectorCivil2025</AssemblyTitle>
+    <Product>ConnectorCivil2025</Product>
+    <DefineConstants>$(DefineConstants);CIVIL2025;CIVIL;CIVIL2021_OR_GREATER;CIVIL2022_OR_GREATER;CIVIL2023_OR_GREATER;CIVIL2024_OR_GREATER;CIVIL2025_OR_GREATER</DefineConstants>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <PlatformTarget>x64</PlatformTarget>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
+
+  </PropertyGroup>
+  <Import Project="..\ConnectorAutocadCivil\ConnectorAutocadCivilShared.projitems" Label="Shared" />
+  <Target Name="Clean">
+    <RemoveDir Directories="$(TargetDir);$(AppData)\Autodesk\ApplicationPlugins\Speckle2Civil3D2025" />
+  </Target>
+  <Target Name="AfterBuildMigrated" AfterTargets="PostBuildEvent" Condition="$([MSBuild]::IsOsPlatform('Windows'))">
+    <Message Text="Calling 2025 post build" Importance="high" />
+    <CallTarget Condition="'$(Configuration)' == 'Debug' AND '$(IsDesktopBuild)' == true" Targets="AfterBuildDebug" />
+  </Target>
+  <Target Name="AfterBuildDebug">
+    <ItemGroup>
+      <SourceDLLs Include="$(TargetDir)\**\*.*" />
+    </ItemGroup>
+    <Copy DestinationFolder="$(AppData)\Autodesk\ApplicationPlugins\Speckle2Civil3D2025\%(RecursiveDir)" SourceFiles="@(SourceDLLs)" />
+  </Target>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.WindowsDesktop.App"></FrameworkReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\Core\Core.csproj" />
+    <ProjectReference Include="..\..\DesktopUI2\DesktopUI2\DesktopUI2.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" Version="2025.0.0" IncludeAssets="compile;build" PrivateAssets="all" />
+    <PackageReference Include="Speckle.Civil3D.API" Version="2025.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/Objects/Converters/ConverterAutocadCivil/ConverterAutocad2025/ConverterAutocad2025.csproj b/Objects/Converters/ConverterAutocadCivil/ConverterAutocad2025/ConverterAutocad2025.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <AssemblyName>Objects.Converter.Autocad2025</AssemblyName>
+    <RootNamespace>Objects.Converter.Autocad</RootNamespace>
+    <DefineConstants>$(DefineConstants);AUTOCAD2025</DefineConstants>
+    <PackageId>Speckle.Objects.Converter.Autocad2025</PackageId>
+    <Product>Objects.Converter.Autocad2025</Product>
+    <Description>Converter for Autocad 2025</Description>
+    <PackageTags>$(PackageTags) objects converter autocad</PackageTags>
+    <CopyToKitFolder>true</CopyToKitFolder>
+    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
+  </PropertyGroup>
+
+  <Import Project="..\ConverterAutocadCivilShared\ConverterAutocadCivilShared.projitems" Label="Shared" />
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.AutoCAD.API" Version="2025.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Core\Core.csproj" />
+    <ProjectReference Include="..\..\..\Objects\Objects.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...verters/ConverterAutocadCivil/ConverterAutocadCivilShared/Converter.AutocadCivil.Utils.cs b/...verters/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/...nverters/ConverterAutocadCivil/ConverterAutocadCivilShared/ConverterAutocadCivil.Civil.cs b/...nverters/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;